Index: releases/5.2.2-B2/LICENSE
===================================================================
--- releases/5.2.2-B2/LICENSE	(revision 0)
+++ releases/5.2.2-B2/LICENSE	(revision 16630)
@@ -0,0 +1,250 @@
+In-Commerce is a commecial module of In-Portal software that provides
+enterprise level Online Shopping cart and store management solution.
+
+This is NOT a free program and protected by copyrights law.
+
+Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+
+
+LICENSE & DISCLAIMERS
+
+INTECHNIC CORPORATION, IN-COMMERCE, IN-AUCTION
+
+SOFTWARE END USER LICENSE AGREEMENT
+
+IMPORTANT: THIS SOFTWARE END USER LICENSE AGREEMENT IS A
+LEGAL AGREEMENT BETWEEN YOU (LICENSEE) AND INTECHNIC
+CORPORATION. READ IT CAREFULLY BEFORE DOWNLOADING,
+INSTALLING AND USING THE SOFTWARE. IT PROVIDES A LICENSE TO USE
+THE SOFTWARE AND CONTAINS WARRANTY INFORMATION AND
+LIABILITY DISCLAIMERS. BY DOWNLOADING, INSTALLING AND USING
+THE SOFTWARE, YOU ARE CONFIRMING YOUR ACCEPTANCE OF THE
+SOFTWARE AND AGREEING TO BECOME BOUND BY THE TERMS OF THIS
+END USER LICENSE AGREEMENT.
+
+
+2.1. Recitals
+
+(a) Intechnic is the owner of the Software and Documentation (as defined below).
+(b) Intechnic desires to grant to you and you desire to obtain from Intechnic a nonexclusive
+license to use the Software and Documentation solely in accordance with
+the terms and on the conditions set forth in this End User License Agreement.
+NOW, THEREFORE, the parties hereto agree as follows:
+
+
+2.2. Definitions
+
+(a) "Intechnic" means Intechnic Corporation.
+(b) "You" means Licensee, the end user of the Software: the customer purchasing or
+downloading the Software.
+(c) "Software" means the Intechnic In-portal software program supplied by Intechnic
+herewith, which may also include online and electronic documentation. The term
+"Software" also includes In-Commerce and In-Auction supplied by Intechnic herewith
+in conjunction with the Intechnic In-Portal, software program.
+(d) "Documentation" shall mean all manuals, user documentation, and other related
+materials pertaining to the Software which are furnished to you by Intechnic in
+connection with the Software.
+(e) "Intechnic", "In-Commerce" and "In-Auction" are trademarks or registered
+trademarks of Intechnic Corporation in the United States and/or other countries.
+Other marks are the properties of their respective owners.
+
+
+2.3. License Agreement
+
+Intechnic Corporation hereby grants you the right to use all or a portion of Software
+accompanying this License, regardless of media, and the related Documentation. All rights
+of any kind in Software, which are not expressly granted in this License, are entirely and
+exclusively reserved to and by Intechnic Corporation. You may not rent, lease, reverse
+engineer or create other branded software for resale based on the Software.
+This License Agreement permits you to:
+(a) Install and use the Software on a single computer; OR install and store the Software
+on a storage device, such as a network server, used only to run or install the Software
+on your other computers over an internal network, provided you have a license for
+each separate computer on which the Software is installed or run from the storage
+device. A license for the Software may not be shared or used concurrently on
+different computers or on different servers.
+(b) Make one copy of the Software in machine-readable form solely for backup
+purposes. You must reproduce on any such copy all copyright notices and any other
+proprietary legends on the original copy of the Software.
+
+
+2.4. License Restrictions
+
+This computer program is protected by copyright law and international treaties.
+Unauthorized reproduction or unlicensed usage of the code of this program, or any portion
+of it may result in severe civil and criminal penalties, and will be prosecuted to the maximum
+extent possible under the law.
+(a) Other than as set forth in Section III, you may not make or distribute copies of the
+Software, or electronically transfer the Software from one computer to another or
+over a network.
+(b) You may not decompile, reverse engineer, disassemble, or otherwise reduce the
+obfuscated portions of the Software to a human-perceivable form.
+(c) You may not rent, lease, sublicense or create other branded software for resale based
+on this Software, unless expressly permitted by Intechnic Corporation.
+(d) You may not export the Software into any country prohibited by the United States
+Export Administration Act and the regulations hereunder.
+(e) In the event that you fail to comply with this End User License Agreement,
+Intechnic may terminate the license and you must destroy all copies of the Software.
+
+
+2.5. License Term
+
+This license will become effective on the date you purchase the Software and will
+remain in force until terminated. You may terminate the license at any time by removing the
+Software from your computer and destroying the original Software and all copies. This
+license will automatically terminate if you breach any of the terms or conditions set out in
+this License Agreement. You agree to remove the Software from your computer, and
+destroy the original Software and all copies of the Software, upon termination of this license
+for any reason.
+
+
+2.6. License Transfer
+
+You may transfer your license of the Software to another party by transferring the
+original program media and all applicable documentation, including the original of this End
+User License Agreement, to the recipient, who agrees to the terms of this End User License
+Agreement. All other copies of the Software must be deleted and/or destroyed. Any
+transfer of possession of the Software terminates your license and all associated benefits
+under this End User License Agreement. You must notify Intechnic in writing or by e-mail
+of such transfer.
+
+
+2.7. Title and Ownership
+
+The foregoing license gives you limited rights to use the Software. Title, ownership
+rights, and intellectual property rights, including all copyrights, in and to the Software and
+documentation and derivative works, if any, shall remain the property of Intechnic
+Corporation. All rights not specifically granted in this End User License Agreement,
+including Federal and International Copyrights, are reserved by Intechnic Corporation
+You agree to respect and not to remove, obliterate, or cancel from view any copyright,
+trademark, confidentiality or other proprietary notice, mark, or legend appearing on any of
+the Software or output generated by the Software, and to reproduce and include same on
+each copy of the Software, unless expressly permitted by Intechnic Corporation.
+
+
+2.8. Limited Warranty and Disclaimer.
+
+(a) LIMITED WARRANTY. INTECHNIC WARRANTS THAT, FOR A PERIOD
+OF THIRTY (30) DAYS FROM THE DATE OF PURCHASE (AS
+EVIDENCED BY A COPY OF YOUR PURCHASE RECEIPT): (I) WHEN
+USED WITH A RECOMMENDED ENVIRONMENT AND HARDWARE
+CONFIGURATION, THE SOFTWARE WILL PERFORM IN SUBSTANTIAL
+CONFORMANCE WITH THE DOCUMENTATION SUPPLIED WITH THE
+SOFTWARE; AND (II) THAT THE SOFTWARE WILL NOT BE TAMPERED
+WITH OR ALTERED IN ANY WAY OR ABUSE OR MISAPPLICATION.
+(b) NO OTHER WARRANTY. EXCEPT AS SET FORTH IN THE FOREGOING
+LIMITED WARRANTY, INTECHNIC CORPORATION DISCLAIMS ALL
+OTHER WARRANTIES, EITHER EXPRESS OR IMPLIED, OR OTHERWISE
+INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE. ALSO, THERE IS NO WARRANTY OF
+NONINFRINGEMENT, TITLE OR QUIET ENJOYMENT. IF APPLICABLE
+LAW IMPLIES ANY WARRANTIES WITH RESPECT TO THE SOFTWARE,
+ALL SUCH WARRANTIES ARE LIMITED IN DURATION TO THIRTY (30)
+DAYS FROM THE DATE OF PURCHASE. NO ORAL OR WRITTEN
+INFORMATION OR ADVICE GIVEN BY INTECHNIC, ITS EMPLOYEES,
+DISTRIBUTORS, AGENTS OR DEALERS SHALL CREATE A WARRANTY
+OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY.
+
+
+2.9. Exclusive Remedy
+
+Intechnic Corporation offers limited and conditional refunds for downloadable
+Software purchases in case the Software does not perform on the customer's server
+satisfying the recommended server, hardware or environment configuration and according to
+the provided documentation. Intechnic will use reasonable commercial efforts to supply you
+with a replacement copy of the Software that substantially conforms to the documentation,
+provide installation, configuration or programming services to fix the problem, or refund to
+you your purchase price for the Software, at its option. Intechnic shall have no
+responsibility if the Software has been tampered with or altered in any way, abused or
+misapplied, or if the failure arises out of use of the Software with other than a recommended
+server, hardware or environment configuration.
+
+
+2.10. Limitation of Liability
+
+(a) IN NO EVENT SHALL INTECHNIC CORPORATION, OR ITS PRINCIPALS,
+SHAREHOLDERS, OFFICERS, EMPLOYEES, AFFILIATES, CONTRACTORS,
+SUBSIDIARIES, OR PARENT ORGANIZATIONS, BE LIABLE FOR ANY
+INCIDENTAL, CONSEQUENTIAL, OR PUNITIVE DAMAGES
+(INCLUDING DAMAGES FOR LOSS OF BUSINESS, LOSS OF PROFITS,
+BUSINESS, INTERRUPTION OR THE LIKE), ARISING OUT OF THE USE
+OR INABILITY TO USE THE SOFTWARE, OR THIS END USER LICENSE
+AGREEMENT BASED ON ANY THEORY OF LIABILITY INCLUDING
+BREACH OF CONTRACT, BREACH OF WARRANTY, TORT (INCLUDING
+NEGLIGENCE), PRODUCT LIABILITY OR OTHERWISE, EVEN IF
+INTECHNIC CORPORATION OR ITS REPRESENTATIVES HAVE BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND EVEN IF A
+REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS
+ESSENTIAL PURPOSE. IN ADDITION, IN NO EVENT DOES INTECHNIC
+CORPORATION AUTHORIZE YOU TO USE THE SOFTWARE IN
+APPLICATIONS OR SYSTEMS WHERE THE SOFTWARE’S FAILURE TO
+PERFORM CAN REASONABLY BE EXPECTED TO RESULT IN A
+SIGNIFICANT PHYSICAL INJURY, OR IN LOSS OF LIFE. ANY SUCH USE
+BY YOU IS ENTIRELY AT YOUR OWN RISK, AND YOU AGREE TO
+HOLD INTECHNIC CORPORATION HARMLESS FROM ANY CLAIMS OR
+LOSSES RELATING TO SUCH UNAUTHORIZED USE.
+(b) TOTAL LIABILITY TO YOU FOR ACTUAL DAMAGES FOR ANY CAUSE
+WHATSOEVER WILL BE LIMITED TO THE AMOUNT PAID BY YOU FOR
+THE SOFTWARE THAT CAUSED SUCH DAMAGE.
+
+
+2.11. Upgrades
+
+If this copy of the Software is an upgrade from an earlier version of the Software, it is
+provided to you on a license exchange basis. You agree by installation and use of this copy
+of the Software to voluntarily terminate the earlier End User License Agreement and that
+you will not transfer it to another person or entity.
+
+
+2.12. Export Controls
+
+You may not download or otherwise export or re-export the Software or any underlying
+information or technology except in full compliance with all United States and other
+applicable laws and regulations. In particular, but without limitation, none of the Software
+or underlying information or technology may be downloaded or otherwise exported or reexported
+(i) into (or to a national or resident of) Cuba, Haiti, Iraq, Libya, Yugoslavia, North
+Korea, Iran, Syria or any other country to which the U.S. has embargoed goods; or (ii) to
+anyone on the U.S. Treasury Department's list of Specially Designated Nationals or the U.S.
+Commerce Department's Table of Deny Orders. By downloading or using the Software,
+you are agreeing to the foregoing and you are representing and warranting that you are not
+located in, under the control of, or a national or resident of any such country or on any such
+list.
+
+
+2.13. Severability
+
+The provisions of this Agreement shall be deemed severable, and the invalidity or
+unenforceability of any one or more of the provisions hereof shall not affect the validity and
+enforceability of the other provisions hereof. If any provision of this Agreement is held to
+be unenforceable for any reason, such provision shall be reformed only to the extent
+necessary to make it enforceable, and such decision shall not affect the enforceability (i) of
+such provision under other circumstances or (ii) of the remaining provisions hereof under all
+circumstances. Headings shall not be considered in interpreting this Agreement.
+
+
+2.14. Governing Law
+
+This Agreement is the complete statement of the Agreement between the parties on the
+subject matter, and merges and supersedes all other or prior understandings, purchase orders,
+agreements and arrangements. This Agreement shall be governed by the laws of the State of
+Illinois. Exclusive jurisdiction and venue for all matters relating to this Agreement shall be
+in courts and fora located in the State of Illinois, and you consent to such jurisdiction and
+venue. This Agreement will not be governed by the United Nations Convention of
+Contracts for the International Sale of Goods, the application of which is hereby expressly
+excluded. All questions concerning this should be directed to Attn. Legal Department,
+Intechnic Corporation of 333 E IL 83, Suite 201, Mundelein, IL 60060.
+
+
+2.15. U.S. Government Restricted Usage
+
+Use, duplication or disclosure by the Government is subject to restrictions set forth in
+subparagraphs (a) through (d) of the Commercial Computer-Restricted Rights clause at FAR
+52.227-19 when applicable, or in subparagraph (c)(1)(ii) of the Rights in Technical Data and
+Computer, Intechnic Corporation of 333 E IL 83, Suite 201, Mundelein, IL 60060.
+
+
+2.16. Consumer End Users Outside of the U.S.
+
+The limitations or exclusions of warranties and liability contained in this End User
+License Agreement do not affect or prejudice the statutory rights of a consumer, i.e., a
+person acquiring goods otherwise than in the course of a business.
\ No newline at end of file

Property changes on: releases/5.2.2-B2/LICENSE
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/constants.php
===================================================================
--- releases/5.2.2-B2/constants.php	(revision 0)
+++ releases/5.2.2-B2/constants.php	(revision 16630)
@@ -0,0 +1,137 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	// order statuses
+	define('ORDER_STATUS_INCOMPLETE',	0);
+	define('ORDER_STATUS_PENDING',		1);
+	define('ORDER_STATUS_BACKORDERS',	2);
+	define('ORDER_STATUS_TOSHIP',		3);
+	define('ORDER_STATUS_PROCESSED',	4);
+	define('ORDER_STATUS_DENIED',		5);
+	define('ORDER_STATUS_ARCHIVED',		6);
+
+	/**
+	 * ID of order, that 100% not in database
+	 *
+	 */
+	define('FAKE_ORDER_ID', -1);
+
+	define('PRODUCT_TYPE_TANGIBLE',		1);
+	define('PRODUCT_TYPE_SUBSCRIPTION',	2);
+	define('PRODUCT_TYPE_SERVICE',		3);
+	define('PRODUCT_TYPE_DOWNLOADABLE',	4);
+	define('PRODUCT_TYPE_PACKAGE',		5);
+
+	// payment gateway processing statuses
+	define('SHIPPING_CONTROL_DIRECT', 3);
+	define('SHIPPING_CONTROL_PREAUTH', 4);
+
+	// gift certificate statuses
+	define('gcENABLED', 1);
+	define('gcUSED', 2);
+	define('gcDISABLED', 0);
+
+	define('USPS_LABEL_FOLDER', WRITEABLE . '/user_files/labels/');
+
+	define('ORDER_SHIP_ALL_TOGETHER', 0);
+	define('ORDER_SHIP_BACKORDERS_SEPARATELY', 1);
+	define('ORDER_SHIP_BACKORDERS_UPON_AVAILABLE', 2);
+
+	define('ORDER_GROUP_SHIPPMENTS_AUTO', 0);
+	define('ORDER_GROUP_SHIPPMENTS_MANUAL', 1);
+
+	define('PRODUCT_SHIPPING_MODE_ANY_AND_SELECTED', 0);
+	define('PRODUCT_SHIPPING_MODE_SELECTED_ONLY', 1);
+
+	class OrderCheckoutError {
+		const STATE_CHANGED = 10;
+		const CHANGED_AFTER_LOGIN = 11;
+
+		const QTY_UNAVAILABLE = 20; // orditems:Quantity (users tries to order more, then in stock)
+		const QTY_OUT_OF_STOCK = 21; // orditems:Quantity (product was sold out, after it was added to cart, but before checkout)
+		const QTY_CHANGED_TO_MINIMAL = 22; // orditems:Quantity (qty change to minimal available by price brackets)
+
+		const COUPON_APPLIED = 30; // orditems:ItemData, general
+		const COUPON_REMOVED = 31; // orditems:ItemData, general
+		const COUPON_REMOVED_AUTOMATICALLY = 32; // when discount is more efficient, then coupon being applied
+		const COUPON_CODE_INVALID = 33; // general
+		const COUPON_CODE_EXPIRED = 34; // general
+
+		const GC_APPLIED = 40; // general
+		const GC_REMOVED = 41; // general
+		const GC_REMOVED_AUTOMATICALLY = 42; // general
+		const GC_CODE_INVALID = 43; // general
+		const GC_CODE_EXPIRED = 44; // general
+
+		// new, to integrate
+		const DISCOUNT_APPLIED = 50; // orditems:ItemData, general
+		const DISCOUNT_REMOVED = 51; // orditems:ItemData, general
+
+		const FIELD_UPDATE_SUCCESS = 60; // when order item field is changed + not discount/coupon related
+		const FIELD_UPDATE_ERROR = 61; // when order item field can't be changed + not discount/coupon related
+	}
+
+	class OrderCheckoutErrorType {
+		const PRODUCT = 1;
+		const COUPON = 2;
+		const GIFT_CERTIFICATE = 3;
+		const DISCOUNT = 4;
+	}
+
+	class ProductInventory {
+		const DISABLED = 0;
+		const BY_PRODUCT = 1;
+		const BY_OPTIONS = 2;
+	}
+
+	class ProductBackorder {
+		const AUTO = 2;
+		const ALWAYS = 1;
+		const NEVER = 0;
+	}
+
+	class OptionType {
+		const DROPDOWN = 1;
+		const TEXT = 5;
+		const TEXTAREA = 4;
+		const RADIO = 3;
+		const CHECKBOX = 6;
+	}
+
+	class OptionCombinationPriceType {
+		const EQUALS = 1;
+		const FLAT = 2;
+		const PECENT = 3;
+	}
+
+	class DiscountType {
+		const FLAT = 1;
+		const PERCENT = 2;
+	}
+
+	class DiscountItemType {
+		const PRODUCT = 1;
+		const CATEGORY = 2;
+		const WHOLE_ORDER = 0;
+	}
+
+	class CouponType {
+		const FLAT = 1;
+		const PERCENT = 2;
+	}
+
+	class CouponItemType {
+		const PRODUCT = 1;
+		const CATEGORY = 2;
+		const WHOLE_ORDER = 0;
+	}

Property changes on: releases/5.2.2-B2/constants.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 16630)
@@ -0,0 +1,126 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePlansEventHandler extends kDBEventHandler {
+
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			if ( $event->Special == 'active' ) {
+				/** @var kDBList $object */
+				$object = $event->getObject();
+
+				$object->addFilter('active', '%1$s.Enabled = 1');
+			}
+		}
+
+		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSetPrimary($event)
+		{
+			$object = $event->getObject();
+			$object->SetDBField('IsPrimary', 1);
+			$object->Update();
+		}
+
+		/**
+		 * Occurs before updating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(kEvent $event)
+		{
+			parent::OnBeforeItemCreate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before item is changed
+		 *
+		 * @param kEvent $event
+		 */
+		function itemChanged($event)
+		{
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$plans_count = $this->Conn->GetOne('SELECT COUNT(*) FROM ' . $live_table);
+			if ( !$plans_count ) {
+				$object->SetDBField('IsPrimary', 1);
+			}
+
+			if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
+				$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						SET IsPrimary = 0';
+				$this->Conn->Query($sql);
+
+				$object->SetDBField($object->getStatusField(), 1);
+			}
+		}
+
+		/**
+		 * Don't allow to delete primary affiliate plan
+		 *
+		 * @param kEvent $event
+		 * @param string $type
+		 * @return void
+		 * @access protected
+		 */
+		protected function customProcessing(kEvent $event, $type)
+		{
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				$ids = $event->getEventParam('ids');
+
+				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
+						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						WHERE IsPrimary = 1';
+				$primary_id = $this->Conn->GetOne($sql);
+
+				$ids = array_diff($ids, Array ($primary_id));
+
+				$event->setEventParam('ids', $ids);
+			}
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_config.php	(revision 16630)
@@ -0,0 +1,126 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'ap',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatePlansEventHandler', 'file' => 'affiliate_plans_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'AffiliatePlanId',
+	'StatusField' => Array ('Enabled', 'IsPrimary'), // field, that is affected by Approve/Decline events
+
+	'TitleField' => 'Name',
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('ap' => '!la_title_Adding_Affiliate_Plan!'),
+			'edit_status_labels' => Array ('ap' => '!la_title_Editing_Affiliate_Plan!'),
+			'new_titlefield' => Array ('ap' => '!la_title_New_Affiliate_Plan!'),
+		),
+
+		'affiliate_plans_list' => Array ('prefixes' => Array ('ap_List'), 'format' => "!la_title_AffiliatePlans!"),
+		'affiliate_plans_edit' => Array ('prefixes' => Array ('ap'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_General!"),
+		'affiliate_plans_brackets' => Array ('prefixes' => Array ('ap', 'apbrackets_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"),
+		'affiliate_plans_items' => Array ('prefixes' => Array ('ap', 'api_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/affiliate_plans/affiliate_plans_edit', 'priority' => 1),
+			'brackets' => Array ('title' => 'la_tab_Brackets', 't' => 'in-commerce/affiliate_plans/affiliate_plans_brackets', 'priority' => 2),
+//			'items' => Array ('title' => 'la_tab_Items', 't' => 'in-commerce/affiliate_plans/affiliate_plans_items', 'priority' => 3),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:affiliate_plans'),
+
+	'Sections' => Array (
+		'in-commerce:affiliate_plans' => Array (
+			'parent' => 'in-commerce:affiliates_folder',
+			'icon' => 'affiliates',
+			'label' => 'la_tab_AffiliatePlans',
+			'url' => Array ('t' => 'in-commerce/affiliate_plans/affiliate_plans_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline', 'advanced:set_primary'),
+			'priority' => 5.2, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'AffiliatePlans',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'SubItems' => Array ('apbrackets', /*'api'*/),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('IsPrimary' => 'desc'),
+			'Sorting' => Array ('Name' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'AffiliatePlanId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'unique' => Array (), 'not_null' => 1, 'required' => 1, 'default' => ''),
+		'PlanType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (/*0 => 'la_by_amount',*/ 1 => 'la_by_amount', 2 => 'la_by_items_sold'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => 1),
+		'ResetInterval' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (86400 => 'la_day', 604800 => 'la_week', 2628000 => 'la_month', 7884000 => 'la_quartely', 31536000 => 'la_year'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+		'PaymentType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_regular', 1 => 'la_by_request'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+		'MinPaymentAmount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'Enabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'0_0' => 'icon16_disabled.png',
+				'0_1' => 'icon16_disabled.png',
+				'1_0' => 'icon16_item.png',
+				'1_1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'AffiliatePlanId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+				'PlanType' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+				'Enabled' => Array ( 'title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans/affiliate_plans_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.28.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php	(revision 16630)
@@ -0,0 +1,48 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePlansItemsTagProcessor extends kDBTagProcessor  {
+
+		function IsEntireOrder($params)
+		{
+			$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+			if ($this->Application->IsTempMode($this->Prefix)) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
+
+			$sql = 'SELECT COUNT(*)
+					FROM ' . $table_name . '
+					WHERE (ItemType = 0) AND (AffiliatePlanId = ' . $this->Application->GetVar('ap_id') . ')';
+			return $this->Conn->GetOne($sql);
+		}
+
+		function ItemIcon($params)
+		{
+			/** @var kDBList $object */
+			$object = $this->getObject($params);
+
+			if ($object->GetDBField('ItemType') == 2) {
+				$cat_object = $this->Application->recallObject('c');
+				$cat_object->Load( $object->GetDBField('CategoryId') );
+				$cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
+
+				return $cat_tag_processor->ItemIcon();
+			}
+
+			return parent::ItemIcon($params);
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2.8.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(revision 16630)
@@ -0,0 +1,94 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+		// NOT IN USE RIGHT NOW (by Alex)
+	class AffiliatePlansItemsEventHandler extends kDBEventHandler {
+
+		/**
+		 * Adds selected items to affiliate products
+		 *
+		 * @param kEvent $event
+		 */
+		function OnProcessSelected($event)
+		{
+			// uses another handler event, because does the same stuff but on different table
+			$di_handler = $this->Application->recallObject('di_EventHandler');
+			$di_handler->OnProcessSelected($event);
+		}
+
+		/**
+		 * Allows to set discount on entire order
+		 *
+		 * @param kEvent $event
+		 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
+		 * @access public
+		 */
+		function OnEntireOrder($event)
+		{
+			$object = $event->getObject();
+			$sql = 'DELETE FROM '.$object->TableName.' WHERE AffiliatePlanId='.$this->Application->GetVar('ap_id');
+			$this->Conn->Query($sql);
+
+			$object->SetDBField('AffiliatePlanId', $this->Application->GetVar('ap_id'));
+			$object->SetDBField('ItemResourceId', -1);
+			$object->SetDBField('ItemType', 0);
+
+			if ( $object->Create() ) {
+				$this->customProcessing($event, 'after');
+				$event->status = kEvent::erSUCCESS;
+				$event->SetRedirectParam('opener', 's'); //stay!
+			}
+			else {
+				$event->status = kEvent::erFAIL;
+				$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent','OnCreate');
+				$object->setID(0);
+			}
+		}
+
+		/**
+		 * Deletes discount items where hooked item (product) is used
+		 *
+		 * @param kEvent $event
+		 */
+		function OnDeleteDiscountedItem($event)
+		{
+			$main_object = $event->MasterEvent->getObject();
+			$resource_id = $main_object->GetDBField('ResourceId');
+
+			$table = $this->Application->getUnitOption($event->Prefix,'TableName');
+			$sql = 'DELETE FROM '.$table.' WHERE ItemResourceId = '.$resource_id;
+			$this->Conn->Query($sql);
+		}
+
+		/**
+		 * Makes ItemName calculated field from primary language
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterConfigRead(kEvent $event)
+		{
+			parent::OnAfterConfigRead($event);
+
+			$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+
+			$language_id = $this->Application->GetVar('m_lang');
+			$primary_language_id = $this->Application->GetDefaultLanguageId();
+
+			$calculated_fields['']['ItemName'] = 'COALESCE(p.l' . $language_id . '_Name, p.l' . $primary_language_id . '_Name)';
+			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_config.php	(revision 16630)
@@ -0,0 +1,127 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'api',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatePlansItemsEventHandler', 'file' => 'affiliate_plans_items_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AffiliatePlansItemsTagProcessor', 'file' => 'affiliate_plans_items_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnAfterItemDelete'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnDeleteDiscountedItem',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'AffiliateItemId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'AffiliatePlansItems',
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ProductId' => 'p.ProductId',
+			'ItemName' => 'IF(p.Name IS NULL,c.Name,p.l1_Name)',
+			'SKU' => 'p.SKU',
+			'Weight' => 'p.Weight',
+			'CreatedOn' => 'p.CreatedOn',
+			'BackOrderDate' => 'p.BackOrderDate',
+			'Status' => 'p.Status',
+			'CategoryId' => 'c.CategoryId',
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Products p ON %1$s.ItemResourceId = p.ResourceId
+				LEFT JOIN '.TABLE_PREFIX.'Categories c ON %1$s.ItemResourceId = c.ResourceId',
+	),
+
+	'ForeignKey' => 'AffiliatePlanId',
+	'ParentTableKey' => 'AffiliatePlanId',
+	'ParentPrefix' => 'ap',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('ItemName' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'AffiliateItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'AffiliatePlanId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'ItemResourceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'ItemType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Product', 2 => 'la_Category', 0 => 'la_WholeOrder' ), 'not_null' => 1, 'default' => 1, ),
+	),
+
+	'VirtualFields' => Array (
+		'ProductId' => Array ('type' => 'int', 'default' => 0),
+		'ItemName' => Array ('type' => 'string', 'default' => ''),
+		'SKU' => Array ('type' => 'string', 'default' => ''),
+		'Weight' => Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL),
+		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'BackOrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'default' => 2,
+		),
+		'CategoryId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array ('default' => 'icon16_entire_order.gif'),
+			'Fields' => Array (
+				'ItemType' => Array ( 'title' => 'la_col_ItemType', 'data_block' => 'grid_checkbox_td' ),
+			),
+		),
+
+		'AffiliatePlansItems' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+			),
+			'Fields' => Array (
+				'ProductId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td', 'filter_block' => 'grid_range_filter'),
+				'ItemName' => Array ('filter_block' => 'grid_like_filter'),
+				'ItemType' => Array ('title' => 'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_items/affiliate_plans_items_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gateways_config.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gateways_config.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gateways_config.php	(revision 16630)
@@ -0,0 +1,92 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'gwf',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'GatewayEventHandler', 'file' => 'gw_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'GatewayTagProcessor', 'file' => 'gw_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => array(
+		array('pseudo' => 'kGWBase', 'class' => 'kGWBase', 'file' => 'gw_classes/gw_base.php', 'build_event' => ''),
+		array('pseudo' => 'kAtosOriginGW', 'class' => 'kAtosOriginGW', 'file' => 'gw_classes/atosorigin.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWAuthorizeNet', 'class' => 'kGWAuthorizeNet', 'file' => 'gw_classes/authorizenet.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWGoogleCheckout', 'class' => 'kGWGoogleCheckout', 'file' => 'gw_classes/google_checkout.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWiDEALnl', 'class' => 'kGWiDEALnl', 'file' => 'gw_classes/ideal_nl.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kMultiCardsGW', 'class' => 'kMultiCardsGW', 'file' => 'gw_classes/multicards.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kPayboxGW', 'class' => 'kPayboxGW', 'file' => 'gw_classes/paybox.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kPaymentechGW', 'class' => 'kPaymentechGW', 'file' => 'gw_classes/paymentech.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWPayPal', 'class' => 'kGWPayPal', 'file' => 'gw_classes/paypal.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWPaypalDirect', 'class' => 'kGWPaypalDirect', 'file' => 'gw_classes/paypal_direct.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWRightConnect', 'class' => 'kGWRightConnect', 'file' => 'gw_classes/rightconnect.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kSellaGuestPayGW', 'class' => 'kSellaGuestPayGW', 'file' => 'gw_classes/sella_guestpay.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kVerisignPfLinkGW', 'class' => 'kVerisignPfLinkGW', 'file' => 'gw_classes/verisign_pflink.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+		array('pseudo' => 'kGWWorldPay', 'class' => 'kGWWorldPay', 'file' => 'gw_classes/worldpay.php', 'build_event' => '', 'require_classes' => 'kGWBase'),
+	),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'pt',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnListBuild' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnCheckGateways',
+		),
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => 'pt',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnCreate', 'OnSave', 'OnUpdate', 'onPreSaveAndGoToTab', 'onPreSaveAndGo' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnSaveValues',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'GWConfigFieldId',
+	'TableName' => TABLE_PREFIX.'GatewayConfigFields',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'Fields' => Array (
+		'GWConfigFieldId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'SystemFieldName' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', ),
+		'FieldName' => Array ('type' => 'string', 'required' => true, 'max_len' => 100, 'not_null' => 1, 'default' => '', ),
+		'ElementType' => Array ('type' => 'string', 'not_null' => 1, 'default' => 'text', ),
+		'ValueList' => Array ('type' => 'string', 'default' => NULL),
+		'GatewayId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+	),
+
+	'VirtualFields' => Array (
+		'Value' => Array ('type' => 'string', 'default' => ''),
+	),
+);

Property changes on: releases/5.2.2-B2/units/gateways/gateways_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_event_handler.php	(revision 16630)
@@ -0,0 +1,85 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class GatewayEventHandler extends kDBEventHandler {
+
+	function OnSaveValues($event)
+	{
+		// if there is no id - it means we need to create an item
+		$item_id = $this->getPassedID($event);
+		$event->setPseudoClass('_List');
+
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		$PaymentType_info = $this->Application->GetVar( 'pt' );
+		$GWConfigValue = $this->Application->recallObject('gwfv');
+		$GWConfigValue->SetDBField('PaymentTypeId', $this->Application->GetVar('pt_id'));
+
+		//deleting old values
+		$sql = 'DELETE FROM '.$GWConfigValue->TableName.' WHERE PaymentTypeId = '.$this->Application->GetVar('pt_id');
+		$res = $this->Conn->Query($sql);
+
+		//selecting fields for selected gateway only
+		$sql = 'SELECT GWConfigFieldId FROM '.TABLE_PREFIX.'GatewayConfigFields
+					WHERE GatewayId = '.$PaymentType_info[$this->Application->GetVar('pt_id')]['GatewayId'];
+		$res = $this->Conn->GetCol($sql);
+
+		if($items_info)
+		{
+			foreach($res as $gw_field_id)
+			{
+				$field_values = $items_info[$gw_field_id];
+				$field_values['GWConfigFieldId'] = $gw_field_id;
+
+				$GWConfigValue->SetFieldsFromHash($field_values);
+				if( $GWConfigValue->Create() )
+				{
+					$event->status=kEvent::erSUCCESS;
+				}
+				else
+				{
+					$event->status=kEvent::erFAIL;
+					break;
+				}
+			}
+		}
+	}
+
+	protected function OnCheckGateways($event)
+	{
+		if ( !$this->Application->isAdminUser ) {
+			return;
+		}
+
+		$gateways = glob(GW_CLASS_PATH . DIRECTORY_SEPARATOR . '*.php');
+
+		if ( !$gateways ) {
+			return;
+		}
+
+		foreach ($gateways as $gateway_file) {
+			$class_name = false;
+			include_once($gateway_file);
+
+			if ( !$class_name ) {
+				continue;
+			}
+
+			/** @var kGWBase $tmp */
+			$tmp = new $class_name();
+
+			$tmp->Install();
+		}
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php	(revision 16630)
@@ -0,0 +1,50 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH.'/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$sql = 'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+			LEFT JOIN '.TABLE_PREFIX.'Gateways AS g ON g.GatewayId = pt.GatewayId
+			WHERE g.ClassName = "kGWGoogleCheckout"';
+	$payment_type_id = $application->Conn->GetOne($sql);
+
+	$application->SetVar('payment_type_id', $payment_type_id); // keep, because kGWGoogleCheckout::processNewOrderNotification relies on this
+
+	/** @var OrdersItem $order */
+	$order = $application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+	$gw_data = $order->getGatewayData($application->GetVar('payment_type_id'));
+	$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
+	$gateway_object = $application->recallObject( $gw_data['ClassName'] );
+
+	$transaction_status = $gateway_object->processNotification($gw_data['gw_params']);
+
+	$sql = 'UPDATE '.$order->TableName.'
+			SET TransactionStatus = '.$transaction_status.'
+			WHERE '.$order->IDField.' = '.$order->GetID();
+	$application->Conn->Query($sql);
+
+	$order->SetDBField('TransactionStatus', $transaction_status);
+
+	if ($transaction_status == 1) {
+		$application->SetVar('ord_id', $order->GetID()); // used in OrdersEventHandler::UpdateOrderItem
+		$application->HandleEvent(new kEvent('ord:OnCompleteOrder'));
+	}
+
+	$application->Done();
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_error.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_error.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_error.php	(revision 16630)
@@ -0,0 +1,31 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH.'/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('sella_error', 1);
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kSellaGuestPayGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_error.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_ok.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_ok.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_ok.php	(revision 16630)
@@ -0,0 +1,31 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('sella_ok', 1);
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kSellaGuestPayGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_ok.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/paybox_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/paybox_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/paybox_notify.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH.'/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kPayboxGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/paybox_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/multicards_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/multicards_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/multicards_notify.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kMultiCardsGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/multicards_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kVerisignPfLinkGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/verisign_pflink_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/.htaccess
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/.htaccess	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/.htaccess	(revision 16630)
@@ -0,0 +1 @@
+allow from all
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/.htaccess
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php	(revision 16630)
@@ -0,0 +1,38 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$sql = 'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+			LEFT JOIN '.TABLE_PREFIX.'Gateways AS g ON g.GatewayId = pt.GatewayId
+			WHERE g.ClassName = "kGWGoogleCheckout"';
+	$payment_type_id = $application->Conn->GetOne($sql);
+
+	/** @var OrdersItem $order */
+	$order = $application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+	$gw_data = $order->getGatewayData($payment_type_id);
+	$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
+
+	/** @var kGWGoogleCheckout $gateway_object */
+	$gateway_object = $application->recallObject( $gw_data['ClassName'] );
+
+	$gateway_object->processNotification($gw_data['gw_params'], 'shippings');
+
+	$application->Done();
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kAtosOriginGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/atosorigin_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_notify.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_notify.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_notify.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../../../../../..'));
+
+	include_once(FULL_PATH.'/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+	$application->SetVar('payment_type_id',
+				$application->Conn->GetOne(
+					'SELECT PaymentTypeId FROM '.TABLE_PREFIX.'PaymentTypes AS pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways AS g
+					ON g.GatewayId = pt.GatewayId
+					WHERE g.ClassName = '.$application->Conn->qstr('kSellaGuestPayGW')));
+
+	include(MODULES_PATH.'/in-commerce/gw_notify.php');
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/notify_scripts/sella_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/verisign_pflink.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/verisign_pflink.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/verisign_pflink.php	(revision 16630)
@@ -0,0 +1,137 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kVerisignPfLinkGW'; // for automatic installation
+
+	class kVerisignPfLinkGW extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Verisign Payflow Link', 'ClassName' => 'kVerisignPfLinkGW', 'ClassFile' => 'verisign_pflink.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'https://payments.verisign.com/payflowlink'),
+					'login' => Array('Name' => 'Login', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'partner' => Array('Name' => 'Partner', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'transaction_type' => Array('Name' => 'Transaction Type (S/A)', 'Type' => 'text', 'ValueList' => '', 'Default' => 'S'),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$params['LOGIN'] = $gw_params['login'];
+			$params['PARTNER'] = $gw_params['partner'];
+			$params['TYPE'] = $gw_params['transaction_type'];
+
+			$params['AMOUNT'] = $item_data['TotalAmount'];
+
+
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+
+			$params['NAME'] = $item_data['BillingTo'];
+			$params['PHONE'] = $item_data['BillingPhone'];
+			$params['ADDRESS'] = $item_data['BillingAddress1'] . ' ' . $item_data['BillingAddress2'];
+			$params['CITY'] = $item_data['BillingCity'];
+			$params['ZIP'] = $item_data['BillingZip'];
+			$params['COUNTRY'] = $item_data['BillingCountry'];
+			$params['EMAIL'] = $billing_email;
+
+			$params['COMMENT1'] = '';
+
+			$params['DESCRIPTION'] = 'Order #'.$item_data['OrderNumber'];
+
+			$params['INVOICE'] = $item_data['OrderNumber'];
+
+			$params['CUSTID'] = $item_data['PortalUserId'];
+			$params['USER1'] = $item_data['OrderId'];
+			$params['USER2'] = $this->Application->GetSID();
+
+			return $params;
+		}
+
+		function processNotification($gw_params)
+		{
+			$result = $this->parseGWResponce($_POST, $gw_params);
+
+			$session = $this->Application->recallObject('Session');
+			$session->SID = $_POST['USER2'];
+
+			$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE OrderId = '.$_POST['USER1']);
+			$this->Application->SetVar('ord_id', $order_id);
+			$order = $this->Application->recallObject('ord');
+			$order->Load($order_id);
+
+			define('ADMIN', 1);
+			if (!$this->Application->GetVar('silent')) {
+				if ($result['RESULT'] == '0') {
+					$this->Application->Redirect('in-commerce/checkout/checkout_success', array('pass'=>'m', 'm_cat_id'=>0), '_FRONT_END_', 'index.php');
+				}
+				else {
+					$this->Application->StoreVar('gw_error', $this->getErrorMsg());
+					$this->Application->Redirect('in-commerce/checkout/billing', array('pass'=>'m', 'm_cat_id'=>0), '_FRONT_END_', 'index.php');
+				}
+			}
+
+			return $result['RESULT'] == '0' ? 1 : 0;
+		}
+
+		function parseGWResponce($res, $gw_params)
+		{
+			$this->parsed_responce = $res;
+			return $res;
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			$msg = $this->parsed_responce['RESPMSG'];
+			if (!$msg) {
+				if ($this->parsed_responce['RESULT'] != '0') {
+					$msg = 'Transaction failed';
+				}
+			}
+			return $msg;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/verisign_pflink.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/paymentech.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/paymentech.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/paymentech.php	(revision 16630)
@@ -0,0 +1,327 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kPaymentechGW'; // for automatic installation
+
+	class kPaymentechGW extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Patmentech/Orbital', 'ClassName' => 'kPaymentechGW', 'ClassFile' => 'paymentech.php', 'RequireCCFields' => 1),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'user_account' => Array('Name' => 'Merchant ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'user_bin' => Array('Name' => 'BIN Number', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+					'deny_cvv' => Array('Name' => 'Decline the following CVV response codes (ex: N,P)', 'Type' => 'text', 'ValueList' => '', 'Default' => 'N,P,S'),
+					'deny_avs' => Array('Name' => 'Decline the following AVS response codes (ex: 1,3,R,5,6,G)', 'Type' => 'text', 'ValueList' => '', 'Default' => '1,2,3,4,R,5,6,7,8,A,C,D,E,F,G,Z'),
+				)
+			);
+			return $data;
+		}
+
+		function DirectPayment($item_data, $gw_params)
+		{
+			// if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+			$data = array(
+				//sys default
+				'TzCode' => 705,
+				'CurrencyCode' => 840,
+				'CurrencyExponent' => 2,
+				'TxDateTime' => '', //gateway will set current timestamp
+
+				//merchant info
+				'MerchantID' => $gw_params['user_account'],
+				'BIN' => $gw_params['user_bin'],
+
+				//transaction
+				// A - Authorize Only  // AC - Authorize & Capture // C - Prior Auth Capture
+				'MessageType' => $gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'A' : 'AC',
+
+				'Amount' => str_replace('.', '', sprintf('%.2f', $item_data['TotalAmount'])),
+				'AccountNum' => $item_data['PaymentAccount'], //card num
+				'Exp' => str_replace('/', '', $item_data['PaymentCCExpDate']), //expiration
+				'CardSecVal' => $item_data['PaymentCVV2'], //cvv2
+
+				//customer info
+				'AVSname' => $item_data['PaymentNameOnCard'],
+				'AVSaddress1' => $item_data['BillingAddress1'],
+				'AVSaddress2' => $item_data['BillingAddress2'],
+				'AVScity' => $item_data['BillingCity'],
+				'AVSstate' => $item_data['BillingState'],
+				'AVSzip' => $item_data['BillingZip'],
+
+				// order info
+				'OrderID' => $item_data['OrderNumber'],
+				'ECOrderNum' => $item_data['OrderNumber'],
+				'Comments' => 'Invoice #'.$item_data['OrderNumber'],
+				'ShippingRef' => '',
+			);
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$data['AVScountryCode'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
+
+			if ($data['AVScountryCode'] != 'US') {
+				$data['AVSstate'] = '';
+			}
+
+			$headers = Array(
+				'POST /AUTHORIZE HTTP/1.0',
+				'MIME-Version: 1.0',
+				'Content-type: application/PTI34',
+				'Content-transfer-encoding: text',
+				'Request-number: 1',
+				'Document-type: Request'
+			);
+			$xml = $this->PrepareXML($data);
+
+			$this->setGWResponce($gw_params, $headers, $xml);
+			$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+			$this->CheckCVV_AVS($gw_params);
+			return ($this->parsed_responce['ProcStatus'] != 0 || $this->parsed_responce['ApprovalStatus'] != 1) ? false : true;
+		}
+
+		function CheckCVV_AVS($gw_params)
+		{
+			$cvv_reject = explode(',', $gw_params['deny_cvv']);
+			if (in_array(trim($this->parsed_responce['CVV2RespCode']), $cvv_reject)) {
+				$this->parsed_responce['ApprovalStatus'] = 0;
+			}
+			$avs_reject = explode(',', $gw_params['deny_avs']);
+			if (in_array(trim($this->parsed_responce['AVSRespCode']), $avs_reject)) {
+				$this->parsed_responce['ApprovalStatus'] = 0;
+			}
+		}
+
+		/**
+		 * Perform SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function Charge($item_data, $gw_params)
+		{
+			$gw_responce = unserialize( $item_data['GWResult1'] );
+
+			if( ( strtoupper($gw_responce['MessageType']) == 'A') )
+			{
+				$data = array(
+					//sys default
+					'TzCode' => 705,
+					'CurrencyCode' => 840,
+					'CurrencyExponent' => 2,
+					'TxDateTime' => '', //gateway will set current timestamp
+
+					//merchant info
+					'MerchantID' => $gw_params['user_account'],
+					'BIN' => $gw_params['user_bin'],
+
+					//transaction
+					// A - Authorize Only  // AC - Authorize & Capture // C - Prior Auth Capture
+					'Amount' => str_replace('.', '', sprintf('%.2f', $item_data['TotalAmount'])),
+					'MessageType' => 'C',
+					'OrderID' => $gw_responce['OrderID'],
+					'TxRefNum' => $gw_responce['TxRefNum'],
+				);
+
+				$headers = Array(
+					'POST /AUTHORIZE HTTP/1.0',
+					'MIME-Version: 1.0',
+					'Content-type: application/PTI34',
+					'Content-transfer-encoding: text',
+					'Request-number: 1',
+					'Document-type: Request'
+				);
+
+				$xml = $this->PrepareXML($data);
+
+				$this->setGWResponce($gw_params, $headers, $xml);
+				$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+				return ($gw_responce['ProcStatus'] != 0 || $gw_responce['ApprovalStatus'] != 1) ? false : true;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		function setGWResponce($gw_params, $headers, $xml)
+		{
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetHeaders($headers);
+			$curl_helper->SetPostData($xml);
+
+			$this->gw_responce = $curl_helper->Send( $gw_params['submit_url'] );
+		}
+
+		/**
+		 * Parse previosly saved gw responce into associative array
+		 *
+		 * @param string $gw_responce
+		 * @param Array $gw_params
+		 * @return Array
+		 */
+		function parseGWResponce($gw_responce = null, $gw_params)
+		{
+			if( !isset($gw_responce) ) $gw_responce = $this->gw_responce;
+
+			$parser = $this->Application->recallObject('kXMLHelper');
+			$parser->Clear();
+			$res = $parser->Parse($gw_responce);
+
+			$parsed = array();
+			$parsed['ProcStatus'] = $res->FindChildValue('ProcStatus');
+			$parsed['StatusMsg'] = $res->FindChildValue('StatusMsg');
+
+			$parsed['ApprovalStatus'] = $res->FindChildValue('ApprovalStatus');
+			$parsed['RespCode'] = $res->FindChildValue('RespCode');
+			$parsed['AuthCode'] = $res->FindChildValue('AuthCode');
+			$parsed['AVSRespCode'] = $res->FindChildValue('AVSRespCode');
+			$parsed['CVV2RespCode'] = $res->FindChildValue('CVV2RespCode');
+			$parsed['StatusMsg'] = $res->FindChildValue('StatusMsg');
+			$parsed['RespMsg'] = $res->FindChildValue('RespMsg');
+			$parsed['TxRefNum'] = $res->FindChildValue('TxRefNum');
+			$parsed['TxRefIdx'] = $res->FindChildValue('TxRefIdx');
+			$parsed['RespTime'] = $res->FindChildValue('RespTime');
+			$parsed['Amount'] = $res->FindChildValue('Amount');
+			$parsed['OrderID'] = $res->FindChildValue('OrderNumber');
+
+			$parsed['MessageType'] = $res->FindChildValue('CommonMandatoryResponse', 'MessageType');
+
+			$this->parsed_responce = $parsed;
+			return $parsed;
+		}
+
+		function getErrorMsg()
+		{
+			$code = $this->parsed_responce['ApprovalStatus'];
+			switch ($this->parsed_responce['ApprovalStatus']) {
+				case '0':
+					return 'The transaction has been declined';
+				case '1':
+					return 'The transaction has been approved';
+				default:
+					return 'An error has occured while processing the transaction ('.$this->parsed_responce['StatusMsg'].')';
+			}
+
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function GetTestCCNumbers()
+		{
+			return array('4012888888881', '4055011111111111', '5454545454545454', '5405222222222226', '371449635398431',
+									 '6011000995500000', '36438999960016', '3566002020140006');
+		}
+
+		function PrepareXML($data)
+		{
+			if ($data['MessageType'] == 'A' ||
+					$data['MessageType'] == 'AC') {
+				$xml = <<<END_XML
+<?xml version="1.0" encoding="UTF-8"?>
+<Request>
+    <AC>
+        <CommonData>
+            <CommonMandatory AuthOverrideInd="N" LangInd="00" CardHolderAttendanceInd="01" HcsTcsInd="T" TxCatg="7" MessageType="{$data['MessageType']}" Version="2" TzCode="{$data['TzCode']}">
+                <AccountNum AccountTypeInd="91">{$data['AccountNum']}</AccountNum>
+                <POSDetails POSEntryMode="01"/>
+                <MerchantID>{$data['MerchantID']}</MerchantID>
+                <TerminalID TermEntCapInd="05" CATInfoInd="06" TermLocInd="01" CardPresentInd="N" POSConditionCode="59" AttendedTermDataInd="01">001</TerminalID>
+                <BIN>{$data['BIN']}</BIN>
+                <OrderID>{$data['OrderID']}</OrderID>
+                <AmountDetails>
+                    <Amount>{$data['Amount']}</Amount>
+                </AmountDetails>
+                <TxTypeCommon TxTypeID="G"/>
+                <Currency CurrencyCode="{$data['CurrencyCode']}" CurrencyExponent="{$data['CurrencyExponent']}"/>
+                <CardPresence>
+                    <CardNP>
+                        <Exp>{$data['Exp']}</Exp>
+                    </CardNP>
+                </CardPresence>
+                <TxDateTime>{$data['TxDateTime']}</TxDateTime>
+            </CommonMandatory>
+            <CommonOptional>
+                <Comments>{$data['Comments']}</Comments>
+                <ShippingRef>{$data['ShippingRef']}</ShippingRef>
+                <CardSecVal>{$data['CardSecVal']}</CardSecVal>
+                <ECommerceData ECSecurityInd="07">
+                    <ECOrderNum>{$data['ECOrderNum']}</ECOrderNum>
+                </ECommerceData>
+            </CommonOptional>
+        </CommonData>
+        <Auth>
+            <AuthMandatory FormatInd="H"/>
+            <AuthOptional>
+                <AVSextended>
+                    <AVSname>{$data['AVSname']}</AVSname>
+                    <AVSaddress1>{$data['AVSaddress1']}</AVSaddress1>
+                    <AVSaddress2>{$data['AVSaddress2']}</AVSaddress2>
+                    <AVScity>{$data['AVScity']}</AVScity>
+                    <AVSstate>{$data['AVSstate']}</AVSstate>
+                    <AVSzip>{$data['AVSzip']}</AVSzip>
+                </AVSextended>
+            </AuthOptional>
+        </Auth>
+        <Cap>
+            <CapMandatory>
+                <EntryDataSrc>02</EntryDataSrc>
+            </CapMandatory>
+            <CapOptional/>
+        </Cap>
+    </AC>
+</Request>
+END_XML;
+			}
+			elseif ($data['MessageType'] == 'C') {
+				$xml = <<<END_XML
+<?xml version="1.0" encoding="UTF-8" ?>
+<Request>
+    <AC>
+        <CommonData>
+            <CommonMandatory MessageType="{$data['MessageType']}">
+                <MerchantID>{$data['MerchantID']}</MerchantID>
+                <TerminalID>001</TerminalID>
+                <BIN>{$data['BIN']}</BIN>
+                <OrderID>{$data['OrderID']}</OrderID>
+                <AmountDetails>
+                    <Amount>{$data['Amount']}</Amount>
+                </AmountDetails>
+                <TxDateTime>{$data['TxDateTime']}</TxDateTime>
+            </CommonMandatory>
+            <CommonOptional>
+            	<TxRefNum>{$data['TxRefNum']}</TxRefNum>
+            </CommonOptional>
+        </CommonData>
+    </AC>
+</Request>
+END_XML;
+			}
+			return $xml;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/paymentech.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/atosorigin.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/atosorigin.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/atosorigin.php	(revision 16630)
@@ -0,0 +1,192 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kAtosOriginGW'; // for automatic installation
+
+	class kAtosOriginGW extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Atos Origin', 'ClassName' => 'kAtosOriginGW', 'ClassFile' => 'atosorigin.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'request_binary' => Array('Name' => 'API Request Executable', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'response_binary' => Array('Name' => 'API Response Executable', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'pathfile' => Array('Name' => 'Pathfile', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'merchant_id' => Array('Name' => 'Merchant ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'merchant_country' => Array('Name' => 'Merchant Country Code', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'currency_code' => Array('Name' => 'Currency Code', 'Type' => 'text', 'ValueList' => '', 'Default' => '978'),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$params['pathfile'] = $gw_params['pathfile'];
+			$params['merchant_id'] = $gw_params['merchant_id'];
+			$params['merchant_country'] = $gw_params['merchant_country'];
+			$params['currency_code'] = $gw_params['currency_code'];
+			$params['currency_code'] = $gw_params['currency_code'];
+
+			$params['normal_return_url'] = $this->Application->HREF($tag_params['return_template'],'',Array('pass'=>'m'));
+			$params['cancel_return_url'] = $this->Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m'));
+			$params['automatic_response_url'] = $this->getNotificationUrl('units/gateways/gw_classes/notify_scripts/atosorigin_notify.php');
+
+			$txt_amount = sprintf("%.2f", $item_data['TotalAmount']);
+
+			$params['amount'] = str_replace( Array('.', ','), '', $txt_amount);
+			$params['caddie'] = $this->Application->GetSID() . ',' . MD5($item_data['OrderId']);
+			$params['order_id'] = $item_data['OrderId'];
+			$params['customer_ip_address'] = $this->Application->getClientIp();
+			$params['customer_id'] = $item_data['PortalUserId'];
+
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+			$params['customer_email'] = $billing_email;
+
+			$params_str = '';
+			foreach ($params as $key => $val) {
+				$params_str .= ' '.$key . '="'.$val.'"';
+			}
+			$run_line = $gw_params['request_binary'].' '.$params_str;
+
+//			$run_line = escapeshellcmd($run_line);
+//			echo $run_line;
+
+			exec ($run_line, $rets);
+
+			$ret = $rets[0];
+
+			$ret = preg_replace('/^(.*)!!/is', '', $ret);
+			$ret = rtrim($ret, '!');
+
+			return '</form>'.$ret.'<form>';
+		}
+
+		function NeedPlaceButton($item_data, $tag_params, $gw_params)
+		{
+			return false;
+		}
+
+		function processNotification($gw_params)
+		{
+			$params['pathfile'] = $gw_params['pathfile'];
+			$params['message'] = $_POST['DATA'];
+
+			$params_str = '';
+			foreach ($params as $key => $val) {
+				$params_str .= ' '.$key . '="'.$val.'"';
+			}
+			$run_line = $gw_params['response_binary'].' '.$params_str;
+
+			exec ($run_line, $rets);
+			$ret = $rets[0];
+
+			$result = $this->parseGWResponce($ret, $gw_params);
+
+			list ($sid, $auth_code) = explode(',', $result['caddie']);
+			$session = $this->Application->recallObject('Session');
+			$session->SID = $sid;
+
+			$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
+			$this->Application->SetVar('ord_id', $order_id);
+			$order = $this->Application->recallObject('ord');
+			$order->Load($order_id);
+
+			return $result['response_code'] === '00' ? 1 : 0;
+		}
+
+		function parseGWResponce($str, $gw_params)
+		{
+			$response = explode ("!", $str);
+
+			$result = Array (
+				'code' => $response[1],
+				'error' => $response[2],
+				'merchant_id' => $response[3],
+				'merchant_country' => $response[4],
+				'amount' => $response[5],
+				'transaction_id' => $response[6],
+				'payment_means' => $response[7],
+				'transmission_date' => $response[8],
+				'payment_time' => $response[9],
+				'payment_date' => $response[10],
+				'response_code' => $response[11],
+				'payment_certificate' => $response[12],
+				'authorisation_id' => $response[13],
+				'currency_code' => $response[14],
+				'card_number' => $response[15],
+				'cvv_flag' => $response[16],
+				'cvv_response_code' => $response[17],
+				'bank_response_code' => $response[18],
+				'complementary_code' => $response[19],
+				'complementary_info' => $response[20],
+				'return_context' => $response[21],
+				'caddie' => $response[22],
+				'receipt_complement' => $response[23],
+				'merchant_language' => $response[24],
+				'language' => $response[25],
+				'customer_id' => $response[26],
+				'order_id' => $response[27],
+				'customer_email' => $response[28],
+				'customer_ip_address' => $response[29],
+				'capture_day' => $response[30],
+				'capture_mode' => $response[31],
+				'data' => $response[32],
+			);
+			$this->parsed_responce = $result;
+			return $result;
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			$msg = $this->parsed_responce['error'];
+			if (!$msg) {
+				if ($this->parsed_responce['response_code'] != '00') {
+					$msg = 'Transaction failed';
+				}
+			}
+			return $msg;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/atosorigin.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/paypal_direct.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/paypal_direct.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/paypal_direct.php	(revision 16630)
@@ -0,0 +1,241 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kGWPaypalDirect'; // for automatic installation
+
+	class kGWPaypalDirect extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'PayPal Pro', 'ClassName' => 'kGWPaypalDirect', 'ClassFile' => 'paypal_direct.php', 'RequireCCFields' => 1),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'https://api-3t.paypal.com/nvp'),
+					'api_username' => Array('Name' => 'PayPal Pro API Username', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'api_password' => Array('Name' => 'PayPal Pro API Password', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'signature' => Array('Name' => 'PayPal Pro API Signature', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		function DirectPayment($item_data, $gw_params)
+		{
+			$post_fields = Array();
+			// -- Login Information --
+			$post_fields['METHOD']				=	'DoDirectPayment';
+			$post_fields['VERSION']				=	'52.0';
+			$post_fields['IPADDRESS']			=	$this->Application->getClientIp();
+			$post_fields['USER']				=	$gw_params['api_username'];
+			$post_fields['PWD']					=	$gw_params['api_password'];
+			$post_fields['SIGNATURE']			=	$gw_params['signature'];
+			$post_fields['PAYMENTACTION']		=	'Sale';
+			$post_fields['AMT']					=	sprintf('%.2f', $item_data['TotalAmount']);
+
+			switch ($item_data['PaymentCardType']) {
+				case 1:
+					$post_fields['CREDITCARDTYPE'] = 'Visa';
+					break;
+				case 2:
+					$post_fields['CREDITCARDTYPE'] = 'MasterCard';
+					break;
+				case 3:
+					$post_fields['CREDITCARDTYPE'] = 'Amex';
+					break;
+				case 4:
+					$post_fields['CREDITCARDTYPE'] = 'Discover';
+					break;
+				default:
+					$this->parsed_responce['responce_reason_text'] = 'Invalid Credit Card Type';
+					return false;
+			}
+
+			$post_fields['ACCT']				=	$item_data['PaymentAccount'];
+			$date_parts = explode('/', $item_data['PaymentCCExpDate']);
+			$post_fields['EXPDATE']				=	$date_parts[0].'20'.$date_parts[1];
+			$post_fields['CVV2']				=	$item_data['PaymentCVV2'];
+
+			$names = explode(' ', $item_data['PaymentNameOnCard'], 2);
+			$post_fields['FIRSTNAME']			=	getArrayValue($names, 0);
+			$post_fields['LASTNAME']			=	getArrayValue($names, 1);
+
+			$post_fields['STREET']				=	$item_data['BillingAddress1'];
+			$post_fields['STREET2']				=	$item_data['BillingAddress2'];
+			$post_fields['CITY']				=	$item_data['BillingCity'];
+			$post_fields['STATE']				=	$item_data['BillingState'];
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$post_fields['COUNTRYCODE']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
+			$post_fields['ZIP']					=	$item_data['BillingZip'];
+			$post_fields['INVNUM']				=	$item_data['OrderNumber'];
+			$post_fields['CUSTOM']				=	$item_data['PortalUserId'];
+
+/*
+			$post_fields['x_encap_char']		=	$gw_params['encapsulate_char'];
+			$post_fields['x_relay_response']	=	'False';
+			$post_fields['x_type']				=	$gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'AUTH_ONLY' : 'AUTH_CAPTURE';
+			$post_fields['x_login']				=	$gw_params['user_account'];
+			$post_fields['x_tran_key']			=	$gw_params['transaction_key'];
+
+			if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+			// -- Payment Details --
+			$names = explode(' ', $item_data['PaymentNameOnCard'], 2);
+			$post_fields['x_first_name']		=	getArrayValue($names, 0);
+			$post_fields['x_last_name']			=	getArrayValue($names, 1);
+			$post_fields['x_amount']			=	sprintf('%.2f', $item_data['TotalAmount']);
+			$post_fields['x_company']			=	$item_data['BillingCompany'];
+			$post_fields['x_card_num']			=	$item_data['PaymentAccount'];
+			$post_fields['x_card_code']			=	$item_data['PaymentCVV2'];
+			$post_fields['x_exp_date']			=	$item_data['PaymentCCExpDate'];
+			$post_fields['x_address']			=	$item_data['BillingAddress1'].' '.$item_data['BillingAddress2'];
+			$post_fields['x_city']				=	$item_data['BillingCity'];
+			$post_fields['x_state']				=	$item_data['BillingState'];
+			$post_fields['x_zip']				=	$item_data['BillingZip'];
+
+			$recurring = getArrayValue($item_data, 'IsRecurringBilling') ? 'YES' : 'NO';
+			$post_fields['x_recurring_billing'] = $recurring;
+
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+			$post_fields['x_email'] = $billing_email;
+			$post_fields['x_phone'] = $item_data['BillingPhone'];
+			$post_fields['x_country']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
+
+			$post_fields['x_cust_id']			=	$item_data['PortalUserId'];
+			$post_fields['x_invoice_num']		=	$item_data['OrderNumber'];
+			$post_fields['x_description']		=	'Invoice #'.$item_data['OrderNumber'];
+			$post_fields['x_email_customer']	=	'FALSE';
+*/
+//			echo '<pre>';
+//			print_r($post_fields);
+//			exit;
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetPostData($post_fields);
+			$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
+
+//			echo $this->gw_responce;
+//			exit;
+			$gw_responce = $this->parseGWResponce(null, $gw_params);
+			// gw_error_msg: $gw_response['responce_reason_text']
+			// gw_error_code: $gw_response['responce_reason_code']
+//			echo '<pre>';
+//			print_r($this->parsed_responce);
+//			exit;
+			return (isset($gw_responce['ACK']) && (substr($gw_responce['ACK'], 0, 7) == 'Success')) ? true : false;
+		}
+
+		/**
+		 * Perform SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+/*
+		function Charge($item_data, $gw_params)
+		{
+			$gw_responce = unserialize( $item_data['GWResult1'] );
+
+			if( $item_data['PortalUserId'] != $gw_responce['customer_id'] ) return false;
+
+			if( ( strtolower($gw_responce['transaction_type']) == 'auth_only') )
+			{
+				$post_fields = Array();
+				// -- Login Information --
+				$post_fields['x_version']			=	'3.1';
+				$post_fields['x_delim_data']		=	'True';
+				$post_fields['x_encap_char']		=	$gw_params['encapsulate_char'];
+				$post_fields['x_relay_response']	=	'False';
+				$post_fields['x_type']				=	'PRIOR_AUTH_CAPTURE'; // $gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'PRIOR_AUTH_CAPTURE' : 'AUTH_CAPTURE'; // AUTH_CAPTURE not fully impletemnted/needed here
+				$post_fields['x_login']				=	$gw_params['user_account'];
+				$post_fields['x_tran_key']			=	$gw_params['transaction_key'];
+				$post_fields['x_trans_id']			=	$gw_responce['transaction_id'];
+
+				if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+				$curl_helper = $this->Application->recallObject('CurlHelper');
+
+				$curl_helper->SetPostData($post_fields);
+				$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
+
+				$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+				// gw_error_msg: $gw_response['responce_reason_text']
+				// gw_error_code: $gw_response['responce_reason_code']
+				return (is_numeric($gw_responce['responce_code']) && $gw_responce['responce_code'] != 1 && !$this->IsTestMode()) ? false : true;
+			}
+			else
+			{
+				return true;
+			}
+		}
+*/
+		/**
+		 * Parse previosly saved gw responce into associative array
+		 *
+		 * @param string $gw_responce
+		 * @param Array $gw_params
+		 * @return Array
+		 */
+		function parseGWResponce($gw_responce = null, $gw_params)
+		{
+			if( !isset($gw_responce) ) $gw_responce = $this->gw_responce;
+
+			if ($this->Application->isDebugMode()) {
+				$this->Application->Debugger->appendHTML('Curl Error #'.$GLOBALS['curl_errorno'].'; Error Message: '.$GLOBALS['curl_error']);
+
+				$this->Application->Debugger->appendHTML('Authorize.Net Responce:');
+				$this->Application->Debugger->dumpVars($gw_responce);
+			}
+
+			$a_responce = explode('&', $gw_responce);
+			$ret = Array();
+			foreach($a_responce as $field)
+			{
+				$pos = strpos($field, '=');
+				if ($pos) {
+					$ret[substr($field, 0, $pos)] = urldecode(substr($field, $pos + 1));
+				}
+			}
+			$this->parsed_responce = $ret;
+//			$ret['unparsed'] = $gw_responce;
+			return $ret;
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			return $this->parsed_responce['L_LONGMESSAGE0'];
+		}
+
+		function GetTestCCNumbers()
+		{
+			return array('370000000000002', '6011000000000012', '5424000000000015', '4007000000027', '4222222222222');
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/paypal_direct.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/authorizenet.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/authorizenet.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/authorizenet.php	(revision 16630)
@@ -0,0 +1,180 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	class kGWAuthorizeNet extends kGWBase
+	{
+		function DirectPayment($item_data, $gw_params)
+		{
+			$post_fields = Array();
+			// -- Login Information --
+			$post_fields['x_version']			=	'3.1';
+			$post_fields['x_delim_data']		=	'True';
+			$post_fields['x_encap_char']		=	$gw_params['encapsulate_char'];
+			$post_fields['x_relay_response']	=	'False';
+			$post_fields['x_type']				=	$gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'AUTH_ONLY' : 'AUTH_CAPTURE';
+			$post_fields['x_login']				=	$gw_params['user_account'];
+			$post_fields['x_tran_key']			=	$gw_params['transaction_key'];
+
+			if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+			// -- Payment Details --
+			$names = explode(' ', $item_data['PaymentNameOnCard'], 2);
+			$post_fields['x_first_name']		=	getArrayValue($names, 0);
+			$post_fields['x_last_name']			=	getArrayValue($names, 1);
+			$post_fields['x_amount']			=	sprintf('%.2f', $item_data['TotalAmount']);
+			$post_fields['x_company']			=	$item_data['BillingCompany'];
+			$post_fields['x_card_num']			=	$item_data['PaymentAccount'];
+			$post_fields['x_card_code']			=	$item_data['PaymentCVV2'];
+			$post_fields['x_exp_date']			=	$item_data['PaymentCCExpDate'];
+			$post_fields['x_address']			=	$item_data['BillingAddress1'].' '.$item_data['BillingAddress2'];
+			$post_fields['x_city']				=	$item_data['BillingCity'];
+			$post_fields['x_state']				=	$item_data['BillingState'];
+			$post_fields['x_zip']				=	$item_data['BillingZip'];
+
+			$recurring = getArrayValue($item_data, 'IsRecurringBilling') ? 'YES' : 'NO';
+			$post_fields['x_recurring_billing'] = $recurring;
+
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+			$post_fields['x_email'] = $billing_email;
+			$post_fields['x_phone'] = $item_data['BillingPhone'];
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$post_fields['x_country']			=	$cs_helper->getCountryIso( $item_data['BillingCountry'] );
+			$post_fields['x_cust_id']			=	$item_data['PortalUserId'];
+			$post_fields['x_invoice_num']		=	$item_data['OrderNumber'];
+			$post_fields['x_description']		=	'Invoice #'.$item_data['OrderNumber'];
+			$post_fields['x_email_customer']	=	'FALSE';
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetPostData($post_fields);
+			$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
+
+			$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+			// gw_error_msg: $gw_response['responce_reason_text']
+			// gw_error_code: $gw_response['responce_reason_code']
+			return (is_numeric($gw_responce['responce_code']) && $gw_responce['responce_code'] == 1) ? true : false;
+		}
+
+		/**
+		 * Perform SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function Charge($item_data, $gw_params)
+		{
+			$gw_responce = unserialize( $item_data['GWResult1'] );
+
+			if( ($item_data['PortalUserId'] != $gw_responce['customer_id']) && ($gw_repsponce['customer_id'] != USER_GUEST && !$this->Application->isAdmin)) return false;
+
+			if( ( strtolower($gw_responce['transaction_type']) == 'auth_only') )
+			{
+				$post_fields = Array();
+				// -- Login Information --
+				$post_fields['x_version']			=	'3.1';
+				$post_fields['x_delim_data']		=	'True';
+				$post_fields['x_encap_char']		=	$gw_params['encapsulate_char'];
+				$post_fields['x_relay_response']	=	'False';
+				$post_fields['x_type']				=	'PRIOR_AUTH_CAPTURE'; // $gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'PRIOR_AUTH_CAPTURE' : 'AUTH_CAPTURE'; // AUTH_CAPTURE not fully impletemnted/needed here
+				$post_fields['x_login']				=	$gw_params['user_account'];
+				$post_fields['x_tran_key']			=	$gw_params['transaction_key'];
+				$post_fields['x_trans_id']			=	$gw_responce['transaction_id'];
+
+				if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+				/** @var kCurlHelper $curl_helper */
+				$curl_helper = $this->Application->recallObject('CurlHelper');
+
+				$curl_helper->SetPostData($post_fields);
+				$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
+
+				$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+				// gw_error_msg: $gw_response['responce_reason_text']
+				// gw_error_code: $gw_response['responce_reason_code']
+				return (is_numeric($gw_responce['responce_code']) && $gw_responce['responce_code'] == 1) || $this->IsTestMode() ? true : false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		/**
+		 * Parse previosly saved gw responce into associative array
+		 *
+		 * @param string $gw_responce
+		 * @param Array $gw_params
+		 * @return Array
+		 */
+		function parseGWResponce($gw_responce = null, $gw_params)
+		{
+			if( !isset($gw_responce) ) $gw_responce = $this->gw_responce;
+
+			if ($this->Application->isDebugMode()) {
+				$this->Application->Debugger->appendHTML('Curl Error #'.$GLOBALS['curl_errorno'].'; Error Message: '.$GLOBALS['curl_error']);
+
+				$this->Application->Debugger->appendHTML('Authorize.Net Responce:');
+				$this->Application->Debugger->dumpVars($gw_responce);
+			}
+
+			$fields = Array('responce_code','responce_sub_code','responce_reason_code','responce_reason_text',
+							'approval_code','avs_result_code','transaction_id','invoice_number','description',
+							'amount','method','transaction_type','customer_id','first_name','last_name','company',
+							'address','city','state','zip','country','phone','fax','email');
+
+			$encapsulate_char = $gw_params['encapsulate_char'];
+			if($encapsulate_char)
+			{
+				$ec_length = strlen($encapsulate_char);
+				$gw_responce = substr($gw_responce, $ec_length, $ec_length * -1);
+			}
+
+			$gw_responce = explode($encapsulate_char.','.$encapsulate_char, $gw_responce);
+			$ret = Array();
+			foreach($fields as $field_index => $field_name)
+			{
+				$ret[$field_name] = $gw_responce[$field_index];
+				unset($gw_responce[$field_index]);
+			}
+			$this->parsed_responce = $ret;
+			return kUtil::array_merge_recursive($ret, $gw_responce); // returns unparsed fields with they original indexes together with parsed ones
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			return $this->parsed_responce['responce_reason_text'];
+		}
+
+		function GetTestCCNumbers()
+		{
+			return array('370000000000002', '6011000000000012', '5424000000000015', '4007000000027', '4222222222222');
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/authorizenet.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.17
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/google_checkout.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/google_checkout.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/google_checkout.php	(revision 16630)
@@ -0,0 +1,942 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kGWGoogleCheckout'; // for automatic installation
+
+	class kGWGoogleCheckout extends kGWBase
+	{
+		var $gwParams = Array ();
+
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Google Checkout', 'ClassName' => 'kGWGoogleCheckout', 'ClassFile' => 'google_checkout.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'https://checkout.google.com/api/checkout/v2'),
+					'merchant_id' => Array('Name' => 'Google merchant ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'merchant_key' => Array('Name' => 'Google merchant key', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => 3),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'].'/checkout/Merchant/'.$gw_params['merchant_id'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data current order fields
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$ret = Array();
+			$this->gwParams = $gw_params;
+
+			$cart_xml = $this->getCartXML($item_data);
+
+			$ret['cart'] = base64_encode($cart_xml);
+    		$ret['signature'] = base64_encode( $this->CalcHmacSha1($cart_xml, $gw_params) );
+
+			return $ret;
+		}
+
+		function getCartXML($cart_fields)
+		{
+			// 1. prepare shopping cart content
+			$sql = 'SELECT *
+					FROM '.TABLE_PREFIX.'OrderItems oi
+					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
+					WHERE oi.OrderId = '.$cart_fields['OrderId'];
+			$order_items = $this->Conn->Query($sql);
+
+			/** @var kMultiLanguage $ml_formatter */
+			$ml_formatter = $this->Application->recallObject('kMultiLanguage');
+
+			$cart_xml = Array ();
+			foreach ($order_items as $order_item) {
+				$cart_xml[] = '	<item>
+					        		<item-name>'.kUtil::escape($order_item['ProductName'], kUtil::ESCAPE_HTML).'</item-name>
+					        		<item-description>'.kUtil::escape($order_item[$ml_formatter->LangFieldName('DescriptionExcerpt')], kUtil::ESCAPE_HTML).'</item-description>'.
+									$this->getPriceXML('unit-price', $order_item['Price']).'
+					        		<quantity>'.$order_item['Quantity'].'</quantity>
+								</item>';
+			}
+			$cart_xml = '<items>'.implode("\n", $cart_xml).'</items>';
+
+			// 2. add order identification info (for google checkout notification)
+			$cart_xml .= '	<merchant-private-data>
+								<session_id>'.$this->Application->GetSID().'</session_id>
+								<order_id>'.$cart_fields['OrderId'].'</order_id>
+							</merchant-private-data>';
+
+			// 3. add all shipping types (with no costs)
+			$sql = 'SELECT Name
+					FROM '.TABLE_PREFIX.'ShippingType
+					WHERE Status = '.STATUS_ACTIVE;
+			$shipping_types = $this->Conn->GetCol($sql);
+
+			$shipping_xml = '';
+			foreach ($shipping_types as $shipping_name) {
+				$shipping_xml .= '	<merchant-calculated-shipping name="'.kUtil::escape($shipping_name, kUtil::ESCAPE_HTML).'">
+										<price currency="USD">0.00</price>
+									</merchant-calculated-shipping>';
+			}
+
+			$use_ssl = substr($this->gwParams['submit_url'], 0, 8) == 'https://' ? true : null;
+			$shipping_url = $this->getNotificationUrl('units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php', $use_ssl);
+
+			$shipping_xml = '<merchant-checkout-flow-support>
+								<shipping-methods>'.$shipping_xml.'</shipping-methods>
+					      		<merchant-calculations>
+					      			<merchant-calculations-url>'.$shipping_url.'</merchant-calculations-url>
+					      		</merchant-calculations>
+					    	</merchant-checkout-flow-support>';
+
+			$xml = '<checkout-shopping-cart xmlns="http://checkout.google.com/schema/2">
+					  <shopping-cart>'.$cart_xml.'</shopping-cart>
+					  <checkout-flow-support>'.$shipping_xml.'</checkout-flow-support>
+					</checkout-shopping-cart>';
+
+			return $xml;
+		}
+
+		/**
+		 * Returns price formatted as xml tag
+		 *
+		 * @param string $tag_name
+		 * @param float $price
+		 * @return string
+		 */
+		function getPriceXML($tag_name, $price)
+		{
+			$currency = $this->Application->RecallVar('curr_iso');
+			return '<'.$tag_name.' currency="'.$currency.'">'.sprintf('%.2f', $price).'</'.$tag_name.'>';
+		}
+
+	    /**
+	     * Calculates the cart's hmac-sha1 signature, this allows google to verify
+	     * that the cart hasn't been tampered by a third-party.
+	     *
+	     * {@link http://code.google.com/apis/checkout/developer/index.html#create_signature}
+	     *
+	     * @param string $data the cart's xml
+	     * @return string the cart's signature (in binary format)
+	     */
+	    function CalcHmacSha1($data, $gw_params) {
+	      $key = $gw_params['merchant_key'];
+	      $blocksize = 64;
+	      $hashfunc = 'sha1';
+	      if (mb_strlen($key) > $blocksize) {
+	        $key = pack('H*', $hashfunc($key));
+	      }
+	      $key = str_pad($key, $blocksize, chr(0x00));
+	      $ipad = str_repeat(chr(0x36), $blocksize);
+	      $opad = str_repeat(chr(0x5c), $blocksize);
+	      $hmac = pack(
+	                    'H*', $hashfunc(
+	                            ($key^$opad).pack(
+	                                    'H*', $hashfunc(
+	                                            ($key^$ipad).$data
+	                                    )
+	                            )
+	                    )
+	                );
+	      return $hmac;
+	    }
+
+	    /**
+	     * Returns XML request, that GoogleCheckout posts to notification / shipping calculation scripts
+	     *
+	     * @return string
+	     */
+	    function getRequestXML()
+	    {
+	    	$xml_data = file_get_contents('php://input');
+
+	    	if ( $this->Application->isDebugMode() ) {
+	    		$this->toLog($xml_data, 'xml_request.html');
+	    	}
+
+	    	return $xml_data;
+
+	    	// for debugging
+	    	/*return '<order-state-change-notification xmlns="http://checkout.google.com/schema/2"
+					    serial-number="c821426e-7caa-4d51-9b2e-48ef7ecd6423">
+					    <google-order-number>434532759516557</google-order-number>
+					    <new-financial-order-state>CHARGEABLE</new-financial-order-state>
+					    <new-fulfillment-order-state>NEW</new-fulfillment-order-state>
+					    <previous-financial-order-state>REVIEWING</previous-financial-order-state>
+					    <previous-fulfillment-order-state>NEW</previous-fulfillment-order-state>
+					    <timestamp>2007-03-19T15:06:29.051Z</timestamp>
+					</order-state-change-notification>';*/
+	    }
+
+	    /**
+	     * Processes notifications from google checkout
+	     *
+	     * @param Array $gw_params
+	     * @return int
+	     */
+		function processNotification($gw_params)
+		{
+    		// parse xml & get order_id from there, like sella pay
+    		$this->gwParams = $gw_params;
+
+    		/** @var kXMLHelper $xml_helper */
+    		$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+    		/** @var kXMLNode $root_node */
+			$root_node =& $xml_helper->Parse( $this->getRequestXML() );
+
+    		$this->Application->XMLHeader();
+			define('DBG_SKIP_REPORTING', 1);
+
+			$order_approvable = false;
+
+			switch ($root_node->Name) {
+				case 'MERCHANT-CALCULATION-CALLBACK':
+					$xml_responce = $this->getShippingXML($root_node);
+					break;
+
+				case 'NEW-ORDER-NOTIFICATION':
+				case 'RISK-INFORMATION-NOTIFICATION':
+				case 'ORDER-STATE-CHANGE-NOTIFICATION':
+					// http://code.google.com/apis/checkout/developer/Google_Checkout_XML_API_Notification_API.html#new_order_notifications
+					list ($order_approvable, $xml_responce) = $this->getNotificationResponceXML($root_node);
+					break;
+			}
+
+			echo $xml_responce;
+
+			if ( $this->Application->isDebugMode() ) {
+				$this->toLog($xml_responce, 'xml_responce.html');
+			}
+
+    		return $order_approvable ? 1 : 0;
+		}
+
+		/**
+	     * Writes XML requests and responces to a file
+	     *
+	     * @param string $xml_data
+	     * @param string $xml_file
+	     */
+	    function toLog($xml_data, $xml_file)
+	    {
+	    	$fp = fopen( (defined('RESTRICTED') ? RESTRICTED : FULL_PATH) . '/' . $xml_file, 'a' );
+			fwrite($fp, '--- ' . adodb_date('Y-m-d H:i:s') . ' ---' . "\n" . $xml_data);
+			fclose($fp);
+	    }
+
+		/**
+		 * Processes notification
+		 *
+		 * @param kXMLNode $root_node
+		 */
+		function getNotificationResponceXML(&$root_node)
+		{
+			// we can get notification type by "$root_node->Name"
+
+			$order_approvable = false;
+			switch ($root_node->Name) {
+				case 'NEW-ORDER-NOTIFICATION':
+					$order_approvable = $this->processNewOrderNotification($root_node);
+					break;
+
+				case 'RISK-INFORMATION-NOTIFICATION':
+					$order_approvable = $this->processRiskInformationNotification($root_node);
+					break;
+
+				case 'ORDER-STATE-CHANGE-NOTIFICATION':
+					$order_approvable = $this->processOrderStateChangeNotification($root_node);
+					break;
+			}
+
+
+
+			// !!! globally set order id, so gw_responce.php will not fail in setting TransactionStatus
+
+			// 1. receive new order notification
+			// put address & payment type in our order using id found in merchant-private-data (Make order status: Incomplete)
+
+			// 2. receive risk information
+			// don't know what to do, just mark order some how (Make order status: Incomplete)
+
+			// 3. receive status change notification to CHARGEABLE (Make order status: Pending)
+			// only mark order status
+
+			// 4. admin approves order
+			// make api call, that changes order state (fulfillment-order-state) to PROCESSING or DELIVERED (see manual)
+
+			// 5. admin declines order
+			// make api call, that changes order state (fulfillment-order-state) to WILL_NOT_DELIVER
+
+			// Before you ship the items in an order, you should ensure that you have already received the new order notification for the order,
+			// the risk information notification for the order and an order state change notification informing you that the order's financial
+			// state has been updated to CHARGEABLE
+
+			return Array ($order_approvable, '<notification-acknowledgment xmlns="http://checkout.google.com/schema/2" serial-number="'.$root_node->Attributes['SERIAL-NUMBER'].'" />');
+		}
+
+		/**
+		 * Returns shipping calculations and places part of shipping address into order (1st step)
+		 *
+		 * http://code.google.com/apis/checkout/developer/Google_Checkout_XML_API_Merchant_Calculations_API.html#Returning_Merchant_Calculation_Results
+		 *
+		 * @param kXMLNode $node
+		 * @return string
+		 */
+		function getShippingXML(&$root_node)
+		{
+			// 1. extract data from xml
+			$search_nodes = Array (
+				'SHOPPING-CART:MERCHANT-PRIVATE-DATA',
+				'CALCULATE:ADDRESSES:ANONYMOUS-ADDRESS',
+				'CALCULATE:SHIPPING',
+			);
+
+			foreach ($search_nodes as $search_string) {
+				/** @var kXMLNode $found_node */
+				$found_node =& $root_node;
+
+				$search_string = explode(':', $search_string);
+				foreach ($search_string as $search_node) {
+					$found_node =& $found_node->FindChild($search_node);
+				}
+
+				$node_data = Array ();
+
+				/** @var kXMLNode $sub_node */
+				$sub_node =& $found_node->firstChild;
+
+				do {
+					if ($found_node->Name == 'SHIPPING') {
+						$node_data[] = $sub_node->Attributes['NAME'];
+					}
+					else {
+						$node_data[$sub_node->Name] = $sub_node->Data;
+					}
+				} while ( ($sub_node =& $sub_node->NextSibling()) );
+
+
+				switch ($found_node->Name) {
+					case 'MERCHANT-PRIVATE-DATA':
+						$order_id = $node_data['ORDER_ID'];
+						$session_id = $node_data['SESSION_ID'];
+						break;
+
+					case 'ANONYMOUS-ADDRESS':
+						$address_info = $node_data;
+						$address_id = $found_node->Attributes['ID'];
+						break;
+
+					case 'SHIPPING':
+						$process_shippings = $node_data;
+						break;
+				}
+			}
+
+			// 2. update shipping address in order
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+			$order->Load($order_id);
+
+			$shipping_address = Array (
+				'ShippingCity' => $address_info['CITY'],
+				'ShippingState' => $address_info['REGION'],
+				'ShippingZip' => $address_info['POSTAL-CODE'],
+			);
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$shipping_address['ShippingCountry'] = $cs_helper->getCountryIso($address_info['COUNTRY-CODE'], true);
+
+			$order->SetDBFieldsFromHash($shipping_address);
+			$order->Update();
+
+			// 3. get shipping rates based on given address
+
+			$shipping_types_xml = '';
+			$shipping_types = $this->getOrderShippings($order);
+
+			// add available shipping types
+			foreach ($shipping_types as $shipping_type) {
+				$shipping_name = $shipping_type['ShippingName'];
+				$processable_shipping_index = array_search($shipping_name, $process_shippings);
+				if ($processable_shipping_index !== false) {
+					$shipping_types_xml .= '<result shipping-name="'.kUtil::escape($shipping_name, kUtil::ESCAPE_HTML).'" address-id="'.$address_id.'">
+				    	        				<shipping-rate currency="USD">'.sprintf('%01.2f', $shipping_type['TotalCost']).'</shipping-rate>
+				        	    				<shippable>true</shippable>
+				        					</result>';
+
+					// remove available shipping type from processable list
+					unset($process_shippings[$processable_shipping_index]);
+				}
+			}
+
+			// add unavailable shipping types
+			foreach ($process_shippings as $shipping_name) {
+				$shipping_types_xml .= '<result shipping-name="'.kUtil::escape($shipping_name, kUtil::ESCAPE_HTML).'" address-id="'.$address_id.'">
+											<shipping-rate currency="USD">0.00</shipping-rate>
+				            				<shippable>false</shippable>
+				        				</result>';
+			}
+
+			$shipping_types_xml = '<?xml version="1.0" encoding="UTF-8"?>
+									<merchant-calculation-results xmlns="http://checkout.google.com/schema/2">
+				  						<results>'.$shipping_types_xml.'</results>
+									</merchant-calculation-results>';
+			return $shipping_types_xml;
+		}
+
+		/**
+		 * Places all information from google checkout into order (2nd step)
+		 *
+		 * @param kXMLNode $root_node
+		 */
+		function processNewOrderNotification(&$root_node)
+		{
+			// 1. extract data from xml
+			$search_nodes = Array (
+				'SHOPPING-CART:MERCHANT-PRIVATE-DATA',
+				'ORDER-ADJUSTMENT:SHIPPING:MERCHANT-CALCULATED-SHIPPING-ADJUSTMENT',
+				'BUYER-ID',
+				'GOOGLE-ORDER-NUMBER',
+				'BUYER-SHIPPING-ADDRESS',
+				'BUYER-BILLING-ADDRESS',
+			);
+
+			$user_address = Array ();
+			foreach ($search_nodes as $search_string) {
+				/** @var kXMLNode $found_node */
+				$found_node =& $root_node;
+
+				$search_string = explode(':', $search_string);
+				foreach ($search_string as $search_node) {
+					$found_node =& $found_node->FindChild($search_node);
+				}
+
+				$node_data = Array ();
+				if ($found_node->Children) {
+					/** @var kXMLNode $sub_node */
+					$sub_node =& $found_node->firstChild;
+
+					do {
+						$node_data[$sub_node->Name] = $sub_node->Data;
+					} while ( ($sub_node =& $sub_node->NextSibling()) );
+				}
+
+				switch ($found_node->Name) {
+					case 'MERCHANT-PRIVATE-DATA':
+						$order_id = $node_data['ORDER_ID'];
+						$session_id = $node_data['SESSION_ID'];
+						break;
+
+					case 'MERCHANT-CALCULATED-SHIPPING-ADJUSTMENT':
+						$shpipping_info = $node_data;
+						break;
+
+					case 'BUYER-ID':
+						$buyer_id = $found_node->Data;
+						break;
+
+					case 'GOOGLE-ORDER-NUMBER':
+						$google_order_number = $found_node->Data;
+						break;
+
+					case 'BUYER-SHIPPING-ADDRESS':
+						$user_address['Shipping'] = $node_data;
+						break;
+
+					case 'BUYER-BILLING-ADDRESS':
+						$user_address['Billing'] = $node_data;
+						break;
+				}
+			}
+
+			// 2. update shipping address in order
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+			$order->Load($order_id);
+
+			if (!$order->isLoaded()) {
+				return false;
+			}
+
+			// 2.1. this is 100% notification from google -> mark order with such payment type
+			$order->SetDBField('PaymentType', $this->Application->GetVar('payment_type_id'));
+
+			$this->parsed_responce = Array (
+				'GOOGLE-ORDER-NUMBER' => $google_order_number,
+				'BUYER-ID' => $buyer_id
+			);
+
+			// 2.2. save google checkout order information (maybe needed for future notification processing)
+			$order->SetDBField('GWResult1', serialize($this->parsed_responce));
+			$order->SetDBField('GoogleOrderNumber', $google_order_number);
+
+			// 2.3. set user-selected shipping type
+			$shipping_types = $this->getOrderShippings($order);
+
+			foreach ($shipping_types as $shipping_type) {
+				if ($shipping_type['ShippingName'] == $shpipping_info['SHIPPING-NAME']) {
+					$order->SetDBField('ShippingInfo', serialize(Array (1 => $shipping_type))); // minimal package number is 1
+					$order->SetDBField('ShippingCost', $shipping_type['TotalCost']); // set total shipping cost
+					break;
+				}
+			}
+
+			// 2.4. set full shipping & billing address
+			$address_mapping = Array (
+				'CONTACT-NAME' => 'To',
+				'COMPANY-NAME' => 'Company',
+				'EMAIL' => 'Email',
+				'PHONE' => 'Phone',
+				'FAX' => 'Fax',
+				'ADDRESS1' => 'Address1',
+				'ADDRESS2' => 'Address2',
+				'CITY' => 'City',
+				'REGION' => 'State',
+				'POSTAL-CODE' => 'Zip',
+			);
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			foreach ($user_address as $field_prefix => $address_details) {
+				foreach ($address_mapping as $src_field => $dst_field) {
+					$order->SetDBField($field_prefix.$dst_field, $address_details[$src_field]);
+				}
+
+				if (!$order->GetDBField($field_prefix.'Phone')) {
+					$order->SetDBField($field_prefix.'Phone', '-'); // required field
+				}
+
+				$order->SetDBField( $field_prefix.'Country', $cs_helper->getCountryIso($address_details['COUNTRY-CODE'], true) );
+			}
+
+			$order->SetDBField('OnHold', 1);
+			$order->SetDBField('Status', ORDER_STATUS_PENDING);
+
+			$order->Update();
+
+			// unlink order, that GoogleCheckout used from shopping cart on site
+			$sql = 'DELETE
+					FROM '.TABLE_PREFIX.'UserSessionData
+					WHERE VariableName = "ord_id" AND VariableValue = '.$order->GetID();
+			$this->Conn->Query($sql);
+
+			// simulate visiting shipping screen
+			$sql = 'UPDATE '.TABLE_PREFIX.'OrderItems
+					SET PackageNum = 1
+					WHERE OrderId = '.$order->GetID();
+			$this->Conn->Query($sql);
+
+			return false;
+		}
+
+		/**
+		 * Saves risk information in order record (3rd step)
+		 *
+		 * @param kXMLNode $root_node
+		 */
+		function processRiskInformationNotification(&$root_node)
+		{
+			// 1. extract data from xml
+			$search_nodes = Array (
+				'GOOGLE-ORDER-NUMBER',
+				'RISK-INFORMATION',
+			);
+
+			foreach ($search_nodes as $search_string) {
+				/** @var kXMLNode $found_node */
+				$found_node =& $root_node;
+
+				$search_string = explode(':', $search_string);
+				foreach ($search_string as $search_node) {
+					$found_node =& $found_node->FindChild($search_node);
+				}
+
+				$node_data = Array ();
+				if ($found_node->Children) {
+					/** @var kXMLNode $sub_node */
+					$sub_node =& $found_node->firstChild;
+
+					do {
+						$node_data[$sub_node->Name] = $sub_node->Data;
+					} while ( ($sub_node =& $sub_node->NextSibling()) );
+				}
+
+				switch ($found_node->Name) {
+					case 'GOOGLE-ORDER-NUMBER':
+						$google_order_number = $found_node->Data;
+						break;
+
+					case 'RISK-INFORMATION':
+						$risk_information = $node_data;
+						unset( $risk_information['BILLING-ADDRESS'] );
+						break;
+				}
+			}
+
+			// 2. update shipping address in order
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+			$order->Load($google_order_number, 'GoogleOrderNumber');
+
+			if (!$order->isLoaded()) {
+				return false;
+			}
+
+			// 2.1. save risk information in order
+			$this->parsed_responce = unserialize($order->GetDBField('GWResult1'));
+			$this->parsed_responce = array_merge_recursive($this->parsed_responce, $risk_information);
+			$order->SetDBField('GWResult1', serialize($this->parsed_responce));
+
+			$order->Update();
+
+			return false;
+		}
+
+		/**
+		 * Perform PREAUTH/SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function DirectPayment($item_data, $gw_params)
+		{
+			$this->gwParams = $gw_params;
+
+			if ($gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH) {
+				// when shipping control is Pre-Authorize -> do nothing and charge when admin approves order
+				return true;
+			}
+
+			$this->_chargeOrder($item_data);
+
+			return false;
+		}
+
+		/**
+		 * Issue charge-order api call
+		 *
+		 * @param Array $item_data
+		 * @return bool
+		 */
+		function _chargeOrder($item_data)
+		{
+			$charge_xml = '	<charge-order xmlns="http://checkout.google.com/schema/2" google-order-number="'.$item_data['GoogleOrderNumber'].'">
+			    				<amount currency="USD">'.sprintf('%.2f', $item_data['TotalAmount']).'</amount>
+							</charge-order>';
+
+			$root_node =& $this->executeAPICommand($charge_xml);
+
+    		$this->parsed_responce = unserialize($item_data['GWResult1']);
+
+    		if ($root_node->Name == 'REQUEST-RECEIVED') {
+				$this->parsed_responce['FINANCIAL-ORDER-STATE'] = 'CHARGING';
+				return true;
+    		}
+
+    		return false;
+		}
+
+		/**
+		 * Perform SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function Charge($item_data, $gw_params)
+		{
+			$this->gwParams = $gw_params;
+
+			if ($gw_params['shipping_control'] == SHIPPING_CONTROL_DIRECT) {
+				// when shipping control is Direct Payment -> do nothing and auto-charge on notification received
+				return true;
+			}
+
+			$this->_chargeOrder($item_data);
+
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject('ord.-item', null, Array ('skip_autoload' => true));
+
+			$order->Load($item_data['OrderId']);
+			if (!$order->isLoaded()) {
+				return false;
+			}
+
+			$order->SetDBField('OnHold', 1);
+			$order->Update();
+
+			return false;
+		}
+
+		/**
+		 * Executes API command for order and returns result
+		 *
+		 * @param string $command_xml
+		 * @return kXMLNode
+		 */
+		function &executeAPICommand($command_xml)
+		{
+			$submit_url = $this->gwParams['submit_url'].'/request/Merchant/'.$this->gwParams['merchant_id'];
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+    		/** @var kXMLHelper $xml_helper */
+			$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+			$curl_helper->SetPostData($command_xml);
+			$auth_options = Array (
+				CURLOPT_USERPWD => $this->gwParams['merchant_id'].':'.$this->gwParams['merchant_key'],
+			);
+			$curl_helper->setOptions($auth_options);
+
+			$xml_responce = $curl_helper->Send($submit_url);
+
+    		/** @var kXMLNode $root_node */
+			$root_node =& $xml_helper->Parse($xml_responce);
+
+    		return $root_node;
+		}
+
+		/**
+		 * Marks order as pending, when it's google status becomes CHARGEABLE (4th step)
+		 *
+		 * @param kXMLNode $root_node
+		 */
+		function processOrderStateChangeNotification(&$root_node)
+		{
+			// 1. extract data from xml
+			$search_nodes = Array (
+				'GOOGLE-ORDER-NUMBER',
+				'NEW-FINANCIAL-ORDER-STATE',
+				'PREVIOUS-FINANCIAL-ORDER-STATE',
+			);
+
+			$order_state = Array ();
+			foreach ($search_nodes as $search_string) {
+				/** @var kXMLNode $found_node */
+				$found_node =& $root_node;
+
+				$search_string = explode(':', $search_string);
+				foreach ($search_string as $search_node) {
+					$found_node =& $found_node->FindChild($search_node);
+				}
+
+				switch ($found_node->Name) {
+					case 'GOOGLE-ORDER-NUMBER':
+						$google_order_number = $found_node->Data;
+						break;
+
+					case 'NEW-FINANCIAL-ORDER-STATE':
+						$order_state['new'] = $found_node->Data;
+						break;
+
+					case 'PREVIOUS-FINANCIAL-ORDER-STATE':
+						$order_state['old'] = $found_node->Data;
+						break;
+				}
+			}
+
+			// 2. update shipping address in order
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true));
+
+			$order->Load($google_order_number, 'GoogleOrderNumber');
+
+			if (!$order->isLoaded()) {
+				return false;
+			}
+
+			$state_changed = ($order_state['old'] != $order_state['new']);
+
+			if ($state_changed) {
+				$order_charged = ($order_state['new'] == 'CHARGED') && ($order->GetDBField('Status') == ORDER_STATUS_PENDING);
+
+				$this->parsed_responce = unserialize($order->GetDBField('GWResult1'));
+				$this->parsed_responce['FINANCIAL-ORDER-STATE'] = $order_state['new'];
+				$order->SetDBField('GWResult1', serialize($this->parsed_responce));
+
+				if ($order_charged) {
+					// when using Pre-Authorize
+					$order->SetDBField('OnHold', 0);
+				}
+
+				$order->Update();
+
+				if ($order_charged) {
+					// when using Pre-Authorize
+					/** @var OrdersEventHandler $order_eh */
+					$order_eh = $this->Application->recallObject('ord_EventHandler');
+
+					$order_eh->SplitOrder( new kEvent('ord:OnMassOrderApprove'), $order);
+				}
+			}
+
+			// update order record in "google_checkout_notify.php" only when such state change happens
+			$order_chargeable = ($order_state['new'] == 'CHARGEABLE') && $state_changed;
+
+			if ($order_chargeable) {
+				if ($this->gwParams['shipping_control'] == SHIPPING_CONTROL_PREAUTH) {
+					$order->SetDBField('OnHold', 0);
+					$order->Update();
+				}
+
+				$process_xml = '<process-order xmlns="http://checkout.google.com/schema/2" google-order-number="'.$order->GetDBField('GoogleOrderNumber').'"/>';
+				$root_node =& $this->executeAPICommand($process_xml);
+			}
+
+			return $order_chargeable;
+		}
+
+		/**
+		 * Retrieves shipping types available for given order
+		 *
+		 * @param OrdersItem $order
+		 * @return Array
+		 */
+		function getOrderShippings(&$order)
+		{
+			$weight_sql = 'IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity)';
+
+			$query = '	SELECT
+							SUM(oi.Quantity) AS TotalItems,
+							SUM('.$weight_sql.') AS TotalWeight,
+							SUM(oi.Price * oi.Quantity) AS TotalAmount,
+							SUM(oi.Quantity) - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, oi.Quantity, 0)) AS TotalItemsPromo,
+							SUM('.$weight_sql.') - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, '.$weight_sql.', 0)) AS TotalWeightPromo,
+							SUM(oi.Price * oi.Quantity) - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, oi.Price * oi.Quantity, 0)) AS TotalAmountPromo
+						FROM '.TABLE_PREFIX.'OrderItems oi
+						LEFT JOIN '.TABLE_PREFIX.'Products p ON oi.ProductId = p.ProductId
+						WHERE oi.OrderId = '.$order->GetID().' AND p.Type = 1';
+			$shipping_totals = $this->Conn->GetRow($query);
+
+			$this->Application->recallObject('ShippingQuoteEngine');
+
+			/** @var ShippingQuoteCollector $quote_engine_collector */
+			$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+			$shipping_quote_params = Array(
+				'dest_country'	=>	$order->GetDBField('ShippingCountry'),
+				'dest_state'	=>	$order->GetDBField('ShippingState'),
+				'dest_postal'	=>	$order->GetDBField('ShippingZip'),
+				'dest_city'		=>	$order->GetDBField('ShippingCity'),
+				'dest_addr1'	=>	'',
+				'dest_addr2'	=>	'',
+				'dest_name'		=>	'user-' . $order->GetDBField('PortalUserId'),
+				'packages' 		=>	Array(
+										Array(
+											'package_key'	=>	'package1',
+											'weight'		=>	$shipping_totals['TotalWeight'],
+											'weight_unit'	=>	'KG',
+											'length'		=>	'',
+											'width'			=>	'',
+											'height'		=>	'',
+											'dim_unit'		=>	'IN',
+											'packaging'		=>	'BOX',
+											'contents'		=>	'OTR',
+											'insurance'		=>	'0'
+										),
+									),
+				'amount'		=>	$shipping_totals['TotalAmount'],
+				'items'			=>	$shipping_totals['TotalItems'],
+				'limit_types' 	=> 	serialize(Array ('ANY')),
+
+				'promo_params'	=>	Array (
+					'items'		=>	$shipping_totals['TotalItemsPromo'],
+					'amount'	=>	$shipping_totals['TotalAmountPromo'],
+					'weight'	=>	$shipping_totals['TotalWeightPromo'],
+				),
+			);
+
+			return $quote_engine_collector->GetShippingQuotes($shipping_quote_params);
+		}
+
+		/**
+		 * Returns gateway responce from last operation
+		 *
+		 * @return string
+		 */
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		/**
+		 * Informs payment gateway, that order has been shipped
+		 *
+		 * http://code.google.com/apis/checkout/developer/Google_Checkout_XML_API_Order_Level_Shipping.html#Deliver_Order
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function OrderShipped($item_data, $gw_params)
+		{
+			$this->gwParams = $gw_params;
+
+			$shipping_info = unserialize($item_data['ShippingInfo']);
+			if (getArrayValue($shipping_info, 'Code')) {
+				$traking_carrier = '<carrier>'.$item_data['Code'].'</carrier>';
+			}
+
+			if ($item_data['ShippingTracking']) {
+				$tracking_data = '<tracking-data>'.$traking_carrier.'
+        							 <tracking-number>'.$item_data['ShippingTracking'].'</tracking-number>
+        						  </tracking-data>';
+			}
+
+			$ship_xml = '	<deliver-order xmlns="http://checkout.google.com/schema/2" google-order-number="'.$item_data['GoogleOrderNumber'].'">
+								'.$traking_data.'
+    							<send-email>true</send-email>
+							</deliver-order>';
+			$root_node =& $this->executeAPICommand($ship_xml);
+		}
+
+		/**
+		 * Informs payment gateway, that order has been declined
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function OrderDeclined($item_data, $gw_params)
+		{
+
+		}
+	}

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/google_checkout.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/sella_guestpay.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/sella_guestpay.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/sella_guestpay.php	(revision 16630)
@@ -0,0 +1,163 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kSellaGuestPayGW'; // for automatic installation
+
+	class kSellaGuestPayGW extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Sella/GuestPay', 'ClassName' => 'kSellaGuestPayGW', 'ClassFile' => 'sella_guestpay.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'merchant_id' => Array('Name' => 'Merchant ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'merchant_country' => Array('Name' => 'Merchant Country Code', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'currency_code' => Array('Name' => 'Currency Code', 'Type' => 'text', 'ValueList' => '', 'Default' => '978'),
+					'language_code' => Array('Name' => 'Language Code', 'Type' => 'text', 'ValueList' => '', 'Default' => '2'),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return 'https://ecomm.sella.it/gestpay/pagam.asp';
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$a = $gw_params['merchant_id'];
+			$params['PAY1_UICCODE'] = $gw_params['currency_code'];
+			$params['PAY1_AMOUNT'] = $item_data['TotalAmount'];
+			$params['PAY1_SHOPTRANSACTIONID'] = $item_data['OrderId'];
+			$params['PAY1_IDLANGUAGE'] = $gw_params['language_code'];
+			$params['CUSTOM_INFO'] = $this->Application->GetSID().','.MD5($item_data['OrderId']);
+
+			$separator = '*P1*';
+			$b = array();
+			foreach ($params as $key=>$val) {
+				$b[] = $key.'='.kUtil::escape(trim($val), kUtil::ESCAPE_URL);
+			}
+			//the last one is CUSTOMINFO according to GW specs, passing the atosorigin-style 'caddie'
+			$b = join($separator, $b);
+			$url = 'https://ecomm.sella.it/CryptHTTPS/Encrypt.asp?a='.$a.'&b='.$b.'&c=2.0';
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$res = $curl_helper->Send($url);
+
+			preg_match('/#cryptstring#(.*)#\/cryptstring#/', $res, $matches);
+			$b = $matches[1];
+
+			$res = '<input type="hidden" name="a" value="'.$a.'"><input type="hidden" name="b" value="'.$b.'">';
+			return $res;
+		}
+
+		function NeedPlaceButton($item_data, $tag_params, $gw_params)
+		{
+			return true;
+		}
+
+		function processNotification($gw_params)
+		{
+			$a = $gw_params['merchant_id'];
+			$b = $_GET['b'];
+			$url = 'https://ecomm.sella.it/CryptHTTPS/Decrypt.asp?a='.$a.'&b='.$b.'&c=2.0';
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$ret = $curl_helper->Send($url);
+			$result = $this->parseGWResponce($ret, $gw_params);
+
+			list ($sid, $auth_code) = explode(',', $result['CUSTOM_INFO']);
+			$session = $this->Application->recallObject('Session');
+			$session->SID = $sid;
+
+			$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
+			$this->Application->SetVar('ord_id', $order_id);
+			$order = $this->Application->recallObject('ord');
+			$order->Load($order_id);
+
+			if ($this->Application->GetVar('sella_ok')) {
+				if ($result['PAY1_TRANSACTIONRESULT'] == 'OK') {
+					$this->Application->Redirect('in-commerce/checkout/checkout_success', null, '_FRONT_END_', 'index.php');
+				}
+				else {
+					$this->Application->SetVar('sella_error', 1);
+				}
+			}
+			if ($this->Application->GetVar('sella_error')) {
+				$this->Application->StoreVar('gw_error', $this->getErrorMsg());
+				$this->Application->Redirect('in-commerce/checkout/billing', null, '_FRONT_END_', 'index.php');
+			}
+
+			return $result['PAY1_TRANSACTIONRESULT'] == 'OK' ? 1 : 0;
+		}
+
+		function parseGWResponce($str, $gw_params)
+		{
+			if (preg_match('/#decryptstring#(.*)#\/decryptstring#/', $str, $matches)) {
+				$separator = '*P1*';
+				$pairs = explode($separator, $matches[1]);
+				foreach ($pairs as $a_pair) {
+					list($key, $val) = explode('=', $a_pair);
+					$result[$key] = $val;
+				}
+			}
+			elseif (preg_match('/#error#(.*)#\/error#/', $str, $matches))
+			{
+				$result['PAY1_ERRORDESCRIPTION'] = $matches[1];
+			}
+			else { //unknown error
+				$result['PAY1_ERRORDESCRIPTION'] = 'Unknown error';
+			}
+
+			$this->parsed_responce = $result;
+			return $result;
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			$msg = $this->parsed_responce['PAY1_ERRORDESCRIPTION'];
+			if (!$msg) {
+				if ($this->parsed_responce['response_code'] != 'OK') {
+					$msg = 'Transaction failed';
+				}
+			}
+			return $msg;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/sella_guestpay.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/worldpay.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/worldpay.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/worldpay.php	(revision 16630)
@@ -0,0 +1,117 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kGWWorldPay'; // for automatic installation
+
+	class kGWWorldPay extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Worldpay', 'ClassName' => 'kGWWorldPay', 'ClassFile' => 'worldpay.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'https://select.worldpay.com/wcc/purchase'),
+					'instId' => Array('Name' => 'Installation ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'callback_pw' => Array('Name' => 'Callback Password', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$ret = Array();
+
+			$ret['instId'] = $gw_params['instId'];
+			$ret['cartId'] = $item_data['OrderNumber'];
+
+			if (!$this->IsTestMode()) {
+				$ret['amount'] = sprintf('%.2f', $item_data['TotalAmount']); // the total amount to be billed, in decimal form, without a currency symbol. (8 characters, decimal, 2 characters: Example: 99999999.99)
+			}
+			else {
+				$ret['testMode'] = 100; // 100 - success, 101 - failure
+				$ret['amount'] = 1;
+			}
+
+			$ret['currency'] = 'USD';
+			$ret['desc'] = 'Order #'.$item_data['OrderNumber'];
+
+			$ret['name'] = $item_data['BillingTo'];
+			$ret['address'] = $item_data['BillingAddress1'];
+			if ($item_data['BillingAddress2']) {
+				$ret['address'] .= '&#10;'.$item_data['BillingAddress2'];
+			}
+			$ret['postcode'] = $item_data['BillingZip'];
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
+			$ret['tel'] = $item_data['BillingPhone'];
+			$ret['fax'] = $item_data['BillingFax'];
+			$ret['email'] = $item_data['BillingEmail'];
+			$ret['fixContact'] = 1; // contact-info not editable ?
+
+			$return_params = Array ('pass' => 'm', 'sid' => $this->Application->GetSID(), 'admin' => 1);
+			$ret['MC_return_page'] = $this->Application->HREF($tag_params['return_template'], '', $return_params);
+			$ret['MC_cancel_return_page'] = $this->Application->HREF($tag_params['cancel_template'], '', $return_params);
+			$ret['MC_callback'] = $this->getNotificationUrl() . '?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'];
+
+			return $ret;
+		}
+
+		function processNotification($gw_params)
+		{
+    		// http://support.worldpay.com/kb/integration_guides/junior/integration/help/appendicies/sjig_10100.html
+    		// SubmitURL: https://select.worldpay.com/wcc/purchase
+			// for Notification to work do this in gateway Admin Console:
+    		// Callback URL: <WPDISPLAY ITEM=MC_callback>
+    		// Callback enabled? [x]
+    		// Use callback response?[x]
+			$transaction_verified = ($this->Application->GetVar('callbackPW') == $gw_params['callback_pw']);
+    		if (!$transaction_verified) {
+    			return 0;
+    		}
+
+    		$transaction_status = $this->Application->GetVar('transStatus') == 'Y' ? 1 : 0;
+
+			/** @var kCurlHelper $curl_helper */
+    		$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$url = $this->Application->GetVar($transaction_status ? 'MC_return_page' : 'MC_cancel_return_page');
+			echo $curl_helper->Send($url);
+
+    		return $transaction_status;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/worldpay.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.8.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/paybox.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/paybox.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/paybox.php	(revision 16630)
@@ -0,0 +1,182 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kPayboxGW'; // for automatic installation
+
+	class kPayboxGW extends kGWBase
+	{
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Paybox.com', 'ClassName' => 'kPayboxGW', 'ClassFile' => 'paybox.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'binary' => Array('Name' => 'API Executable', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'params_file' => Array('Name' => 'OPT Params File', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'site_number' => Array('Name' => 'Site Number', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'rank_number' => Array('Name' => 'Rank Number', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'identity_number' => Array('Name' => 'Identity Number', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'currency_code' => Array('Name' => 'Currency Code', 'Type' => 'text', 'ValueList' => '', 'Default' => '978'),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$params['PBX_MODE'] = $gw_params['params_file'] ? '34' : '4';
+			$params['PBX_OUTPUT'] = 'B';
+			$params['PBX_SITE'] = $gw_params['site_number'];
+			$params['PBX_RANG'] = $gw_params['rank_number'];
+			$params['PBX_IDENTIFIANT'] = $gw_params['identity_number'];
+			$params['PBX_OPT'] = $gw_params['params_file'];
+			$params['PBX_DEVISE'] = $gw_params['currency_code']; // 978 for the euro. 840 for the US dollar.
+
+			$params['PBX_RETOUR'] = 'amount:M;reference:R;trans:T;autorization:A;subscription:B;payment:P;card:C;trans_id:S;country:Y;error:E;expiration:D';
+
+			$params['PBX_EFFECTUE'] = $this->Application->HREF($tag_params['return_template'],'',Array('pass'=>'m'));
+			$params['PBX_REFUSE'] = $this->Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m'));
+
+			$txt_amount = sprintf("%.2f", $item_data['TotalAmount']);
+			$params['PBX_TOTAL'] = str_replace( Array('.', ','), '', $txt_amount);
+			$params['PBX_CMD'] = $this->Application->GetSID().','.MD5($item_data['OrderId']);
+
+			/*$params['order_id'] = $item_data['OrderId'];
+			$params['customer_ip_address'] = $this->Application->getClientIp();
+			$params['customer_id'] = $item_data['PortalUserId'];*/
+
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+			$params['PBX_PORTEUR'] = $billing_email;
+
+			$params_str = '';
+			foreach ($params as $key => $val) {
+				$params_str .= ' '.$key . '="'.$val.'"';
+			}
+			$run_line = $gw_params['binary'].' '.$params_str;
+
+//			$run_line = escapeshellcmd($run_line);
+//			echo escapeshellcmd($run_line);
+
+			exec ($run_line, $rets);
+
+			$ret = implode("\n", $rets);
+
+			$ret = preg_replace('/^(.*)!!/is', '', $ret);
+			$ret = rtrim($ret, '!');
+
+			return '</form>'.$ret.'<form>';
+		}
+
+		function NeedPlaceButton($item_data, $tag_params, $gw_params)
+		{
+			return false;
+		}
+
+		function processNotification($gw_params)
+		{
+			$result = $this->Application->HttpQuery->GetParams();
+			$this->parsed_responce = $result;
+
+			list ($sid, $auth_code) = explode(',', $result['reference']);
+			$session = $this->Application->recallObject('Session');
+			$session->SID = $sid;
+
+			$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
+			$this->Application->SetVar('ord_id', $order_id);
+			$order = $this->Application->recallObject('ord');
+			$order->Load($order_id);
+
+			return $result['error'] === '00000' ? 1 : 0;
+		}
+
+		function parseGWResponce($str, $gw_params)
+		{
+			$response = explode ("!", $str);
+
+			$result = Array (
+				'code' => $response[1],
+				'error' => $response[2],
+				'merchant_id' => $response[3],
+				'merchant_country' => $response[4],
+				'amount' => $response[5],
+				'transaction_id' => $response[6],
+				'payment_means' => $response[7],
+				'transmission_date' => $response[8],
+				'payment_time' => $response[9],
+				'payment_date' => $response[10],
+				'response_code' => $response[11],
+				'payment_certificate' => $response[12],
+				'authorisation_id' => $response[13],
+				'currency_code' => $response[14],
+				'card_number' => $response[15],
+				'cvv_flag' => $response[16],
+				'cvv_response_code' => $response[17],
+				'bank_response_code' => $response[18],
+				'complementary_code' => $response[19],
+				'complementary_info' => $response[20],
+				'return_context' => $response[21],
+				'caddie' => $response[22],
+				'receipt_complement' => $response[23],
+				'merchant_language' => $response[24],
+				'language' => $response[25],
+				'customer_id' => $response[26],
+				'order_id' => $response[27],
+				'customer_email' => $response[28],
+				'customer_ip_address' => $response[29],
+				'capture_day' => $response[30],
+				'capture_mode' => $response[31],
+				'data' => $response[32],
+			);
+			$this->parsed_responce = $result;
+			return $result;
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function getErrorMsg()
+		{
+			$msg = '';
+			if ($this->parsed_responce['response_code'] != '00000') {
+				$msg = 'Transaction failed';
+			}
+			return $msg;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/paybox.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/paypal.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/paypal.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/paypal.php	(revision 16630)
@@ -0,0 +1,269 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	class kGWPayPal extends kGWBase
+	{
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$ret = Array();
+			$ret['item_name'] = 'Order #'.$item_data['OrderNumber'];
+			$ret['item_number'] = 'order:'.$item_data['OrderNumber'];
+
+
+			$selected_cur = $this->Application->RecallVar('curr_iso');
+			$available = explode(',', $gw_params['currency_code']);
+			$target = in_array($selected_cur, $available) ? $selected_cur : $available[0];
+
+			if( !$this->IsTestMode() )
+			{
+				$currency_iso = $gw_params['currency_code'];
+				$ret['amount'] = $this->ConvertCurrency($item_data['SubTotal'], $target);
+				$ret['shipping'] =  $this->ConvertCurrency($item_data['ShippingCost'], $target);
+				$ret['tax'] = $this->ConvertCurrency($item_data['VAT'], $target);
+			}
+			else
+			{
+				$ret['amount'] = 1;
+				$ret['shipping'] = 0;
+				$ret['tax'] = 0;
+			}
+
+			$ret['quantity'] = 1;
+			$ret['cancel_return'] = $this->Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m'));
+			$ret['return'] = $this->Application->HREF($tag_params['return_template'],'',Array('pass'=>'m'));
+			$ret['no_note'] = 1;	// customer is not prompted for notes
+			$ret['no_shipping'] = 1;	// customer is not prompted for shipping address
+			$ret['rm'] = 2;	// return method - POST
+			$ret['currency_code'] = $target;
+			$ret['invoice'] = $item_data['OrderNumber'];
+			$ret['business'] = $gw_params['business_account'];
+
+			// prepopulated fields
+			$ret['address_override'] = 1; // override user's stored address
+			$ret['email'] = $item_data['BillingEmail'];
+			list($first_name, $last_name) = explode(' ', $item_data['BillingTo']);
+			$ret['first_name'] = $first_name;
+			$ret['last_name'] = $last_name;
+			$ret['address1'] = $item_data['BillingAddress1'];
+			$ret['address2'] = $item_data['BillingAddress2'];
+			$ret['city'] = $item_data['BillingCity'];
+			$ret['state'] = $item_data['BillingState'];
+			$ret['zip'] = $item_data['BillingZip'];
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
+			$ret['notify_url'] = $this->getNotificationUrl() . '?sid=' . $this->Application->GetSID() . '&admin=1&order_id=' . $item_data['OrderId'];
+
+			$ret['cmd'] = '_xclick'; // act as "Buy Now" PayPal button
+			return $ret;
+		}
+
+		function getSubscriptionFields($item_data, $tag_params, $gw_params)
+		{
+
+			$ret = Array();
+			$ret['item_name'] = $item_data['item_name'];
+			$ret['item_number'] = $item_data['item_number'];
+			$ret['a1'] = $item_data['a1'];
+			$ret['p1'] = $item_data['p1'];
+			$ret['t1'] = $item_data['t1'];
+			$ret['a2'] = $item_data['a2'];
+			$ret['p2'] = $item_data['p2'];
+			$ret['t2'] = $item_data['t2'];
+
+			$ret['p3'] = $item_data['p3'];
+			$ret['t3'] = $item_data['t3'];
+			$ret['src'] = $item_data['src'];
+			$ret['sra'] = $item_data['sra'];
+			$ret['srt'] = $item_data['srt'];
+
+			$ret['custom'] = $item_data['OrderId'];
+
+			$currency_iso = $gw_params['currency_code'];
+			$ret['a3'] = $this->ConvertCurrency($item_data['a3'], $currency_iso);;
+			$ret['tax'] = $this->ConvertCurrency($item_data['VAT'], $currency_iso);
+			if( $this->Application->isDebugMode() )
+			{
+
+			}
+			else
+			{
+
+			}
+
+//			$ret['quantity'] = 1;
+			$ret['cancel_return'] = $this->Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m'));
+			$ret['return'] = $this->Application->HREF($tag_params['return_template'],'',Array('pass'=>'m'));
+			$ret['no_note'] = 1;	// customer is not prompted for notes
+			$ret['no_shipping'] = 1;	// customer is not prompted for shipping address
+			$ret['rm'] = 2;	// return method - POST
+			$ret['currency_code'] = $gw_params['currency_code'];
+			$ret['invoice'] = $item_data['OrderNumber'];
+			$ret['business'] = $gw_params['business_account'];
+
+			// prepopulated fields
+			$ret['address_override'] = 1; // override user's stored address
+			$ret['email'] = $item_data['BillingEmail'];
+			list($first_name, $last_name) = explode(' ', $item_data['BillingTo']);
+			$ret['first_name'] = $first_name;
+			$ret['last_name'] = $last_name;
+			$ret['address1'] = $item_data['BillingAddress1'];
+			$ret['address2'] = $item_data['BillingAddress2'];
+			$ret['city'] = $item_data['BillingCity'];
+			$ret['state'] = $item_data['BillingState'];
+			$ret['zip'] = $item_data['BillingZip'];
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
+			$ret['notify_url'] = $this->getNotificationUrl() . '?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'].'&payment_type_id='.$tag_params['payment_type_id'];
+			$ret['cmd'] = '_xclick-subscriptions'; // act as "Buy Now" PayPal button
+
+			$real_ret = array();
+			foreach ($ret as $key => $val)
+			{
+				if ($val == '') continue;
+				$real_ret[$key] = $val;
+			}
+
+			return $real_ret;
+		}
+
+		function processNotification($gw_params)
+		{
+			$payment_status = $_POST['payment_status']; // save payment_status for later proceeding
+
+			$_POST['cmd'] = '_notify-validate';
+
+			// status, of that PayPal server really has sent such notification to us
+			$status_map = Array('INVALID' => 0, 'VERIFIED' => 1);
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetPostData($_POST);
+			$n_status = $curl_helper->Send($gw_params['submit_url']); // INVALID, VERIFIED
+
+			$n_status = $status_map[$n_status];
+
+			$success = ($n_status == 1) && ($payment_status == 'Completed') ? 1:0 ; // 1:0 is on purpose, false will result an SQL error !
+
+			if (!$success) return;
+
+			$type = $_POST['txn_type'];
+			switch ($type)
+			{
+				case 'subscr_signup':
+					break;
+				case 'subscr_cancel':
+					break;
+				case 'subscr_failed':
+					break;
+				case 'subscr_payment':
+					$field_values = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$_POST['item_number']);
+					$this->Application->HandleEvent(new kEvent('p:OnSubscriptionApprove', array('field_values' => $field_values)));
+					$success = 0; //this will eliminate OnCompleteOrder in gw_notify!
+
+					/** @var kDBItem $org_order */
+					$org_order = $this->Application->recallObject('ord.-original', 'ord', Array('skip_autoload' => true));
+
+					$org_order->Load($field_values['OrderId']);
+
+					$order = $this->Application->recallObject('ord.-paypal', 'ord');
+					$order->SetDBFieldsFromHash($org_order->GetFieldValues());
+					$order->SetDBField('SubTotal', $field_values['Price']);
+					$order->SetDBField('OriginalAmout', $field_values['Price']);
+					$order->SetDBField('OrderDate', adodb_mktime());
+					$order->UpdateFormattersSubFields();
+
+					$dup_item = false;
+					if ($org_order->GetDBField('Status') >= ORDER_STATUS_PROCESSED) {
+						$sql = 'SELECT MAX(SubNumber) FROM '.TABLE_PREFIX.'Orders WHERE Number = '.$org_order->GetDBField('Number');
+						$num = $this->Conn->GetOne($sql) + 1;
+						$order->SetDBField('SubNumber', $num);
+						$dup_item = true;
+					}
+					else {
+						$sql = 'SELECT MAX(Number) FROM '.TABLE_PREFIX.'Orders';
+						$num = $this->Conn->GetOne($sql) + 1;
+						$order->SetDBField('Number', $num);
+						$order->SetDBField('SubNumber', 0);
+					}
+					$order->SetDBField('PaymentType', $this->Application->GetVar('payment_type_id'));
+					$info = array(
+						'BillingTo' => $_POST['first_name'].' '.$_POST['last_name'],
+						'BillingCompany' => 'n/a (PayPal)',
+						'BillingPhone' => 'n/a (PayPal)',
+						'BillingFax' => '',
+						'BillingEmail' => $_POST['payer_email'],
+						'BillingAddress1' => 'n/a (PayPal)',
+						'BillingCity' => 'n/a (PayPal)',
+						'BillingState' => 'n/a (PayPal)',
+						'BillingZip' => 'n/a (PayPal)',
+						'BillingCountry' => '???',
+					);
+
+					// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
+					$order->SetFieldsFromHash($info);
+
+					$order->SetDBField('Status', ORDER_STATUS_PROCESSED);
+
+					$order->Create();
+					if ($dup_item) {
+						$query = 'INSERT INTO '.TABLE_PREFIX.'OrderItems
+											(OrderId, ProductId, ProductName, Quantity, QuantityReserved, FlatPrice, Price, BackOrderFlag, Weight, ShippingTypeId, ItemData, OptionsSalt)
+											SELECT
+												'.$order->GetId().' AS OrderId, ProductId, ProductName, Quantity, QuantityReserved, FlatPrice, Price, BackOrderFlag, Weight, ShippingTypeId, ItemData, OptionsSalt
+											FROM '.TABLE_PREFIX.'OrderItems
+											WHERE OrderItemId = '.$field_values['OrderItemId'];
+					}
+					else {
+						$query = 'UPDATE '.TABLE_PREFIX.'OrderItems SET OrderId = %s WHERE OrderItemId = %s';
+						$query = sprintf($query, $order->GetId(), $field_values['OrderItemId']);
+					}
+					$this->Conn->Query($query);
+
+					break;
+				case 'subscr_eot':
+					break;
+				case 'subscr_modify':
+					break;
+			}
+
+			return $success;
+		}
+	}

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/paypal.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/gw_base.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/gw_base.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/gw_base.php	(revision 16630)
@@ -0,0 +1,261 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class kGWBase extends kBase
+	{
+		/**
+		 * gateway received responce
+		 *
+		 * @var string
+		 */
+		var $gw_responce = '';
+
+		var $parsed_responce = Array();
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $this->Application->ProcessParsedTag('m', 'FormAction', Array() );
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			return Array(	'events[ord]' => 'OnCompleteOrder',
+							'success_template' => $tag_params['return_template'],
+							'failure_template' => $tag_params['cancel_template']);
+		}
+
+		function NeedPlaceButton($item_data, $tag_params, $gw_params)
+		{
+			return true;
+		}
+
+		/**
+		 * Process notification about payment from payment gateway
+		 *
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function processNotification($gw_params)
+		{
+
+		}
+
+		/**
+		 * Perform PREAUTH/SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function DirectPayment($item_data, $gw_params)
+		{
+			return true;
+		}
+
+		/**
+		 * Perform SALE type transaction direct from php script wihtout redirecting to 3rd-party website
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function Charge($item_data, $gw_params)
+		{
+			return true;
+		}
+
+		/**
+		 * Informs payment gateway, that order has been shipped
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function OrderShipped($item_data, $gw_params)
+		{
+
+		}
+
+		/**
+		 * Informs payment gateway, that order has been declined
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function OrderDeclined($item_data, $gw_params)
+		{
+
+		}
+
+		/**
+		 * Returns gateway responce from last operation
+		 *
+		 * @return string
+		 */
+		function getGWResponce()
+		{
+			return $this->gw_responce;
+		}
+
+		/**
+		 * Parse previously saved gw responce into associative array
+		 *
+		 * @param string $gw_responce
+		 * @param Array $gw_params
+		 * @return Array
+		 */
+		function parseGWResponce($gw_responce, $gw_params)
+		{
+			return $this->gw_responce;
+		}
+
+		/**
+		 * Returns true if we should use testing mode
+		 *
+		 * @return bool
+		 */
+		function IsTestMode()
+		{
+			return defined('DEBUG_MODE') && kUtil::constOn('DBG_PAYMENT_GW');
+		}
+
+		/**
+		 * Convery primary currency to selected (if they are the same, converter will just return)
+		 *
+		 * @param double $value
+		 * @param string $iso
+		 * @param bool $format_value
+		 * @return double
+		 */
+		function ConvertCurrency($value, $iso, $format_value = true)
+		{
+			/** @var CurrencyRates $converter */
+			$converter = $this->Application->recallObject('CurrencyRates');
+
+			$value = $converter->Convert($value, 'PRIMARY', $iso);
+			return $format_value ? sprintf('%.2f', $value) : $value;
+		}
+
+		function InstallData()
+		{
+			return array();
+		}
+
+		function Install()
+		{
+			if ($this->IsInstalled()) {
+				return;
+			}
+
+			$data = $this->InstallData();
+			if (!$data) {
+				return ;
+			}
+
+			// 1. create gateway record
+			$fields_hash = Array ();
+			$gw_fields = Array ('Name', 'ClassName', 'ClassFile', 'RequireCCFields');
+			foreach ($gw_fields as $gw_field) {
+				$fields_hash[$gw_field] = $data['Gateway'][$gw_field];
+			}
+			$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'Gateways');
+			$gw_id = $this->Conn->getInsertID();
+
+			// 2. create DISABLED payment type, that uses this gateway (used for storing configuration properties of gateway)
+			/** @var kDBItem $payment_type */
+			$payment_type = $this->Application->recallObject('pt.-item', null, Array ('skip_autoload' => true));
+
+			$payment_type->Clear();
+			$fields_hash = Array (
+				'Name' => $data['Gateway']['Name'],
+				'l' . $this->Application->GetDefaultLanguageId() . '_Description' => $data['Gateway']['Name'],
+				'BuiltIn' => 1,
+				'GatewayId' => $gw_id,
+			);
+			$payment_type->SetDBFieldsFromHash($fields_hash);
+			$created = $payment_type->Create();
+			if (!$created) {
+				return ;
+			}
+
+			// 3. create gateway configuration fields
+			foreach ($data['ConfigFields'] as $field => $properties) {
+				$fields_hash = Array (
+					'SystemFieldName' => $field,
+					'GatewayId' => $gw_id,
+					'FieldName' => $properties['Name'],
+					'ElementType' => $properties['Type'],
+					'ValueList' => $properties['ValueList'],
+				);
+				$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'GatewayConfigFields');
+				$fld_id = $this->Conn->getInsertID();
+
+				// 4. set default value for configuration property of gateway
+				$fields_hash = Array (
+					'GWConfigFieldId' => $fld_id,
+					'PaymentTypeId' => $payment_type->GetID(),
+					'Value' => $properties['Default'],
+				);
+				$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'GatewayConfigValues');
+			}
+		}
+
+		function IsInstalled()
+		{
+			$data = $this->InstallData();
+			if (!$data) {
+				return true;
+			}
+
+			$sql = 'SELECT GatewayId
+					FROM '.TABLE_PREFIX.'Gateways
+					WHERE ClassName = '.$this->Conn->qstr($data['Gateway']['ClassName']);
+			return $this->Conn->GetOne($sql);
+		}
+
+		function getErrorMsg()
+		{
+			return '';
+		}
+
+		function gettestccnumbers()
+		{
+			return array();
+		}
+
+		function getNotificationUrl($script = 'gw_notify.php', $use_ssl = null)
+		{
+			// custom path can be: units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php'
+
+			$ret = MODULES_PATH . '/in-commerce/' . $script;
+			$ret = preg_replace('/^' . preg_quote(FULL_PATH . '/', '/') . '/', $this->Application->BaseURL('', $use_ssl), $ret);
+
+			return str_replace(DIRECTORY_SEPARATOR, '/', $ret);
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/gw_base.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/ideal_nl.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/ideal_nl.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/ideal_nl.php	(revision 16630)
@@ -0,0 +1,170 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+/* http://www.ideal.nl/ gateway class */
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kGWiDEALnl'; // for automatic installation
+
+	class kGWiDEALnl extends kGWBase
+	{
+
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'iDEAL.nl', 'ClassName' => 'kGWiDEALnl', 'ClassFile' => 'ideal_nl.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'partner_id' => Array('Name' => 'Partner ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'request_url' => Array('Name' => 'Request URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'http://www.mollie.nl/xml/ideals'),
+					'shipping_control' => Array('Name' => 'Shipping Control', 'Type' => 'select', 'ValueList' => '3=la_CreditDirect,4=la_CreditPreAuthorize', 'Default' => '3'),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$this->Application->StoreVar('gw_success_template',$tag_params['return_template']);
+			$this->Application->StoreVar('gw_cancel_template',$tag_params['cancel_template']);
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$banks = $curl_helper->Send($gw_params['request_url'].'?a=banklist');
+
+			/** @var kXMLHelper $parser */
+			$parser = $this->Application->recallObject('kXMLHelper');
+			$bank_data =& $parser->Parse($banks);
+
+			$bank_data->FindChild('response');
+			$banks = array();
+			foreach ($bank_data->Children as $a_child) {
+				if ($a_child->Name != 'BANK') continue;
+				$banks[$a_child->FindChildValue('bank_id')] = $a_child->FindChildValue('bank_name');
+			}
+
+			$ret = $this->Application->Phrase('lu_Select_iDEAL_bank').': <select name="ideal_nl_bank_id">';
+			foreach ($banks as $id => $name) {
+				$ret .= '<option value="'.$id.'">'.$name.'</option>';
+			}
+			$ret .= '</select>';
+			$ret .= '<input type="hidden" name="events[ord]" value="OnCompleteOrder" />'."\n";
+			return $ret;
+		}
+
+		function DirectPayment($item_data, $gw_params)
+		{
+			$fields = array();
+
+			$fields['a'] = 'fetch';
+			$fields['partnerid'] = $gw_params['partner_id'];
+			$txt_amount = sprintf("%.2f", $item_data['TotalAmount']);
+			$fields['amount'] = str_replace( Array('.', ','), '', $txt_amount);
+			$fields['bank_id'] = $this->Application->GetVar('ideal_nl_bank_id');
+			$fields['description'] = 'Invoice #'.$item_data['OrderNumber'];
+			$fields['returnurl'] = $this->getNotificationUrl() . '?order_id='.$item_data['OrderId'];
+			$fields['reporturl'] = $this->getNotificationUrl() . '?mode=report&order_id='.$item_data['OrderId'];
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetRequestData($fields);
+			$transaction_xml = $curl_helper->Send($gw_params['request_url']);
+
+			/** @var kXMLHelper $parser */
+			$parser = $this->Application->recallObject('kXMLHelper');
+			$trans_data =& $parser->Parse($transaction_xml);
+			$transaction_id = $trans_data->FindChildValue('transaction_id');
+			$url = $trans_data->FindChildValue('url');
+
+			if ($transaction_id && $url) {
+				$this->Application->Redirect('external:'.$url);
+			}
+			else {
+				$error_msg = $trans_data->FindChildValue('message');
+				$this->parsed_responce['XML'] = $transaction_xml;
+				$this->Application->SetVar('failure_template', $this->Application->RecallVar('gw_cancel_template'));
+				$this->parsed_responce['MESSAGE'] = $error_msg ? $error_msg : 'Unknown gateway error ('.kUtil::escape($transaction_xml, kUtil::ESCAPE_HTML).')';
+				return false;
+			}
+
+			return true;
+		}
+
+		function getErrorMsg()
+		{
+			return $this->parsed_responce['MESSAGE'];
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+		function processNotification($gw_params)
+		{
+			// silent mode
+			if ($this->Application->GetVar('mode') == 'report') {
+				$fields = array();
+
+				$fields['a'] = 'check';
+				$fields['partnerid'] = $gw_params['partner_id'];
+				$fields['transaction_id'] =  $this->Application->GetVar('transaction_id');
+				$fields['bank_id'] = $this->Application->GetVar('ideal_nl_bank_id');
+
+				/** @var kCurlHelper $curl_helper */
+				$curl_helper = $this->Application->recallObject('CurlHelper');
+
+				$curl_helper->SetRequestData($fields);
+				$check_xml = $curl_helper->Send($gw_params['request_url']);
+
+				/** @var kXMLHelper $parser */
+				$parser = $this->Application->recallObject('kXMLHelper');
+				$trans_data =& $parser->Parse($check_xml);
+
+				$response = $trans_data->FindChild('order');
+				foreach ($response->Children as $a_child) {
+					$this->parsed_responce[$a_child->Name] = $a_child->Data;
+				}
+				$this->parsed_responce['XML'] = $check_xml;
+
+				$result = $trans_data->FindChildValue('payed') == 'true' ? 1:0;
+				return $result;
+			}
+			else {
+				$order = $this->Application->recallObject('ord');
+				if ($order->GetDBField('Status') == ORDER_STATUS_INCOMPLETE) {
+					// error
+					$t = $this->Application->RecallVar('gw_cancel_template');
+					$this->parsed_responce = unserialize($order->GetDBField('GWResult1'));
+					$this->Application->StoreVar('gw_error', $this->getErrorMsg());
+					$this->Application->Redirect($t, array('pass'=>'m', 'm_cat_id'=>0));
+				}
+				else {
+					// ok
+					$t = $this->Application->RecallVar('gw_success_template');
+					$this->Application->Redirect($t, array('pass'=>'m', 'm_cat_id'=>0));
+
+				}
+			}
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/ideal_nl.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/multicards.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/multicards.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/multicards.php	(revision 16630)
@@ -0,0 +1,122 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	$class_name = 'kMultiCardsGW'; // for automatic installation
+
+	class kMultiCardsGW extends kGWBase
+	{
+
+		function InstallData()
+		{
+			$data = array(
+				'Gateway' => Array('Name' => 'Multicards', 'ClassName' => 'kMultiCardsGW', 'ClassFile' => 'multicards.php', 'RequireCCFields' => 0),
+				'ConfigFields' => Array(
+					'submit_url' => Array('Name' => 'Submit URL', 'Type' => 'text', 'ValueList' => '', 'Default' => 'https://secure.multicards.com/cgi-bin/order2/processorder1.pl'),
+					'merchant_id' => Array('Name' => 'Merchant ID', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+					'merchant_url_idx' => Array('Name' => 'Merchant Order Page Id', 'Type' => 'text', 'ValueList' => '', 'Default' => ''),
+				)
+			);
+			return $data;
+		}
+
+		/**
+		 * Returns payment form submit url
+		 *
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return string
+		 */
+		function getFormAction($gw_params)
+		{
+			return $gw_params['submit_url'];
+		}
+
+		/**
+		 * Processed input data and convets it to fields understandable by gateway
+		 *
+		 * @param Array $item_data
+		 * @param Array $tag_params additional params for gateway passed through tag
+		 * @param Array $gw_params gateway params from payment type config
+		 * @return Array
+		 */
+		function getHiddenFields($item_data, $tag_params, $gw_params)
+		{
+			$ret = Array();
+
+			$ret['mer_id'] = $gw_params['merchant_id'];
+			$ret['mer_url_idx'] = $gw_params['merchant_url_idx'];
+
+			$ret['num_items'] = 100;
+			$ret['item1_price'] = $item_data['TotalAmount'];
+			$ret['item1_desc'] = 'Order #'.$item_data['OrderNumber'];
+			$ret['item1_qty'] = 1;
+
+
+//			$ret['cancel_return'] = $this->Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m'));
+//			$ret['return'] = $this->Application->HREF($tag_params['return_template'],'',Array('pass'=>'m'));
+//			$ret['notify_url'] = $this->getNotificationUrl() . '?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'];
+//			$ret['cmd'] = '_xclick'; // act as "Buy Now" PayPal button
+
+			$ret['no_note'] = 1;	// customer is not prompted for notes
+			$ret['no_shipping'] = 1;	// customer is not prompted for shipping address
+			$ret['rm'] = 2;	// return method - POST
+			$ret['currency_code'] = $target;
+			$ret['invoice'] = $item_data['OrderNumber'];
+			$ret['business'] = $gw_params['business_account'];
+
+			// prepopulated fields
+			$billing_email = $item_data['BillingEmail'];
+			if (!$billing_email) {
+				$billing_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
+											WHERE PortalUserId = '.$this->Application->RecallVar('user_id'));
+			}
+			$ret['cust_email'] = $billing_email;
+
+			$ret['cust_name'] = $item_data['BillingTo'];
+			$ret['cust_company'] = $item_data['BillingCompany'];
+			$ret['cust_phone'] = $item_data['BillingPhone'];
+			$ret['cust_address1'] = $item_data['BillingAddress1'];
+			$ret['cust_address2'] = $item_data['BillingAddress2'];
+			$ret['cust_city'] = $item_data['BillingCity'];
+			$ret['cust_state'] = $item_data['BillingState'];
+			$ret['cust_zip'] = $item_data['BillingZip'] ? $item_data['BillingZip'] : '99999';
+			$ret['cust_country'] = $item_data['BillingCountry'];
+
+			$ret['user1'] = $this->Application->GetSID().','.MD5($item_data['OrderId']);
+
+			$url = $this->Application->HREF($tag_params['return_template'], '', array('pass'=>'m'));
+			$ret['user2'] = $url;
+
+			return $ret;
+		}
+
+		function processNotification($gw_params)
+		{
+			$this->parsed_responce = $_POST;
+
+			list ($sid, $auth_code) = explode(',', $this->Application->GetVar('user1'));
+			$session = $this->Application->recallObject('Session');
+			$session->SID = $sid;
+
+			$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
+			$this->Application->SetVar('ord_id', $order_id);
+			$order = $this->Application->recallObject('ord');
+			$order->Load($order_id);
+
+			$url =  $this->Application->GetVar('user2');
+			echo '<!--success--><a href="'.$url.'">'.$this->Application->Phrase('lu_text_MulticardsContinue').'</a>';
+
+			return 1;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/multicards.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_classes/rightconnect.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_classes/rightconnect.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_classes/rightconnect.php	(revision 16630)
@@ -0,0 +1,224 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	require_once GW_CLASS_PATH.'/gw_base.php';
+
+	class kGWRightConnect extends kGWBase
+	{
+
+	/*	function Install()
+		{
+			$query = "INSERT INTO `".TABLE_PREFIX."Gateways` ( `GatewayId` , `Name` , `ClassName` , `ClassFile` , `RequireCCFields` )
+								VALUES (
+									'', 'RightConnect', 'kGWRightConnect', 'rightconnect.php', '1'
+								)";
+			$this->Conn->Query($query);
+			$id = $this->Conn->getInsertID();
+
+			$query = "INSERT INTO `".TABLE_PREFIX."GatewayConfigFields` ( `GWConfigFieldId` , `SystemFieldName` , `FieldName` , `ElementType` , `ValueList` , `GatewayId` )
+								VALUES (
+								'', 'submit_url', 'Submit URL', 'text', '', '$id'
+								), (
+								'', 'user_account', 'User Account', 'text', '', '$id'
+								), (
+								'', 'password', 'User Account', 'text', '', '$id'
+								),
+								(
+								'', 'encapsulate_char', 'Encapsualte Char', 'text', '', '$id'
+								)";
+			$this->Conn->Query($query);
+		}*/
+
+		function DirectPayment($item_data, $gw_params)
+		{
+
+			/*$post_fields["card_holder"] = "test test";
+			$post_fields["cardtype"] = "Visa";
+			$post_fields["card_number"] = "4444333322221111";
+			$post_fields["cvv2"] = "123";
+			$post_fields["exp_mon"] = "05";
+			$post_fields["exp_year"] = "05";
+			$post_fields["address1"] = "test";
+			$post_fields["city"] = "test";
+			$post_fields["state"] = "CA";
+			$post_fields["zip"] = "90069";
+			$post_fields["country"] = "USA";
+			$post_fields["firstname"] = "test";
+			$post_fields["lastname"] = "test";
+			$post_fields["email"] = "customer@yourdomain.com";
+			$post_fields["merchant_account"] = "demo";
+			$post_fields["trans_amount"] = "8.98";
+			$post_fields["user1"] = "DELIM";
+			$post_fields["ALIAS"] = "www.yourdomain.com";
+			$post_fields["customer_ip"] = $this->Application->getClientIp();
+			$post_fields["ADMIN_EMAIL"] = "admin@yourdomain.com";*/
+
+
+			$post_fields = Array();
+			// -- Login Information --
+			//$post_fields['x_version']			=	'3.1';
+			$post_fields["user1"] = "DELIM";
+
+			//$post_fields['x_type']				=	$gw_params['shipping_control'] == SHIPPING_CONTROL_PREAUTH ? 'AUTH_ONLY' : 'AUTH_CAPTURE';
+
+			$post_fields['merchant_account']	=	$gw_params['user_account'];
+			$post_fields['merchant_pass']			=	$gw_params['password'];
+
+			if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
+
+			// -- Payment Details --
+			$names = explode(' ', $item_data['BillingTo'], 2);
+			$post_fields['firstname']		=	getArrayValue($names, 0);
+			$post_fields['lastname']			=	getArrayValue($names, 1);
+			$post_fields['trans_amount']			=	sprintf('%.2f', $item_data['TotalAmount']);
+
+			//$post_fields['x_company']			=	$item_data['BillingCompany'];
+
+			$post_fields['card_number']			=	$item_data['PaymentAccount'];
+			$post_fields['card_holder']			=	$item_data['PaymentNameOnCard'];
+			$post_fields['cvv2']			=	$item_data['PaymentCVV2'];
+
+			list($exp_mon,$exp_year) = explode('/', $item_data['PaymentCCExpDate']);
+			$post_fields['exp_mon']			=	$exp_mon;
+			$post_fields['exp_year']			=	$exp_year;
+
+			$post_fields['address1']			=	$item_data['BillingAddress1'];
+			$post_fields['address2']			=	$item_data['BillingAddress2'];
+			$post_fields['city']				=	$item_data['BillingCity'];
+			$post_fields['state']				=	$item_data['BillingState'];
+			$post_fields['zip']				=	$item_data['BillingZip'];
+
+			$post_fields['country']			=	$item_data['BillingCountry'];
+
+			$post_fields['user2']			=	$item_data['PortalUserId'];
+			$post_fields['user3']		=	$item_data['OrderNumber'];
+			$post_fields['customer_email']	=	'FALSE';
+
+			$post_fields['customer_addr'] = $item_data['OrderIP']; // according to fields list in doc
+			$post_fields['customer_ip'] = $item_data['OrderIP']; // according to example from doc
+			$post_fields["email"] = $item_data['BillingEmail'];
+			$post_fields["ADMIN_EMAIL"] = $this->Application->ConfigValue('DefaultEmailSender');
+
+			/** @var kCurlHelper $curl_helper */
+			$curl_helper = $this->Application->recallObject('CurlHelper');
+
+			$curl_helper->SetPostData($post_fields);
+			$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
+
+			$gw_responce = $this->parseGWResponce(null, $gw_params);
+
+			// gw_error_msg: $gw_response['responce_reason_text']
+			// gw_error_code: $gw_response['responce_reason_code']
+			return ($gw_responce['responce_code'] != 1) ? false : true;
+		}
+
+		/**
+		 * Captures Authorized transaction by transaction ID
+		 *
+		 * @param Array $item_data
+		 * @param Array $gw_params
+		 * @return bool
+		 */
+		function Charge($item_data, $gw_params)
+		{
+			return true;
+		}
+
+		/**
+		 * Parse previosly saved gw responce into associative array
+		 *
+		 * @param string $gw_responce
+		 * @param Array $gw_params
+		 * @return Array
+		 */
+		function parseGWResponce($gw_responce = null, $gw_params)
+		{
+			if( !isset($gw_responce) ) $gw_responce = $this->gw_responce;
+
+			$fields = Array(
+							'responce_code',  				// 0
+							'responce_sub_code',			// 1
+							'responce_reason_code',		// 2
+							'responce_reason_text',		// 3
+							'approval_code',					// 4
+							'avs_result_code',				// 5
+							'transaction_id',					// 6
+							'fraud_score',						// 7
+							'not_used8',							// 8
+							'amount',									// 9
+							'not_used10',							// 10
+							'transaction_type',				// 11
+							'not_used_customer_id',		// 12
+							'first_name',							// 13
+							'last_name',							// 14
+							'not_documented_empty_field', // 15 !!!!!!!!!!! DOES NOT MATCH DOCUMENTATION
+							'address',								// 16
+							'city',										// 17
+							'state',									// 18
+							'zip',										// 19
+							'country',								// 20
+							'phone',									// 21
+							'fax',										// 22
+							'email',									// 23
+							'ship_name',							// 24
+							'not_used25',							// 25
+							'not_used26',							// 26
+							'ship_address',						// 27
+							'ship_city',							// 28
+							'ship_state',							// 29
+							'ship_zip',								// 30
+							'ship_country',						// 31
+							'tax',										// 32
+							'not_used32',							// 33
+							'not_used33',							// 34
+							'not_used34',							// 35
+							'not_used35',							// 36
+							'not_used36',							// 37
+							'cvv_responce',						// 38
+							'receipt_number',					// 39
+							'passthru1',							// 40
+							'passthru2',							// 41
+							'passthru3',							// 42
+							'passthru4',							// 43
+							'passthru5',							// 44
+							'passthru6',							// 45
+							'passthru7',							// 46
+							'passthru8',							// 47
+							'passthru9',							// 48
+							'passthru10',							// 49
+							);
+
+			$encapsulate_char = $gw_params['encapsulate_char'];
+			if($encapsulate_char)
+			{
+				$ec_length = strlen($encapsulate_char);
+				$gw_responce = substr($gw_responce, $ec_length, $ec_length * -1);
+			}
+
+			$gw_responce = explode($encapsulate_char.','.$encapsulate_char, $gw_responce);
+			$ret = Array();
+			foreach($fields as $field_index => $field_name)
+			{
+				$ret[$field_name] = $gw_responce[$field_index];
+				unset($gw_responce[$field_index]);
+			}
+			$this->parsed_responce = $ret;
+			return kUtil::array_merge_recursive($ret, $gw_responce); // returns unparsed fields with they original indexes together with parsed ones
+		}
+
+		function getGWResponce()
+		{
+			return serialize($this->parsed_responce);
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_classes/rightconnect.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateways/gw_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/gateways/gw_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/gateways/gw_tag_processor.php	(revision 16630)
@@ -0,0 +1,127 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class GatewayTagProcessor extends kDBTagProcessor {
+
+	/**
+	 * Payment gateway config values for current payment type
+	 *
+	 * @var Array
+	 * @access private
+	 */
+	var $ConfigValues=Array();
+
+	/**
+	 * Payment type id for current gateway values
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $PaymentTypeID=0;
+
+
+	function initGWConfigValues()
+	{
+		$payment_type_id = $this->Application->GetVar('pt_id');
+		$GWConfigValue = $this->Application->recallObject('gwfv');
+
+		$sql = 'SELECT Value, GWConfigFieldId FROM '.$GWConfigValue->TableName.' WHERE PaymentTypeId = '.$payment_type_id;
+		$this->ConfigValues = $this->Conn->GetCol($sql,'GWConfigFieldId');
+	}
+
+	function gwConfigValue($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$id = $object->GetID();
+
+		$value = isset($this->ConfigValues[$id]) ? $this->ConfigValues[$id] : '';
+		if ( !array_key_exists('no_special', $params) || !$params['no_special'] ) {
+			$value = kUtil::escape($value);
+		}
+
+		if ( getArrayValue($params, 'checked') ) {
+			$value = ($value == 1) ? 'checked' : '';
+		}
+
+		return $value;
+	}
+
+	function PrintList($params)
+	{
+		$list = $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List', $params);
+		$id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
+
+		$list->Query();
+		$list->GoFirst();
+
+		$block_params=$this->prepareTagParams($params);
+		$block_params['name']=$params['block'];
+		$block_params['pass_params']='true';
+
+		$payment_type_object = $this->Application->recallObject('pt');
+
+		$o = '';
+
+		while (!$list->EOL())
+		{
+			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) );
+
+			$display_style = $payment_type_object->GetDBField('GatewayId') == $list->GetDBField('GatewayId') ? 'table-row' : 'none';
+			$block_params['input_block'] = $params['input_block_prefix'].$list->GetDBField('ElementType');
+			$block_params['gateway_id'] = $list->GetDBField('GatewayId');
+			$block_params['display'] = $display_style;
+
+			$o .= $this->Application->ParseBlock($block_params, 1);
+
+			$list->GoNext();
+		}
+
+		return $o;
+	}
+
+	/**
+	 * Prints list a all possible field options
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function PredefinedOptions($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
+		$block_params['pass_params'] = 'true';
+
+		$o = '';
+		$value = $this->gwConfigValue($params);
+		$options = explode(',', $object->GetDBField('ValueList'));
+
+		foreach ($options as $key_val) {
+			list($key, $val) = explode('=', $key_val);
+			$block_params['key'] = $key;
+			$block_params['option'] = $val;
+			$block_params['selected'] = ($key == $value ? ' ' . $params['selected'] : '');
+			$block_params['PrefixSpecial'] = $this->getPrefixSpecial();
+			$o .= $this->Application->ParseBlock($block_params, 1);
+		}
+
+		return $o;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateways/gw_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/sections/sections_config.php
===================================================================
--- releases/5.2.2-B2/units/sections/sections_config.php	(revision 0)
+++ releases/5.2.2-B2/units/sections/sections_config.php	(revision 16630)
@@ -0,0 +1,34 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	$config = Array (
+		'Prefix' => 'in-commerce-sections',
+
+		'EventHandlerClass' => Array ('class' => 'InCommerceEventHandler', 'file' => 'section_eh.php', 'build_event' => 'OnBuild'), // for OnAfterConfigRead event
+		'TagProcessorClass' => Array ('class' => 'kTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), // for tree drawing
+
+		'Hooks' => Array (
+			Array (
+				'Mode' => hBEFORE,
+				'Conditional' => false,
+				'HookToPrefix' => 'site-domain',
+				'HookToSpecial' => '*',
+				'HookToEvent' => Array ('OnAfterConfigRead'),
+				'DoPrefix' => '',
+				'DoSpecial' => '*',
+				'DoEvent' => 'OnModifySiteDomainConfig',
+			),
+		),
+	);

Property changes on: releases/5.2.2-B2/units/sections/sections_config.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/sections/section_eh.php
===================================================================
--- releases/5.2.2-B2/units/sections/section_eh.php	(revision 0)
+++ releases/5.2.2-B2/units/sections/section_eh.php	(revision 16630)
@@ -0,0 +1,101 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class InCommerceEventHandler extends kEventHandler {
+
+		/**
+		 * [HOOK] Creates site domain editing tab
+		 *
+		 * @param kEvent $event
+		 */
+		function OnModifySiteDomainConfig($event)
+		{
+			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
+			$edit_tab_presets['Default']['in-commerce'] = Array (
+				'title' => 'la_title_In-Commerce', 't' => 'in-commerce/site_domains/site_domain_edit', 'priority' => 2.1
+			);
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
+
+			$title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
+			$title_presets['site_domain_edit_in_commerce'] = Array (
+				'prefixes' => Array ('site-domain'), 'format' => "#site-domain_status# '#site-domain_titlefield#' - !la_title_In-Commerce!",
+				'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'),
+			);
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'TitlePresets', $title_presets);
+
+			$new_fields = Array (
+				'BillingCountry' => Array (
+					'type' => 'string', 'max_len' => 3,
+					'formatter' => 'kOptionsFormatter',
+					'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+										FROM ' . TABLE_PREFIX . 'CountryStates
+										WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+										ORDER BY Name',
+					'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+					'not_null' => 1, 'default' => ''
+				),
+				'ShippingCountry' => Array (
+					'type' => 'string', 'max_len' => 3,
+					'formatter' => 'kOptionsFormatter',
+					'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+										FROM ' . TABLE_PREFIX . 'CountryStates
+										WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+										ORDER BY Name',
+					'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+					'not_null' => 1, 'default' => ''
+				),
+				'PrimaryCurrencyId' => Array (
+					'type' => 'int',
+					'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Currencies WHERE Status = 1 ORDER BY ISO', 'option_key_field' => 'CurrencyId', 'option_title_field' => 'Name', 'use_phrases' => 1,
+					'not_null' => 1, 'default' => 0
+				),
+				'Currencies' => Array (
+					'type' => 'string', 'max_len' => 255,
+					'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Currencies WHERE Status = 1 ORDER BY ISO', 'option_key_field' => 'CurrencyId', 'option_title_field' => 'Name', 'use_phrases' => 1,
+					'not_null' => 1, 'default' => ''
+				),
+				'PrimaryPaymentTypeId' => Array (
+					'type' => 'int',
+					'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PaymentTypes WHERE Status = 1 ORDER BY Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name',
+					'not_null' => 1, 'default' => 0
+				),
+				'PaymentTypes' => Array (
+					'type' => 'string', 'max_len' => 255,
+					'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PaymentTypes WHERE Status = 1 ORDER BY Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name',
+					'not_null' => 1, 'default' => ''
+				),
+			);
+
+			$fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', array_merge($fields, $new_fields));
+
+			$new_columns = Array (
+				'BillingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'ShippingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'PrimaryCurrencyId' => Array ('title' => 'column:la_fld_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'PrimaryPaymentTypeId' => Array ('title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+			);
+
+			$grids = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Grids');
+			$grids['Default']['Fields'] = array_merge($grids['Default']['Fields'], $new_columns);
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Grids', $grids);
+
+			if (!$this->Application->isAdmin && is_object($this->Application->siteDomain)) {
+				// re-configure object, because it's recalled before kUnitConfigReader::AfterConfigRead is called
+				$this->Application->siteDomain->Configure();
+			}
+		}
+
+	}

Property changes on: releases/5.2.2-B2/units/sections/section_eh.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/downloads/downloads_config.php
===================================================================
--- releases/5.2.2-B2/units/downloads/downloads_config.php	(revision 0)
+++ releases/5.2.2-B2/units/downloads/downloads_config.php	(revision 16630)
@@ -0,0 +1,116 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'down',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'DownloadHelper', 'class' => 'DownloadHelper', 'file' => 'download_helper.php', 'build_event' => ''),
+	),
+
+	'AutoLoad' => true,
+
+	/*'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => 'p',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'onPreSave' ),
+			'DoPrefix' => 'pr',
+			'DoSpecial' => 'tang',
+			'DoEvent' => 'OnArrange',
+		),
+	),*/
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'TitlePresets' => Array (
+		'downloads_list' => Array (
+			'prefixes' => Array ('down_List'), 'format' => "!la_title_FileDownloads!",
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:downloadlog'),
+
+	'Sections' => Array (
+		'in-commerce:downloadlog' => Array (
+			'parent' => 'in-portal:reports',
+			'icon' => 'download_log',
+			'label' => 'la_tab_DownloadLog',
+			'url' => Array ('t' => 'in-commerce/downloads/downloads_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'delete'),
+			'priority' => 7,
+			'type' => stTREE,
+		),
+	),
+
+	'IDField' => 'DownloadId',
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'UserDownloads',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('StartedOn' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'DownloadId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Username' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ProductName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Filename' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'IPAddress' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'StartedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'EndedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'DownloadId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Username' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'ProductName' => Array ( 'title' => 'la_col_DownloadedProductName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'Filename' => Array ( 'title' => 'la_col_DownloadedFileName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'IPAddress' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'StartedOn' => Array ( 'title' => 'la_col_StartedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/downloads/downloads_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/downloads/download_helper.php
===================================================================
--- releases/5.2.2-B2/units/downloads/download_helper.php	(revision 0)
+++ releases/5.2.2-B2/units/downloads/download_helper.php	(revision 16630)
@@ -0,0 +1,77 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class DownloadHelper extends kHelper {
+
+		function CheckAccess($file_id, $product_id)
+		{
+			$sql = 'SELECT FileAccessId FROM '.TABLE_PREFIX.'UserFileAccess
+							WHERE PortalUserId = '.$this->Application->RecallVar('user_id').'
+							AND ProductId = '.$product_id;
+			return $this->Conn->GetOne($sql);
+		}
+
+		function SendFile($file_id, $product_id)
+		{
+			/** @var kDBItem $file_object */
+			$file_object = $this->Application->recallObject('file', null, Array('skip_autoload' => true));
+
+			$sql = $file_id ?
+						'SELECT FileId, FilePath, RealPath, MIMEType FROM '.$this->Application->getUnitOption('file', 'TableName').'
+							WHERE FileId = '.$file_id :
+						'SELECT FileId, FilePath, RealPath, MIMEType FROM '.$this->Application->getUnitOption('file', 'TableName').'
+							WHERE ProductId = '.$product_id.' AND IsPrimary = 1';
+			$file_info = $this->Conn->GetRow($sql);
+
+			$field_options = $file_object->GetFieldOptions('RealPath');
+			$file_info['real_path'] = FULL_PATH.$field_options['upload_dir'].'/'.$file_info['RealPath'];
+			$file_info = $this->DoSendFile($file_info);
+			return $file_info;
+		}
+
+		function DoSendFile($file_info)
+		{
+			$this->Application->setContentType(kUtil::mimeContentType($file_info['real_path']), false);
+			header('Content-Disposition: attachment; filename="' . $file_info['FilePath'] . '"');
+			header('Content-Length: ' . filesize($file_info['real_path']));
+
+			$file_info['download_start'] = adodb_mktime();
+			readfile($file_info['real_path']);
+			flush();
+			$file_info['download_end'] = adodb_mktime(); // this is incorrect
+			define('SKIP_OUT_COMPRESSION', 1);
+			return $file_info;
+		}
+
+		function LogDownload($product_id, $file_info)
+		{
+			$down_object = $this->Application->recallObject('down', null, Array('skip_autoload' => true));
+			$user_object = $this->Application->recallObject('u.current');
+			$product_object = $this->Application->recallObject( 'p' );
+
+			$down_object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
+			$down_object->SetDBField('Username', $user_object->GetDBField('Username'));
+			$down_object->SetDBField('ProductId', $product_id);
+			$down_object->SetDBField('ProductName', $product_object->GetField('Name'));
+			$down_object->SetDBField('FileId', $file_info['FileId']);
+			$down_object->SetDBField('Filename', $file_info['FilePath']);
+			$down_object->SetDBField('IPAddress', $this->Application->getClientIp());
+			$down_object->SetDBField('StartedOn_date', $file_info['download_start']);
+			$down_object->SetDBField('StartedOn_time', $file_info['download_start']);
+
+			$down_object->Create();
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/downloads/download_helper.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_options/product_options_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/product_options/product_options_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/product_options/product_options_event_handler.php	(revision 16630)
@@ -0,0 +1,110 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class ProductOptionsEventHandler extends kDBEventHandler{
+
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			$selectable_only = $event->getEventParam('selectable_only');
+
+			if ( $selectable_only ) {
+				/** @var kDBList $object */
+				$object = $event->getObject();
+
+				$object->addFilter('types_filter', 'OptionType IN (1,3,6)');
+			}
+		}
+
+		/**
+		 * Updates temp_id to live_id in options combinations
+		 *
+		 * !Not called when "po" doesn't have subitems (temp handler problem)
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterCopyToLive(kEvent $event)
+		{
+			parent::OnAfterCopyToLive($event);
+
+			$id = $event->getEventParam('id');
+			$temp_id = $event->getEventParam('temp_id');
+
+			if ( $id == $temp_id ) {
+				return;
+			}
+
+			$poc_table = $this->Application->GetTempName(TABLE_PREFIX . 'ProductOptionCombinations', 'prefix:p');
+
+			$sql = 'SELECT *
+			FROM ' . $poc_table;
+			$combs = $this->Conn->Query($sql);
+
+			foreach ($combs as $a_comb) {
+				$comb_data = unserialize($a_comb['Combination']);
+				$n_combs = array ();
+				foreach ($comb_data as $key => $val) {
+					$n_key = $key == $temp_id ? $id : $key;
+					$n_combs[$n_key] = $val;
+				}
+				ksort($n_combs);
+				$n_combs = serialize($n_combs);
+				$n_crc = kUtil::crc32($n_combs);
+				$sql = 'UPDATE ' . $poc_table . '
+						SET
+							Combination = ' . $this->Conn->qstr($n_combs) . ',
+							CombinationCRC = ' . $n_crc . '
+						WHERE CombinationId = ' . $a_comb['CombinationId'];
+				$this->Conn->Query($sql);
+			}
+		}
+
+		/**
+		 * Occurs after an item has been cloned
+		 * Id of newly created item is passed as event' 'id' param
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterClone(kEvent $event)
+		{
+			parent::OnAfterClone($event);
+
+			$id = $event->getEventParam('id');
+			$org_id = $event->getEventParam('original_id');
+
+			// storing original to new ids mapping to use in poc:OnBeforeClone
+			$options_mapping = $this->Application->GetVar('poc_mapping');
+			if ( !$options_mapping ) {
+				$options_mapping = array ();
+			}
+
+			$options_mapping[$org_id] = $id;
+			$this->Application->SetVar('poc_mapping', $options_mapping);
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_options/product_options_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_options/product_options_helper.php
===================================================================
--- releases/5.2.2-B2/units/product_options/product_options_helper.php	(revision 0)
+++ releases/5.2.2-B2/units/product_options/product_options_helper.php	(revision 16630)
@@ -0,0 +1,98 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class kProductOptionsHelper extends kHelper {
+
+		function ExplodeOptionValues($option_row)
+		{
+			$values = getArrayValue($option_row, 'Values');
+			if (!$values) return false;
+
+			$values = explode(',', $values);
+
+			$prices = preg_split('/(?<!\\\)\|/', getArrayValue($option_row, 'Prices'));
+			foreach ($prices as $a_price) {
+				list($id, $price) = preg_split('/(?<!\\\)=/', $a_price);
+				$conv_prices[$id] = $price;
+			}
+			$price_types = preg_split('/(?<!\\\)\|/', getArrayValue($option_row, 'PriceTypes'));
+			foreach ($price_types as $a_price_type) {
+				list($id, $price_type) = preg_split('/(?<!\\\)=/', $a_price_type);
+				$conv_price_types[$id] = $price_type;
+			}
+			$conv_prices = $this->UnEscape($conv_prices);
+			$conv_price_types = $this->UnEscape($conv_price_types);
+
+			return array('Values'=>$values, 'Prices'=>$conv_prices, 'PriceTypes'=>$conv_price_types);
+		}
+
+		function UnEscape($data)
+		{
+			$res = array();
+			foreach ($data as $key=>$val)
+			{
+				$n_key = str_replace('\\|', '|', $key);
+				$n_key = str_replace('\\=', '=', $n_key);
+				$n_val = str_replace('\\|', '|', $val);
+				$n_val = str_replace('\\=', '=', $n_val);
+				$res[$n_key] = $n_val;
+			}
+			return $res;
+		}
+
+		function ConvertKey($key, $product_id, $use_temp=0)
+		{
+			static $mapping = null;
+
+			if (is_null($mapping) || !isset($mapping[$product_id])) {
+				$table = TABLE_PREFIX.'ProductOptions';
+				if ($use_temp) $table = $this->Application->GetTempName($table, 'prefix:p');
+				$sql = 'SELECT * FROM '.$table.' WHERE ProductId = '.$product_id;
+
+				$mapping[$product_id] = $this->Conn->Query($sql, 'ProductOptionId');
+			}
+
+			return $mapping[$product_id][$key];
+		}
+
+		function OptionsSalt($options, $comb_only=false)
+		{
+			if ( !is_array($options) ) {
+				return 0;
+			}
+			if ( !$comb_only ) {
+				ksort($options);
+				return kUtil::crc32(serialize($options));
+			}
+
+			$option_keys = array_keys($options);
+			if ( !$option_keys ) {
+				return '';
+			}
+
+			$sql = 'SELECT ProductOptionId
+					FROM ' . TABLE_PREFIX . 'ProductOptions
+					WHERE ProductOptionId IN (' . join(',', $option_keys) . ') AND OptionType IN (1,3,6)';
+			$included = $this->Conn->GetCol($sql);
+
+			foreach ($option_keys as $key) {
+				if ( !in_array($key, $included) ) {
+					unset($options[$key]);
+				}
+			}
+
+			return $this->OptionsSalt($options);
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_options/product_options_helper.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_options/product_options_config.php
===================================================================
--- releases/5.2.2-B2/units/product_options/product_options_config.php	(revision 0)
+++ releases/5.2.2-B2/units/product_options/product_options_config.php	(revision 16630)
@@ -0,0 +1,104 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'po',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ProductOptionsEventHandler', 'file' => 'product_options_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ProductOptionsTagProcessor', 'file' => 'product_options_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'kProductOptionsHelper', 'class' => 'kProductOptionsHelper', 'file' => 'product_options_helper.php', 'build_event' => ''),
+	),
+
+	'AutoLoad' => true,
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'ListOptions',
+			'LocalTagName' => 'ListOptions',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'TitleField' => 'Name',
+	'IDField' => 'ProductOptionId',
+	'TableName' => TABLE_PREFIX.'ProductOptions',
+	'ForeignKey' => 'ProductId',
+	'ParentTableKey' => 'ProductId',
+	'ParentPrefix' => 'p',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+	'SubItems' => Array ('poc'),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+			'ForcedSorting' => Array ('Priority' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'ProductOptionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Name' => Array ('type' => 'string', 'required' => 1, 'max_len' => 255, 'not_null' => 1, 'default' => '',),
+		'OptionType' => Array ('type' => 'int', 'required' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1 => '!la_type_select!', 5 => '!la_type_text!', 4 => '!la_type_textarea!', 3 => '!la_type_radio!', 6 => '!la_type_checkbox!' /*,  2 => '!la_type_password!' */), 'not_null' => 1, 'default' => 0),
+		'Required' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Listable' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' =>1, 'default' =>0),
+		'Values' => Array ('type' => 'string', 'default' => NULL),
+		'Prices' => Array ('type' => 'string', 'default' => NULL),
+		'PriceTypes' => Array ('type' => 'string', 'default' => NULL),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
+			'Fields' => Array (
+				'ProductOptionId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+				'Name' => Array ( 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
+				'OptionType' => Array ( 'filter_block' => 'grid_options_filter'),
+				'Required' => Array ( 'filter_block' => 'grid_options_filter'),
+//				'Listable' => Array ('filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_options/product_options_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_options/product_options_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/product_options/product_options_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/product_options/product_options_tag_processor.php	(revision 16630)
@@ -0,0 +1,176 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ProductOptionsTagProcessor extends kDBTagProcessor {
+
+	function ShowOptions($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		/** @var kProductOptionsHelper $opt_helper */
+		$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+		$parsed = $opt_helper->ExplodeOptionValues($object->GetFieldValues());
+		if ( !$parsed ) {
+			return '';
+		}
+
+		$values = $parsed['Values'];
+		$conv_prices = $parsed['Prices'];
+		$conv_price_types = $parsed['PriceTypes'];
+
+		$options =& $this->GetOptions();
+
+		$mode = $this->SelectParam($params, 'mode');
+		$combination_prefix = $this->SelectParam($params, 'combination_prefix');
+		$combination_field = $this->SelectParam($params, 'combination_field');
+
+		if ( $mode == 'selected' ) {
+			/** @var kDBItem $comb */
+			$comb = $this->Application->recallObject($combination_prefix);
+
+			$options = unserialize($comb->GetDBField($combination_field));
+		}
+
+		$block_params['name'] = $params['render_as'];
+		$block_params['selected'] = '';
+		$block_params['pass_params'] = 1;
+
+		/** @var LanguagesItem $lang */
+		$lang = $this->Application->recallObject('lang.current');
+
+		$o = '';
+		$first_selected = false;
+
+		foreach ($values as $option) {
+//			list($val, $label) = explode('|', $option);
+			$val = $option;
+
+			if ( getArrayValue($params, 'js') ) {
+				$block_params['id'] = kUtil::escape($val, kUtil::ESCAPE_JS);
+				$block_params['value'] = kUtil::escape($val);
+			}
+			else {
+				$block_params['id'] = kUtil::escape($val);
+				$block_params['value'] = kUtil::escape($val);
+			}
+
+			if ( $conv_prices[$val] ) {
+				if ( $conv_price_types[$val] == '$' && !getArrayValue($params, 'js') && !getArrayValue($params, 'no_currency') ) {
+					$iso = $this->GetISO($params['currency']);
+					$value = sprintf("%.2f", $this->ConvertCurrency($conv_prices[$val], $iso));
+
+					$value = $this->AddCurrencySymbol($lang->formatNumber($value, 2), $iso, true); // true to force sign
+					$block_params['price'] = $value;
+					$block_params['price_type'] = '';
+					$block_params['sign'] = ''; //sign is included in the formatted value
+				}
+				else {
+					$block_params['price'] = isset($params['js']) ? $conv_prices[$val] : $lang->formatNumber($conv_prices[$val], 2);
+					$block_params['price_type'] = $conv_price_types[$val];
+					$block_params['sign'] = $conv_prices[$val] >= 0 ? '+' : '-';
+				}
+			}
+			else {
+				$block_params['price'] = '';
+				$block_params['price_type'] = '';
+				$block_params['sign'] = '';
+			}
+
+			/*if ($mode == 'selected') {
+				$selected = $combination[$object->GetID()] == $val;
+			}
+			else*/
+			$selected = false;
+
+			if ( !$options && isset($params['preselect_first']) && $params['preselect_first'] && !$first_selected ) {
+				$selected = true;
+				$first_selected = true;
+			}
+
+			if ( is_array($options) ) {
+				$option_value = array_key_exists($object->GetID(), $options) ? $options[$object->GetID()] : '';
+
+				if ( $object->GetDBField('OptionType') == OptionType::CHECKBOX ) {
+					$selected = is_array($option_value) && in_array(kUtil::escape($val), $option_value);
+				}
+				else { // radio buttons ?
+					// TODO: Not sure why we're unescaping.
+					$selected = kUtil::unescape($option_value, kUtil::ESCAPE_HTML) == $val;
+				}
+			}
+
+			if ( $selected ) {
+				if ( $mode == 'selected' ) {
+					if ( $object->GetDBField('OptionType') != OptionType::CHECKBOX ) {
+						$block_params['selected'] = ' selected="selected" ';
+					}
+					else {
+						$block_params['selected'] = ' checked="checked" ';
+					}
+				}
+				else {
+					switch ($object->GetDBField('OptionType')) {
+						case OptionType::DROPDOWN:
+							$block_params['selected'] = ' selected="selected" ';
+							break;
+						case OptionType::RADIO:
+						case OptionType::CHECKBOX:
+							$block_params['selected'] = ' checked="checked" ';
+							break;
+					}
+				}
+			}
+			else {
+				$block_params['selected'] = '';
+			}
+
+			$o .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $o;
+	}
+
+	function &GetOptions()
+	{
+		$opt_data = $this->Application->GetVar('options');
+		$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
+		if (!$options && $this->Application->GetVar('orditems_id')) {
+			/** @var kDBItem $ord_item */
+			$ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
+
+			$ord_item->Load($this->Application->GetVar('orditems_id'));
+			$item_data = unserialize($ord_item->GetDBField('ItemData'));
+			$options = getArrayValue($item_data, 'Options');
+		}
+		return $options;
+	}
+
+	function OptionData($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$options =& $this->GetOptions();
+
+		return getArrayValue($options, $object->GetID());
+	}
+
+	function ListOptions($params)
+	{
+		return $this->PrintList2($params);
+	}
+}

Property changes on: releases/5.2.2-B2/units/product_options/product_options_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/pricing/pricing_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/pricing/pricing_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/pricing/pricing_event_handler.php	(revision 16630)
@@ -0,0 +1,525 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+// include globals.php from current folder
+kUtil::includeOnce(MODULES_PATH . '/in-commerce/units/pricing/globals.php');
+
+class PricingEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnMoreBrackets' => Array ('subitem' => 'add|edit'),
+			'OnInfinity' => Array ('subitem' => 'add|edit'),
+			'OnArrange' => Array ('subitem' => 'add|edit'),
+			'OnDeleteBrackets' => Array ('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
+
+		$brackets_events = Array(
+			'OnMoreBrackets' => 'PricingBracketsAction',
+			'OnArrange' => 'PricingBracketsAction',
+			'OnInfinity' => 'PricingBracketsAction',
+			'OnDeleteBrackets' => 'PricingBracketsAction',
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $brackets_events);
+	}
+
+	function PricingBracketsAction($event)
+	{
+		$event->redirect=false;
+		$temp = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+//		$object = $event->getObject();
+//		$formatter = $this->Application->recallObject('kFormatter');
+//		$temp = $formatter->TypeCastArray($temp, $object);
+
+		//uasort($temp, 'pr_bracket_comp');
+		$bracket = $this->Application->recallObject($event->getPrefixSpecial());
+		foreach($temp as $id => $record)
+		{
+			if( $record['MaxQty'] == '&#8734;' || $record['MaxQty'] == '∞')
+			{
+				$temp[$id]['MaxQty'] = -1;
+			}
+		}
+
+		$group_id = $this->Application->getVar('group_id');
+		if($group_id>0){
+			$where_group=' GroupId = '.$group_id.' ';
+		}
+		else {
+			$where_group= ' TRUE ';
+		}
+
+		switch ($event->Name)
+		{
+			case 'OnMoreBrackets':
+
+				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$bracket->IDField.') FROM '.$bracket->TableName);
+				if($new_id > 0) $new_id = 0;
+				do
+				{
+					$new_id--;
+				} while
+				($this->check_array($this->Application->GetVar($event->getPrefixSpecial(true)), 'PriceId', $new_id));
+
+
+				$last_max_qty = $this->Conn->GetOne('SELECT MAX(MaxQty) FROM '.$bracket->TableName.' WHERE '.$where_group);
+				$min_qty = $this->Conn->GetOne('SELECT MIN(MaxQty) FROM '.$bracket->TableName.' WHERE '.$where_group);
+
+				if ($min_qty==-1) $last_max_qty = -1;
+				if (!$last_max_qty) $last_max_qty=1;
+
+				for($i = $new_id; $i > $new_id - 5; $i--)
+				{
+					$temp[$i]['PriceId'] = $i;
+					$temp[$i]['MinQty'] = ($i == $new_id-4 && $last_max_qty != -1) ? $last_max_qty : '';
+					$temp[$i]['MaxQty'] = ($i == $new_id-4 && $last_max_qty != -1) ? -1 : '';
+					$temp[$i]['Price'] = '';
+					$temp[$i]['Cost'] = '';
+					$temp[$i]['Points'] = '';
+					$temp[$i]['Negotiated'] = '0';
+					$temp[$i]['IsPrimary'] = '0';
+					$temp[$i]['GroupId'] = $group_id;
+				}
+
+				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
+				$event->CallSubEvent('OnPreSaveBrackets');
+				break;
+
+			case 'OnArrange':
+				$temp=$this->OnArrangeBrackets($event, $temp, $bracket);
+				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
+				$event->CallSubEvent('OnPreSaveBrackets');
+				break;
+
+			case 'OnInfinity':
+				$temp=$this->OnArrangeBrackets($event, $temp, $bracket);
+				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
+				$event->CallSubEvent('OnPreSaveBrackets');
+
+				$infinite_exists = $this->Conn->GetOne('SELECT count(*) FROM '.$bracket->TableName.' WHERE MaxQty=-1 '.' AND '.$where_group);
+
+				if($infinite_exists==0){
+					reset($temp);
+					$last_bracket=end($temp);
+					$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$bracket->IDField.') FROM '.$bracket->TableName);
+
+					$brackets_exist = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.$bracket->TableName.' WHERE '.$where_group);
+
+					if($new_id > 0) $new_id = 0;
+					do
+					{
+						$new_id--;
+					} while
+					($this->check_array($this->Application->GetVar($event->getPrefixSpecial(true)), 'PriceId', $new_id));
+
+
+					$infinite_bracket['PriceId'] = $new_id;
+					$infinite_bracket['MinQty'] = ($brackets_exist>0)?$last_bracket['MaxQty']:1;
+					$infinite_bracket['MaxQty'] = '-1';
+					$infinite_bracket['Price'] = '';
+					$infinite_bracket['Cost'] = '';
+					$infinite_bracket['Points'] = '';
+					$infinite_bracket['Negotiated'] = '0';
+					$infinite_bracket['IsPrimary'] = '0';
+					$infinite_bracket['GroupId'] = $group_id;
+					$temp[$new_id]=$infinite_bracket;
+					reset($temp);
+				}
+
+				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
+				$event->CallSubEvent('OnPreSaveBrackets');
+				break;
+
+			case 'OnDeleteBrackets':
+				if ($group_id) {
+					$temp = ''; // delete all pricings from "pr_tang" var
+
+					$sql = 'DELETE FROM ' . $bracket->TableName . '
+							WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND GroupId = ' . $group_id;
+					$this->Conn->Query($sql);
+				}
+				break;
+
+			default:
+		}
+
+		$this->Application->SetVar($event->getPrefixSpecial(true), $temp); // store pr_tang var
+	}
+
+	function OnPreSaveBrackets(kEvent $event)
+	{
+		if( $this->Application->GetVar('pr_tang') ) {
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$product_id = $this->Application->GetVar('p_id');
+			$group_id = $this->Application->getVar('group_id');
+
+			$sql = 'SELECT PriceId
+					FROM ' . $object->TableName . '
+					WHERE ProductId = ' . $product_id . ' ' . ($group_id? 'AND GroupId = ' . $group_id : '');
+			$stored_ids = $this->Conn->GetCol($sql);
+
+			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); // get pr_tang var
+			uasort($items_info, 'pr_bracket_comp');
+
+			foreach ($items_info as $item_id => $field_values) {
+
+				if (in_array($item_id, $stored_ids)) { //if it's already exist
+					$object->Load($item_id);
+					$object->SetFieldsFromHash($field_values);
+					$event->setEventParam('form_data', $field_values);
+
+					if (!$object->Validate()) {
+						unset($stored_ids[array_search($item_id, $stored_ids)]);
+						$event->redirect = false;
+						continue;
+					}
+					if( $object->Update($item_id) ) {
+						$event->status=kEvent::erSUCCESS;
+					}
+					else {
+						$event->status=kEvent::erFAIL;
+						$event->redirect=false;
+						break;
+					}
+					unset($stored_ids[array_search($item_id, $stored_ids)]);
+				}
+				else {
+					$object->Clear(0);
+					$object->SetFieldsFromHash($field_values);
+					$event->setEventParam('form_data', $field_values);
+
+					$object->SetDBField('ProductId', $product_id);
+
+					if( $object->Create() ) {
+						$event->status=kEvent::erSUCCESS;
+					}
+				}
+			}
+
+			// delete
+			foreach ($stored_ids as $stored_id) {
+				$this->Conn->Query('DELETE FROM ' . $object->TableName . ' WHERE PriceId = ' . $stored_id);
+			}
+
+		}
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		/** @var kDBItem $bracket */
+		$bracket = $event->getObject();
+
+		switch ($type) {
+			case 'before':
+				$bracket->SetDBField('ProductId', $this->Application->GetVar('p_id'));
+
+				if ( $bracket->GetDBField('MaxQty') == '&#8734;' || $bracket->GetDBField('MaxQty') == '∞' ) {
+					$bracket->SetDBField('MaxQty', -1);
+				}
+				break;
+		}
+	}
+
+	function OnArrangeBrackets($event, &$temp, &$bracket)
+	{
+		$temp_orig = $temp;
+		reset($temp);
+		if (is_array($temp))
+		{
+			// array to store max values (2nd column)
+			$end_values = Array();
+
+			// get minimal value of Min
+			$first_elem=current($temp);
+			$start = $first_elem['MinQty'];
+			if (!$start){
+				$start = 1;
+			}
+			foreach($temp as $id => $record)
+			{
+
+				/*
+				This 3-ifs logic fixes collision with invalid input values having
+				1 pricing record.
+				The logic is:
+				1) If we got Max less than Min, we set Min to 1 that gives us
+				integrity.
+				2) If we got equal values for Min and Max, we set range 1..Max like
+				in previous. But if Min was 1 and Max was 1 we set full range 1..infinity
+				3) If we got Max = 0 we just set it tom infinity because we can't
+				guess what user meant
+				*/
+
+				if (sizeof($temp) == 1 && $record['MinQty'] > ($record['MaxQty'] == -1 ? $record['MinQty']+1 : $record['MaxQty']) ){
+					$record['MinQty'] = 1;
+					$temp[$id]['MinQty'] = 1;
+					$start = 1;
+				}
+
+				if (sizeof($temp) == 1 && $record['MinQty'] == $record['MaxQty']){
+					if ($record['MaxQty'] == 1){
+						$record['MaxQty'] = -1;
+						$temp[$id]['MaxQty'] = -1;
+					}
+					else {
+						$record['MinQty'] = 1;
+						$temp[$id]['MinQty'] = 1;
+					}
+				}
+
+				if (sizeof($temp) == 1 && $record['MaxQty'] == 0){
+					$record['MaxQty'] = -1;
+					$temp[$id]['MaxQty'] = -1;
+				}
+
+				if(
+				// MAX is less than start
+				($record['MaxQty'] <= $start && $record['MaxQty'] != -1) ||
+				// Max is empty
+				!$record['MaxQty'] ||
+				// Max already defined in $end_values
+				(array_search($record['MaxQty'], $end_values) !== false)
+				) {	// then delete from brackets list
+					unset($temp[$id]);
+				}
+				else {	// this is when ok - add to end_values list
+					$end_values[] = $record['MaxQty'];
+				}
+			}
+
+			// sort brackets by 2nd column (Max values)
+			uasort($temp, 'pr_bracket_comp');
+			reset($temp);
+			$first_item=each($temp);
+			$first_item_key=$first_item['key'];
+
+			$group_id = $this->Application->getVar('group_id');
+
+
+			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
+			if($group_id>0){
+				$where_group=' AND GroupId = '.$group_id.' ';
+			}
+
+			$ids = $this->Conn->GetCol('SELECT PriceId FROM '.$bracket->TableName.' WHERE ProductId='.$this->Application->GetVar('p_id').' '.$where_group);
+			if(is_array($ids)) {
+				usort($ids, 'pr_bracket_id_sort');
+			}
+			$min_id = min( min($ids) - 1, -1 );
+
+
+			foreach($temp as $key => $record)
+			{
+				$temp[$key]['MinQty']=$start;
+				$temp[$key]['IsPrimary']=0;
+				$temp[$key]['GroupId']=$group_id;
+				$start=$temp[$key]['MaxQty'];
+
+			}
+			if ($temp[$first_item_key]['GroupId'] == $default_group) {
+				$temp[$first_item_key]['IsPrimary']=1;
+			}
+
+		}
+		return $temp;
+	}
+
+	/**
+	 * Set's price as primary for product
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSetPrimary($event)
+	{
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$this->StoreSelectedIDs($event);
+		$ids=$this->getSelectedIDs($event);
+		if($ids)
+		{
+			$id = array_shift($ids);
+			$table_info = $object->getLinkedInfo();
+
+			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 0 WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
+			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 1 WHERE ('.$table_info['ForeignKey'].' = '.$table_info['ParentId'].') AND (PriceId = '.$id.')');
+		}
+		$event->SetRedirectParam('opener', 's');
+	}
+
+	/**
+	 * Resets primary mark for other prices of given product, when current pricing is primary
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		if ( $object->GetDBField('IsPrimary') == 1 ) {
+			// make all prices non primary, when this one is
+			$sql = 'UPDATE ' . $object->TableName . '
+					SET IsPrimary = 0
+					WHERE (ProductId = ' . $object->GetDBField('ProductId') . ') AND (' . $object->IDField . ' <> ' . $object->GetID() . ')';
+			$this->Conn->Query($sql);
+		}
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$table_info = $object->getLinkedInfo($event->Special);
+
+		$table_info['ParentId'] = ($table_info['ParentId'] ? $table_info['ParentId'] : 0);
+
+		if ( $object->GetDBField('IsPrimary') == 1 ) {
+			$sql = 'UPDATE ' . $object->TableName . '
+					SET IsPrimary = 0
+					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
+			$this->Conn->Query($sql);
+		}
+		else {
+			$sql = 'SELECT COUNT(*)
+					FROM ' . $object->TableName . '
+					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
+			$prices_qty = $this->Conn->GetOne($sql);
+
+			if ( $prices_qty == 0 ) {
+				$object->SetDBField('IsPrimary', 1);
+			}
+		}
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		if ( $this->Application->isAdminUser ) {
+			return;
+		}
+
+		if ( $this->Application->ConfigValue('Comm_PriceBracketCalculation') == 1 ) {
+			$sql = 'SELECT PrimaryGroupId
+					FROM ' . TABLE_PREFIX . 'Users
+					WHERE PortalUserId = ' . $this->Application->GetVar('u_id');
+			$pricing_group = $this->Conn->GetOne($sql);
+
+			if ( $pricing_group ) {
+				$sql = 'SELECT COUNT(*)
+						FROM ' . TABLE_PREFIX . 'ProductsPricing
+						WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND GroupId = ' . $pricing_group . ' AND Price IS NOT NULL';
+				$pricing_for_group_exists = $this->Conn->GetOne($sql);
+			}
+
+			if ( !$pricing_group || !$pricing_for_group_exists ) {
+				$pricing_group = $this->Application->ConfigValue('User_LoggedInGroup');
+			}
+		}
+		else {
+			$user_groups = $this->Application->RecallVar('UserGroups');
+
+			//$cheapest_group = $this->Conn->GetOne('SELECT GroupId FROM '.$object->TableName.' WHERE ProductId='.$this->Application->GetVar('p_id').' AND Price IS NOT NULL AND GroupId IN ('.$user_groups.') AND MinQty = 1 GROUP BY GroupId ORDER BY Price ASC');
+
+			$sql = 'SELECT PriceId, Price, GroupId
+					FROM ' . $object->TableName . '
+					WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND Price IS NOT NULL AND GroupId IN (' . $user_groups . ')
+					ORDER BY GroupId ASC, MinQty ASC';
+			$effective_brackets = $this->Conn->Query($sql, 'PriceId');
+
+			$group_prices = array ();
+			$min_price = -1;
+			$cheapest_group = 0;
+
+			foreach ($effective_brackets as $bracket) {
+				if ( !isset($group_prices[$bracket['GroupId']]) ) {
+					$group_prices[$bracket['GroupId']] = $bracket['Price'];
+					if ( $bracket['Price'] < $min_price || $min_price == -1 ) {
+						$min_price = $bracket['Price'];
+						$cheapest_group = $bracket['GroupId'];
+					}
+				}
+			}
+
+			if ( !$cheapest_group ) {
+				$cheapest_group = $this->Application->ConfigValue('User_LoggedInGroup');
+			}
+
+			$pricing_group = $cheapest_group;
+		}
+
+		$object->addFilter('price_user_group', $object->TableName . '.GroupId=' . $pricing_group);
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/pricing/pricing_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.22
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/pricing/pricing_config.php
===================================================================
--- releases/5.2.2-B2/units/pricing/pricing_config.php	(revision 0)
+++ releases/5.2.2-B2/units/pricing/pricing_config.php	(revision 16630)
@@ -0,0 +1,142 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'pr',
+	'ItemClass' => Array ('class'=> 'kDBItem', 'file'=> '', 'build_event'=> 'OnItemBuild'),
+	'ListClass' => Array ('class'=> 'kDBList', 'file'=> '', 'build_event'=> 'OnListBuild'),
+	'EventHandlerClass' => Array ('class'=> 'PricingEventHandler', 'file'=> 'pricing_event_handler.php', 'build_event'=> 'OnBuild'),
+	'TagProcessorClass' => Array ('class'=> 'PricingTagProcessor', 'file'=> 'pricing_tag_processor.php', 'build_event'=> 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		// for tangible products: pricings are always aranged before saveing product
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnPreSave'),
+			'DoPrefix' => '',
+			'DoSpecial' => 'tang',
+			'DoEvent' => 'OnArrange',
+		),
+	),
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'Price',
+			'LocalTagName' => 'ProductPrice',
+		),
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'ListPriceBrackets',
+			'LocalTagName' => 'Product_ListPriceBrackets',
+		),
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'HasQuantityPricing',
+			'LocalTagName' => 'Product_HasQuantityPricing',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'StatusField' => Array ('IsPrimary'),
+	'IDField' => 'PriceId',
+	'TableName' => TABLE_PREFIX.'ProductsPricing',
+
+	'ForeignKey' => 'ProductId',
+	'ParentTableKey' => 'ProductId',
+	'ParentPrefix' => 'p',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		''=> '	SELECT *
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('MinQty' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'PriceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'MinQty' => Array ('type' => 'int', 'default' => null),
+		'MaxQty' => Array ('type' => 'int', 'default' => null),
+		'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0),
+		'Price' => Array ('type' => 'float', 'not_null' => 1, 'formatter' => 'kFormatter', 'min_value_inc' => 0, 'format' => '%.2f', 'default' => 0),
+		'Negotiated' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'default' => NULL,
+		),
+		'Points' => Array ('type' => 'int', 'default' => null),
+		'AccessDuration'=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'AccessUnit' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year'), 'not_null' => 1, 'default' => 0,),
+		'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
+
+		/* TODO implement these fields in business logic
+		'AccessRebillDate' => Array (
+			'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0,
+		),
+		'DurationType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				1 => 'la_opt_Interval', 2 => 'la_opt_Date',
+			),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+		),
+		'AccessExpiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter'),
+		*/
+	),
+
+	'Grids' => array(
+		'Access' => array(
+			'Icons' => array(
+				'default' => 'icon16_item.png',
+				'0' => 'icon16_item.png',
+				'1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => array(
+				'AccessDuration' => array('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+				'AccessUnit' => array('title' => 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
+				'Description' => array('filter_block' => 'grid_like_filter'),
+				'Price' => array('filter_block' => 'grid_range_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/pricing/pricing_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.20.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/pricing/globals.php
===================================================================
--- releases/5.2.2-B2/units/pricing/globals.php	(revision 0)
+++ releases/5.2.2-B2/units/pricing/globals.php	(revision 16630)
@@ -0,0 +1,71 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	function pr_bracket_comp($elem1, $elem2)
+	{
+
+		if ($elem1['MinQty']!="" && $elem1['MaxQty']=="" && $elem2['MinQty']!="" && $elem2['MaxQty']!="")	return 1;
+		if ($elem1['MinQty']!="" && $elem1['MaxQty']=="" && $elem2['MinQty']=="" && $elem2['MaxQty']=="")	return -1;
+
+
+		if ($elem1['MaxQty']=="" && $elem2['MaxQty']!="")	return 1;
+		if ($elem1['MaxQty']!="" && $elem2['MaxQty']=="")	return -1;
+
+
+		if( ($elem1['MaxQty']>$elem2['MaxQty'] && $elem2['MaxQty']!=-1) || ($elem1['MaxQty'] == -1 && $elem2['MaxQty'] != -1 ))
+		{
+			return 1;
+		}
+		elseif ( ($elem1['MaxQty']<$elem2['MaxQty']) || ($elem2['MaxQty'] == -1 && $elem1['MaxQty'] != -1 ))
+		{
+			return -1;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	function pr_bracket_id_sort($first_id, $second_id)
+	{
+		$first_abs = abs($first_id);
+		$second_abs = abs($second_id);
+		$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
+		$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
+		if($first_sign != $second_sign)
+		{
+			if($first_id > $second_id) {
+				$bigger =& $first_abs;
+				$smaller =& $second_abs;
+			}
+			else {
+				$bigger =& $second_abs;
+				$smaller =& $first_abs;
+			}
+			$smaller = $bigger + $smaller;
+		}
+
+		if($first_abs > $second_abs) {
+			return 1;
+		}
+		elseif ($first_abs < $second_abs)
+		{
+			return -1;
+		}
+		else
+		{
+			return 0;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/pricing/globals.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/pricing/pricing_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/pricing/pricing_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/pricing/pricing_tag_processor.php	(revision 16630)
@@ -0,0 +1,166 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class PricingTagProcessor extends kDBTagProcessor {
+
+	function ProductPrice($params)
+	{
+		$object = $this->Application->recallObject($params['PrefixSpecial']);
+		$price = $object->GetField('Price');
+
+		// display selected currency by default
+		if (!isset($params['currency']) || $params['currency'] == 'selected') {
+			$iso = $this->Application->RecallVar('curr_iso');
+		}
+		elseif ($params['currency'] == 'primary') {
+			$iso = 'USD';
+		}
+		else { //explicit currency
+			$iso = $params['currency'];
+		}
+
+		// convert primary currency to selected (if they are the same, converter will just return)
+
+		/** @var CurrencyRates $converter */
+		$converter = $this->Application->recallObject('CurrencyRates');
+
+		$price = $converter->Convert($price, 'PRIMARY', $iso);
+
+		$currency = $this->Application->recallObject('curr.-'.$iso, null, Array('skip_autoload' => true));
+		if( !$currency->isLoaded() ) $currency->Load($iso, 'ISO');
+
+		$symbol = $currency->GetDBField('Symbol');
+		if (!$symbol) $symbol = $currency->GetDBField('ISO');
+		$formatted = '';
+		if ($currency->GetDBField('SymbolPosition') == 0) {
+			$formatted .= $symbol;
+		}
+		$formatted .= $price;
+		if ($currency->GetDBField('SymbolPosition') == 1) {
+			$formatted .= $symbol;
+		}
+
+		return $formatted;
+	}
+
+	function Product_ListPriceBrackets($params)
+	{
+		return $this->PrintList2($params);
+	}
+
+	function Field($params)
+	{
+		$field = $this->SelectParam($params, 'name,field');
+		$value = parent::Field($params);
+		if (($field == 'MaxQty') && ($value == -1)) {
+			$value = '&infin;';
+		}
+		return $value;
+	}
+
+	function Product_HasQuantityPricing($params)
+	{
+		return (int)$this->TotalRecords($params) > 1;
+	}
+
+
+	function ShowPricingForm($params)
+	{
+		$br_object = $this->getObject( Array('skip_autoload' => true) );
+
+		$br_data = $this->Application->GetVar("pr_tang");
+
+		$group_id = $this->Application->getVar('group_id');
+		if($group_id>0){
+			$where_group=' AND GroupId = '.$group_id.' ';
+		}
+
+		if(!$br_data)
+		{
+			$sql = 	'SELECT * FROM '.$br_object->TableName.' WHERE ProductId = '.$this->Application->GetVar('p_id').' '.$where_group;
+			$brackets = $this->Conn->Query($sql, 'PriceId');
+
+			usort($brackets, 'pr_bracket_comp');
+
+			/** @var kDBItem $dummy */
+			$dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
+
+			foreach($brackets as $id => $values)
+			{
+				foreach($values as $value_key=>$value_val){
+					$dummy->SetDBField($value_key, $value_val);
+					$brackets[$id][$value_key] = $dummy->GetField($value_key);
+				}
+			}
+
+			$br_data=$brackets;
+			$this->Application->SetVar($this->getPrefixSpecial(true), $brackets);
+		}
+		else
+		{
+			usort($br_data , 'pr_bracket_comp');
+
+		}
+
+		$ret = '';
+		if( is_array($br_data) )
+		{
+
+			$block_params=$this->prepareTagParams($params);
+			$block_params['IdField']='PriceId';
+			$block_params['name'] = $params['block'];
+			$first = true;
+
+			// this is needed to find next id
+			$br_data_copy=$br_data;
+			foreach($br_data as $id => $values)
+			{
+
+				foreach($values as $value_key=>$value_val){
+					$block_params[$value_key] = $value_val;
+				}
+				reset($values);
+
+				next($br_data_copy);
+				$next_bracket=current($br_data_copy);
+
+				$block_params['id']	= $values["PriceId"];
+				$block_params['min']	= ($id == -1) ? ($values['MinQty'] ? $values['MinQty'] : 0) : $values['MinQty'];
+				$block_params['max'] = ($values['MaxQty'] == -1) ? '&infin;' : $values['MaxQty'];
+				$block_params['next_min_id']=$next_bracket['PriceId'];
+
+				if ($first)
+				{
+					$block_params['first'] = 1;
+					$first = false;
+				}
+				else
+				{
+					$block_params['first'] = 0;
+				}
+				$ret .= $this->Application->ParseBlock($block_params, 1);
+			}
+		}
+		return $ret;
+	}
+
+	function AddToCartLink($params)
+	{
+		$value = $this->Field(array('name'=>'PriceId'));
+		//$this->Application->SetVar('p_id', $this->Application->GetVar($this->getPrefixSpecial().'_id'));
+		$this->Application->SetVar('pr_id', $value);
+		return $this->Application->HREF($params['template'], '', Array('pass' => 'm,p,pr,ord', 'ord_event' => 'OnAddToCart'));
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/pricing/pricing_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/reports/reports_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/reports/reports_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/reports/reports_event_handler.php	(revision 16630)
@@ -0,0 +1,848 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ReportsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			// user can view any form on front-end
+			'OnRunReport' => Array ('self' => 'view'),
+			'OnUpdateConfig' => Array ('self' => 'view'),
+			'OnChangeStatistics' => Array ('self' => 'view'),
+			'OnPieChart' => Array ('self' => 'view'),
+			'OnPrintChart' => Array ('self' => 'view'),
+			'OnExportReport' => Array ('self' => 'view'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	function OnRunReport(kEvent $event)
+	{
+		$this->Application->LinkVar('reports_finish_t');
+		$progress_t = $this->Application->GetVar('progress_t');
+		$event->redirect = $progress_t;
+
+		$field_values = $this->getSubmittedFields($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$object->SetFieldsFromHash($field_values);
+		$event->setEventParam('form_data', $field_values);
+
+		$object->UpdateFormattersMasterFields();
+
+		$field_values['offset'] = 0;
+		$table_name = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_SaleReport';
+		$field_values['table_name'] = $table_name;
+		$this->Conn->Query('DROP TABLE IF EXISTS '.$table_name);
+
+		$filter_value = '';
+		$from = $object->GetDBField('FromDateTime');
+		$to = $object->GetDBField('ToDateTime');
+
+		$day_seconds = 23 * 60 * 60 + 59 * 60 + 59;
+		if ($from && !$to) {
+			$to = $from + $day_seconds;
+		}
+		elseif (!$from && $to) {
+			$from = $to - $day_seconds;
+		}
+
+		if ($from && $to) {
+			$filter_value = 'AND o.OrderDate >= '.$from.' AND o.OrderDate <= '.$to;
+		}
+
+		$ebay_table_fields = '';
+		$ebay_joins = '';
+		$ebay_query_fields = '';
+
+		$user_id = $this->Application->RecallVar('user_id');
+		$sql = 'DELETE FROM '.TABLE_PREFIX.'UserPersistentSessionData
+			WHERE
+				PortalUserId = "'.$user_id.'"
+				AND VariableName LIKE \'rep_columns_%\'';
+		$this->Conn->Query($sql);
+
+		if ($this->Application->isModuleEnabled('in-auction'))
+		{
+			if (in_array($field_values['ReportType'], Array(1,5)))  // not overall.
+			{
+				$ebay_table_fields = ',
+					StoreQty int(11) NOT NULL DEFAULT 0,
+					eBayQty int(11) NOT NULL DEFAULT 0,
+					StoreAmount double(10,4) NOT NULL DEFAULT 0,
+					eBayAmount double(10,4) NOT NULL DEFAULT 0,
+					StoreProfit double(10,4) NOT NULL DEFAULT 0,
+					eBayProfit double(10,4) NOT NULL DEFAULT 0';
+
+				$ebay_joins = '
+					LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
+					ON od.OptionsSalt = eod.OptionsSalt
+				';
+
+				$ebay_query_fields = ',
+					SUM(IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)) as StoreQty,
+					SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)) as eBayQty,
+					SUM(IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)) as StoreAmount,
+					SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)) as eBayAmount,
+					SUM(IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)) as StoreProfit,
+					SUM(IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)) as eBayProfit
+				';
+			}
+
+		}
+
+		if ($field_values['ReportType'] == 1) { // by Category
+			$q = 'CREATE TABLE '.$table_name.' (
+							CategoryId int(11) NOT NULL DEFAULT 0,
+							Qty int(11) NOT NULL DEFAULT 0,
+							Cost double(10,4) NOT NULL DEFAULT 0,
+							Amount double(10,4) NOT NULL DEFAULT 0,
+							Tax double(10,4) NOT NULL DEFAULT 0,
+							Shipping double(10,4) NOT NULL DEFAULT 0,
+							Processing double(10,4) NOT NULL DEFAULT 0,
+							Profit double(10,4) NOT NULL DEFAULT 0
+							'.$ebay_table_fields.'
+						)';
+			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
+			$this->Conn->Query($q);
+
+			$q = 'INSERT INTO '.$field_values['table_name'].'
+						SELECT
+							c.CategoryId,
+							SUM(od.Quantity) as Qty,
+							SUM(od.Cost * od.Quantity) as Cost,
+							SUM(od.Price * od.Quantity) as SaleAmount,
+							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
+							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
+							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
+							SUM((od.Price - od.Cost) * od.Quantity) as Profit'
+							.$ebay_query_fields.'
+						FROM '.TABLE_PREFIX.'Orders AS o
+						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+						ON od.OrderId = o.OrderId
+						LEFT JOIN '.TABLE_PREFIX.'Products AS p
+						ON p.ProductId = od.ProductId
+						LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
+						ON ci.ItemResourceId = p.ResourceId
+						LEFT JOIN '.TABLE_PREFIX.'Categories AS c
+						ON c.CategoryId = ci.CategoryId
+						'.$ebay_joins.'
+						WHERE
+							o.Status IN (4,6)
+							AND
+							ci.PrimaryCat = 1
+							'.$filter_value.'
+						GROUP BY c.CategoryId
+						HAVING NOT ISNULL(CategoryId)
+						';
+			$this->Conn->Query($q);
+		}
+		elseif ($field_values['ReportType'] == 2) { // by User
+			$q = 'CREATE TABLE '.$table_name.' (
+							PortalUserId int(11) NOT NULL DEFAULT 0,
+							Qty int(11) NOT NULL DEFAULT 0,
+							Cost double(10,4) NOT NULL DEFAULT 0,
+							Amount double(10,4) NOT NULL DEFAULT 0,
+							Tax double(10,4) NOT NULL DEFAULT 0,
+							Shipping double(10,4) NOT NULL DEFAULT 0,
+							Processing double(10,4) NOT NULL DEFAULT 0,
+							Profit double(10,4) NOT NULL DEFAULT 0
+						)';
+			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Categories');
+			$this->Conn->Query($q);
+
+			$q = 'INSERT INTO '.$field_values['table_name'].'
+						SELECT
+							u.PortalUserId,
+							SUM(od.Quantity) as Qty,
+							SUM(od.Cost * od.Quantity) as Cost,
+							SUM(od.Price * od.Quantity) as SaleAmount,
+							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
+							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
+							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
+							SUM((od.Price - od.Cost) * od.Quantity) as Profit
+						FROM '.TABLE_PREFIX.'Orders AS o
+						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+						ON od.OrderId = o.OrderId
+						LEFT JOIN '.TABLE_PREFIX.'Users AS u
+						ON u.PortalUserId = o.PortalUserId
+						WHERE
+							o.Status IN (4,6)
+							'.$filter_value.'
+						GROUP BY u.PortalUserId
+						HAVING NOT ISNULL(PortalUserId)
+						';
+			$this->Conn->Query($q);
+		}
+		elseif ($field_values['ReportType'] == 5) { // by Product
+			$q = 'CREATE TABLE '.$table_name.' (
+							ProductId int(11) NOT NULL DEFAULT 0,
+							Qty int(11) NOT NULL DEFAULT 0,
+							Cost double(10,4) NOT NULL DEFAULT 0,
+							Amount double(10,4) NOT NULL DEFAULT 0,
+							Tax double(10,4) NOT NULL DEFAULT 0,
+							Shipping double(10,4) NOT NULL DEFAULT 0,
+							Processing double(10,4) NOT NULL DEFAULT 0,
+							Profit double(10,4) NOT NULL DEFAULT 0'
+							.$ebay_table_fields.'
+						)';
+			$field_values['total'] = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Products');
+			$this->Conn->Query($q);
+
+			$q = 'INSERT INTO '.$field_values['table_name'].'
+						SELECT
+							p.ProductId,
+							SUM(od.Quantity) as Qty,
+							SUM(od.Cost * od.Quantity) as Cost,
+							SUM(od.Price * od.Quantity) as SaleAmount,
+							SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
+							SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
+							SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
+							SUM((od.Price - od.Cost)  * od.Quantity) as Profit'
+							.$ebay_query_fields.'
+						FROM '.TABLE_PREFIX.'Orders AS o
+						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+						ON od.OrderId = o.OrderId
+						LEFT JOIN '.TABLE_PREFIX.'Products AS p
+						ON p.ProductId = od.ProductId
+						'.$ebay_joins.'
+						WHERE
+							o.Status IN (4,6)
+							'.$filter_value.'
+						GROUP BY p.ProductId
+						HAVING NOT ISNULL(ProductId)
+						';
+			$this->Conn->Query($q);
+		}
+		elseif ($field_values['ReportType'] == 12) { // Overall
+			$q = 'CREATE TABLE '.$table_name.' (
+							Marketplace tinyint(1) NOT NULL DEFAULT 0,
+							Qty int(11) NOT NULL DEFAULT 0,
+							Cost double(10,4) NOT NULL DEFAULT 0,
+							Amount double(10,4) NOT NULL DEFAULT 0,
+							Tax double(10,4) NOT NULL DEFAULT 0,
+							Shipping double(10,4) NOT NULL DEFAULT 0,
+							Processing double(10,4) NOT NULL DEFAULT 0,
+							Profit double(10,4) NOT NULL DEFAULT 0
+						)';
+			$this->Conn->Query($q);
+
+			if ($this->Application->isModuleEnabled('in-auction'))
+			{
+				$field_values['total'] = 2;
+
+				$q = 'INSERT INTO '.$field_values['table_name'].'
+							SELECT
+								1 AS Marketplace,
+								SUM(IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)) as Qty,
+								SUM(IF(ISNULL(eod.OptionsSalt), od.Cost * od.Quantity, 0)) as Cost,
+								SUM(IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)) as SaleAmount,
+								SUM(IF(ISNULL(eod.OptionsSalt), o.VAT * od.Price * od.Quantity / o.SubTotal, 0)) as Tax,
+								SUM(IF(ISNULL(eod.OptionsSalt), o.ShippingCost * od.Price * od.Quantity / o.SubTotal, 0)) as Shipping,
+								SUM(IF(ISNULL(eod.OptionsSalt), o.ProcessingFee * od.Price * od.Quantity / o.SubTotal, 0)) as Processing,
+								SUM(IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost)  * od.Quantity, 0)) as Profit
+							FROM '.TABLE_PREFIX.'Orders AS o
+							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+							ON od.OrderId = o.OrderId
+							LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
+							ON od.OptionsSalt = eod.OptionsSalt
+							WHERE
+								o.Status IN (4,6)
+								'.$filter_value;
+				$this->Conn->Query($q);
+
+
+				$q = 'INSERT INTO '.$field_values['table_name'].'
+							SELECT
+								2 AS Marketplace,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)) as Qty,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Cost * od.Quantity)) as Cost,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)) as SaleAmount,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.VAT * od.Price * od.Quantity / o.SubTotal)) as Tax,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.ShippingCost * od.Price * od.Quantity / o.SubTotal)) as Shipping,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, o.ProcessingFee * od.Price * od.Quantity / o.SubTotal)) as Processing,
+								SUM(IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost)  * od.Quantity)) as Profit
+							FROM '.TABLE_PREFIX.'Orders AS o
+							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+							ON od.OrderId = o.OrderId
+							LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
+							ON od.OptionsSalt = eod.OptionsSalt
+							WHERE
+								o.Status IN (4,6)
+								'.$filter_value;
+				$this->Conn->Query($q);
+			} else {
+				$field_values['total'] = 1;
+				$q = 'INSERT INTO '.$field_values['table_name'].'
+							SELECT
+								1 AS Marketplace,
+								SUM(od.Quantity) as Qty,
+								SUM(od.Cost * od.Quantity) as Cost,
+								SUM(od.Price * od.Quantity) as SaleAmount,
+								SUM(o.VAT * od.Price * od.Quantity / o.SubTotal) as Tax,
+								SUM(o.ShippingCost * od.Price * od.Quantity / o.SubTotal) as Shipping,
+								SUM(o.ProcessingFee * od.Price * od.Quantity / o.SubTotal) as Processing,
+								SUM((od.Price - od.Cost)  * od.Quantity) as Profit
+							FROM '.TABLE_PREFIX.'Orders AS o
+							LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+							ON od.OrderId = o.OrderId
+							WHERE
+								o.Status IN (4,6)
+								'.$filter_value;
+				$this->Conn->Query($q);
+
+			}
+		}
+
+		$vars = array('rep_Page', 'rep_Sort1', 'rep_Sort1_Dir', 'rep_Sort2', 'rep_Sort2_Dir');
+		foreach ($vars as $var_name) {
+			$this->Application->RemoveVar($var_name);
+		}
+
+		//temporary
+		$event->redirect = $this->Application->GetVar('reports_finish_t');
+
+		$field_values['from'] = $from;
+		$field_values['to'] = $to;
+
+		$this->Application->StoreVar('report_options', serialize($field_values));
+	}
+
+	function OnUpdateConfig($event)
+	{
+		$report = $this->Application->RecallVar('report_options');
+		if (!$report) {
+			return ;
+		}
+
+		$field_values = unserialize($report);
+
+		$rep_options = $this->Application->getUnitOptions('rep');
+		$new_options = Array ();
+
+		$new_options['TableName'] = $field_values['table_name'];
+
+		$new_options['Fields'] = Array (
+			'Qty' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
+			'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+			'Amount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+			'Tax' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+			'Shipping' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+			'Processing' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+			'Profit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+		);
+
+		if ( $this->Application->isModuleEnabled('in-auction') ) {
+			if ( in_Array ($field_values['ReportType'], Array (1, 5)) ) {
+				$new_options['Fields'] += Array (
+					'StoreQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
+					'StoreAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+					'StoreProfit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+					'eBayQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'default' => 0, 'totals' => 'sum'),
+					'eBayAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+					'eBayProfit' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0, 'totals' => 'sum'),
+				);
+			}
+		}
+
+		if ($field_values['ReportType'] == 1) { // by Category
+
+			$new_options['ListSQLs'][''] =
+				'SELECT %1$s.* %2$s FROM %1$s
+				 LEFT JOIN '.TABLE_PREFIX.'Categories AS c
+				 ON c.CategoryId = %1$s.CategoryId';
+			$new_options['Grids']['Default'] = Array (
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					'module' => 'core',
+				),
+				'Fields' => Array (
+					'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+				),
+
+			);
+
+			if (!$this->Application->isModuleEnabled('in-auction')) {
+				$a_fields =& $new_options['Grids']['Default']['Fields'];
+				unset($a_fields['StoreQty']);
+				unset($a_fields['eBayQty']);
+				unset($a_fields['StoreAmount']);
+				unset($a_fields['eBayAmount']);
+				unset($a_fields['StoreProfit']);
+				unset($a_fields['eBayProfit']);
+			}
+
+			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
+				'CategoryName' => Array ('type' => 'string', 'default' => ''),
+	            'Metric' => Array (
+	            	'type' => 'int',
+	            	'formatter' => 'kOptionsFormatter',
+	            	'options' => $this->GetMetricOptions($new_options, 'CategoryName'),
+	            	'use_phrases' => 1,
+	            	'default' => 0,
+	            ),
+			));
+
+			$lang = $this->Application->GetVar('m_lang');
+
+			// products root category
+			$products_category_id = $this->Application->findModule('Name', 'In-Commerce', 'RootCat');
+			// get root category name
+			$sql = 'SELECT LENGTH(l' . $lang . '_CachedNavbar)
+					FROM ' . TABLE_PREFIX . 'Categories
+					WHERE CategoryId = '.$products_category_id;
+			$root_length = $this->Conn->GetOne($sql) + 4;
+
+			$new_options['CalculatedFields'][''] = array(
+				'CategoryName' => 'REPLACE(SUBSTR(c.l'.$lang.'_CachedNavbar, '.$root_length.'), "&|&", " > ")',
+			);
+		}
+		elseif ($field_values['ReportType'] == 2) { // by User
+			$new_options['ListSQLs'][''] =
+				'SELECT %1$s.* %2$s FROM %1$s
+				 LEFT JOIN '.TABLE_PREFIX.'Users AS u
+				 ON u.PortalUserId = %1$s.PortalUserId';
+
+			$new_options['Grids']['Default'] = Array (
+				'Icons' => Array (
+								'default' => 'icon16_item.png',
+								'module' => 'core',
+							),
+				'Fields' => Array (
+					'Login' => Array ('filter_block' => 'grid_like_filter'),
+					'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+					'LastName' => Array ('filter_block' => 'grid_like_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+				),
+			);
+
+			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
+				'Login' => Array ('type' => 'string', 'default' => ''),
+				'FirstName' => Array ('type' => 'string', 'default' => ''),
+				'LastName' => Array ('type' => 'string', 'default' => ''),
+			));
+
+			$new_options['CalculatedFields'][''] = Array (
+				'Login' => 'u.Username',
+				'FirstName' => 'u.FirstName',
+				'LastName' => 'u.LastName',
+			);
+		}
+		elseif ($field_values['ReportType'] == 5) { // by Product
+
+			$new_options['ListSQLs'][''] =
+				'SELECT %1$s.* %2$s FROM %1$s
+				 LEFT JOIN '.TABLE_PREFIX.'Products AS p
+				 ON p.ProductId = %1$s.ProductId';
+
+			$new_options['Grids']['Default'] = Array (
+				'Icons' => Array (
+					'default' => 'icon16_item.png',
+					'module' => 'core',
+					),
+				'Fields' => Array (
+					'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'),
+					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+				),
+
+			);
+
+			if (!$this->Application->isModuleEnabled('in-auction'))
+			{
+				$a_fields =& $new_options['Grids']['Default']['Fields'];
+				unset($a_fields['StoreQty']);
+				unset($a_fields['eBayQty']);
+				unset($a_fields['StoreAmount']);
+				unset($a_fields['eBayAmount']);
+				unset($a_fields['StoreProfit']);
+				unset($a_fields['eBayProfit']);
+			}
+
+
+			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], Array (
+				'ProductName' => Array ('type' => 'string', 'default' => ''),
+	            'Metric' => Array (
+	            	'type' => 'int',
+	            	'formatter' => 'kOptionsFormatter',
+	            	'options' => $this->GetMetricOptions($new_options, 'ProductName'),
+	            	'use_phrases' => 1,
+	            	'default' => 0
+	            ),
+			));
+
+			$lang = $this->Application->GetVar('m_lang');
+
+			$new_options['CalculatedFields'][''] = Array (
+				'ProductName' => 'p.l'.$lang.'_Name',
+			);
+		}
+		elseif ($field_values['ReportType'] == 12) { // Overall
+
+			$new_options['ListSQLs'][''] =
+				'SELECT %1$s.* %2$s FROM %1$s';
+
+			$new_options['Fields']['Marketplace'] = Array (
+				'formatter' => 'kOptionsFormatter',
+				'options' => Array (
+					1 => 'la_OnlineStore',
+					2 => 'la_eBayMarketplace',
+				),
+				'use_phrases' => 1,
+				'default' => 1
+			);
+
+			$new_options['Grids']['Default'] = Array(
+				'Icons' => Array(
+					'default' => 'icon16_item.png',
+					'module' => 'core',
+				),
+				'Fields' => Array(
+					'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+				),
+
+			);
+
+
+			$new_options['VirtualFields'] = array_merge($rep_options['VirtualFields'], array(
+	            'Metric' => Array (
+	            	'type' => 'int',
+	            	'formatter' => 'kOptionsFormatter',
+	            	'options' => $this->GetMetricOptions($new_options, 'Marketplace'),
+	            	'use_phrases' => 1,
+	            	'default' => 0
+	            ),
+			));
+
+			$lang = $this->Application->GetVar('m_lang');
+
+		}
+
+		$new_options['ListSortings'] = Array(
+			'' => Array(
+				'Sorting' => Array('Amount' => 'desc'),
+			)
+		);
+
+		foreach ($new_options as $key => $val) {
+			$this->Application->setUnitOption('rep', $key, $val);
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kdbItem $object
+	 * @param string $search_field
+	 * @param string $value
+	 * @param string $type
+	 */
+	function processRangeField(&$object, $search_field, $type)
+	{
+		$value = $object->GetField($search_field);
+		if (!$value) return false;
+
+		$lang_current = $this->Application->recallObject('lang.current');
+		$dt_separator = getArrayValue($object->GetFieldOptions($search_field), 'date_time_separator');
+		if (!$dt_separator) {
+			$dt_separator = ' ';
+		}
+
+		$time = ($type == 'from') ? adodb_mktime(0, 0, 0) : adodb_mktime(23, 59, 59);
+		$time = adodb_date($lang_current->GetDBField('InputTimeFormat'), $time);
+
+		$full_value = $value.$dt_separator.$time;
+
+		$formatter = $this->Application->recallObject( $object->GetFieldOption($search_field, 'formatter') );
+
+		$value_ts = $formatter->Parse($full_value, $search_field, $object);
+
+		if ( $object->GetErrorPseudo($search_field) ) {
+			// invalid format -> ignore this date in search
+			$object->RemoveError($search_field);
+
+			return false;
+		}
+		return $value_ts;
+	}
+
+	/**
+	 * Generate Metric Field Options
+	 *
+	 * @param array $a_config_options
+	 * @param string $exclude_field
+	 */
+	function GetMetricOptions(&$a_config_options, $exclude_field)
+	{
+		$a_ret = Array();
+		foreach ($a_config_options['Grids']['Default']['Fields'] AS $field => $a_options)
+		{
+			if ($field == $exclude_field)
+			{
+				continue;
+			}
+			$a_ret[$field] = $a_options['title'];
+		}
+		return $a_ret;
+	}
+
+	function OnChangeStatistics($event)
+	{
+		$this->Application->StoreVar('ChartMetric', $this->Application->GetVar('metric'));
+	}
+
+	function OnPieChart($event)
+	{
+
+		$ChartHelper = $this->Application->recallObject('ChartHelper');
+
+		$this->Application->setContentType('image/png');
+
+		$width = $event->getEventParam('width');
+		if (!$width) {
+			$width = 800;
+		}
+
+		$height = $event->getEventParam('height');
+		if (!$height) {
+			$height = 600;
+		}
+
+		$a_data = unserialize($this->Application->RecallVar('graph_data'));
+		$chart = new LibchartPieChart($width, $height);
+
+		$dataSet = new LibchartXYDataSet();
+		foreach ($a_data AS $key=>$a_values)
+		{
+			$dataSet->addPoint(new LibchartPoint($a_values['Name'], $a_values['Metric']));
+//			$dataSet->addPoint(new LibchartPoint($a_values['Name'].' ('.$a_values['Metric'].')', $a_values['Metric']));
+		}
+
+		$chart->setDataSet($dataSet);
+
+		$chart->setTitle($this->Application->RecallVar('graph_metric'));
+		$chart->render();
+		$event->status = kEvent::erSTOP;
+	}
+
+	/** Generates png-chart output
+	 *
+	 * @param kEvent $event
+	 */
+
+	function OnPrintChart($event)
+	{
+		$ChartHelper = $this->Application->recallObject('ChartHelper');
+
+		$this->Application->setContentType('image/png');
+
+		$width = $this->Application->GetVar('width');
+		if ($width == 0)
+		{
+			$width = 800;
+		}
+
+		$height = $this->Application->GetVar('height');
+		if ($height == 0)
+		{
+			$height = 400;
+		}
+
+		$chart = new LibchartLineChart($width, $height);
+
+		$a_labels = unserialize($this->Application->RecallVar('graph_labels'));
+
+		if ($this->Application->isModuleEnabled('in-auction'))
+		{
+			$serie1 = new LibchartXYDataSet();
+			$a_serie = unserialize($this->Application->RecallVar('graph_serie1'));
+			foreach ($a_labels AS $key=>$value)
+			{
+				$serie1->addPoint(new LibchartPoint($value, $a_serie[$key]));
+			}
+		}
+
+		$serie2 = new LibchartXYDataSet();
+		$a_serie = unserialize($this->Application->RecallVar('graph_serie2'));
+		foreach ($a_labels AS $key=>$value)
+		{
+			$serie2->addPoint(new LibchartPoint($value, $a_serie[$key]));
+		}
+
+		$dataSet = new LibchartXYSeriesDataSet();
+		if ($this->Application->isModuleEnabled('in-auction'))
+		{
+			$dataSet->addSerie($this->Application->RecallVar('graph_serie1_label'), $serie1);
+		}
+
+		$dataSet->addSerie($this->Application->RecallVar('graph_serie2_label'), $serie2);
+
+		$chart->setDataSet($dataSet);
+
+		$chart->setTitle($this->Application->RecallVar('graph_metric'));
+		$Plot =& $chart->getPlot();
+		$Plot->setGraphCaptionRatio(0.7);
+		$chart->render();
+
+		$event->status = kEvent::erSTOP;
+
+	}
+
+	function OnExportReport($event)
+	{
+		/** @var kDBList $report */
+		$report = $this->Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) );
+
+		/** @var kDBItem $ReportItem */
+		$ReportItem = $this->Application->recallObject('rep.item', 'rep', Array('skip_autoload' => true));
+
+ 		$a_grids = $this->Application->getUnitOption('rep', 'Grids');
+ 		$a_fields = $a_grids['Default']['Fields'];
+		$ret = '';
+
+		foreach ($a_fields AS $field => $a_props)
+		{
+			$ret .= '<commas>'.$field.'<commas><tab>';
+		}
+
+		$ret = substr($ret, 0, strlen($ret) - 5).'<cr>';
+
+
+		$report->Query(true);
+		$report->GoFirst();
+
+		$counter = 0;
+		$a_totals = Array();
+
+		foreach ($a_fields AS $field => $a_props) {
+			$counter++;
+			if ($counter == 1)
+			{
+				continue;
+			}
+			$a_totals[$field] = 0;
+		}
+
+		foreach($report->Records as $a_row) {
+			// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
+			$ReportItem->SetFieldsFromHash($a_row);
+			$row = '';
+			foreach ($a_fields AS $field => $a_props)
+			{
+				$row .= '<commas>'.$ReportItem->GetField($field).'<commas><tab>';
+				$a_totals[$field] += $a_row[$field];
+			}
+			$ret .= substr($row, 0, strlen($row) - 5).'<cr>';
+		}
+
+		// totals
+		// TODO: maybe this should be SetDBFieldsFromHash instead, because all data comes from inside.
+		$ReportItem->SetFieldsFromHash($a_totals);
+		$counter = 0;
+		foreach ($a_fields AS $field => $a_props)
+		{
+			$counter++;
+			if ($counter == 1)
+			{
+				$row = '<commas><commas><tab>';
+				continue;
+			}
+			$row .= '<commas>'.$ReportItem->GetField($field).'<commas><tab>';
+		}
+		$ret .= substr($row, 0, strlen($row) - 5).'<cr>';
+
+		$ret = str_replace("\r",'', $ret);
+		$ret = str_replace("\n",'', $ret);
+		$ret = str_replace('"','\'\'', $ret);
+
+		$ret = str_replace('<commas>','"', $ret);
+		$ret = str_replace('<tab>',',', $ret);
+		$ret = str_replace('<cr>',"\r", $ret);
+
+		$report_options = unserialize($this->Application->RecallVar('report_options'));
+
+		switch ($report_options['ReportType'])
+		{
+			case 1:
+				$file_name = '-ByCategory';
+				break;
+			case 2:
+				$file_name = '-ByUser';
+				break;
+			case 5:
+				$file_name = '-ByProduct';
+				break;
+			case 12:
+				$file_name = '';
+				break;
+		}
+
+		header("Content-type: application/txt");
+		header("Content-length: ".(string)strlen($ret));
+		header("Content-Disposition: attachment; filename=\"".html_entity_decode('SalesReport'.$file_name.'-'.date('d-M-Y').'.csv')."\"");
+		header("Pragma: no-cache"); //some IE-fixing stuff
+		echo $ret;
+		exit();
+	}
+}

Property changes on: releases/5.2.2-B2/units/reports/reports_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/reports/reports_config.php
===================================================================
--- releases/5.2.2-B2/units/reports/reports_config.php	(revision 0)
+++ releases/5.2.2-B2/units/reports/reports_config.php	(revision 16630)
@@ -0,0 +1,132 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'rep',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ReportsEventHandler', 'file' => 'reports_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ReportsTagProcessor', 'file' => 'reports_tag_processor.php', 'build_event' => 'OnBuild'),
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'rep',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnUpdateConfig',
+		),
+	),
+
+	'IDField' => 'CategoryId',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('d' => '!la_title_Adding_Discount!'),
+			'edit_status_labels' => Array ('d' => '!la_title_Editing_Discount!'),
+			'new_titlefield' => Array ('d' => '!la_title_New_Discount!'),
+		),
+
+		'report_options' =>Array ('format' => "!la_title_ReportOptions!"),
+		'report_results' =>Array ('format' => "!la_title_ReportResults!"),
+		'report_chart' =>Array ('format' => "!la_title_SalesReportChart!"),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:reports'),
+
+	'Sections' => Array (
+		'in-commerce:reports' => Array (
+			'parent' => 'in-commerce',
+			'icon' => 'in-commerce:sales_report',
+			'label' => 'la_tab_SaleReports',
+			'url' => Array ('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event' => 'OnNew'),
+			'permissions' => Array ('view', 'add'),
+			'priority' => 2,
+			'type' => stTREE,
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'CategoryId' => '0',
+		),
+	),
+
+	'VirtualFields' => Array (
+		'ReportType' => array('formatter' => 'kOptionsFormatter', 'options' =>array(
+				12 => 'la_Overall',
+				1 => 'la_ByCategory',
+				2 => 'la_ByUser',
+				5 => 'la_byProduct'
+			),
+			'use_phrases' => 1, 'default' => 12,
+		),
+		'FromDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
+		'ToDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
+		'Recursive' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+		),
+		'SkipEmpty' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+		),
+		'CategoryId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'Name' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+				'Start' => Array ('filter_block' => 'grid_date_range_filter'),
+				'End' => Array ('filter_block' => 'grid_date_range_filter'),
+				'GroupId' => Array ( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'),
+				'Type' => Array ('filter_block' => 'grid_options_filter'),
+				'Amount' => Array ('filter_block' => 'grid_range_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/reports/reports_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/reports/reports_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/reports/reports_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/reports/reports_tag_processor.php	(revision 16630)
@@ -0,0 +1,438 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ReportsTagProcessor extends kDBTagProcessor {
+
+	function ReportStatus($params)
+	{
+		$field_values = $this->CalcReport($params);
+
+		if ($field_values['offset'] == $field_values['total']) {
+			$this->Application->Redirect($this->Application->RecallVar('reports_finish_t'));
+			$this->Application->RemoveVar('report_options');
+		}
+		else {
+			$this->Application->StoreVar('report_options', serialize($field_values));
+		}
+
+		return $field_values['offset']  * 100 / $field_values['total'];
+	}
+
+	function CalcReport($params)
+	{
+		$field_values = unserialize($this->Application->RecallVar('report_options'));
+		$per_step = 20;
+
+		$cats = $this->Conn->Query('SELECT * FROM '.TABLE_PREFIX.'Categories ORDER BY CategoryId LIMIT '.$field_values['offset'].', '.$per_step);
+
+		foreach ($cats as $a_cat) {
+			if ($field_values['Recursive']) {
+				$cat_filter = 'c.ParentPath LIKE '.$this->Conn->qstr($a_cat['ParentPath'].'%');
+			}
+			else {
+				$cat_filter = 'c.CategoryId = '.$a_cat['CategoryId'];
+			}
+
+			$q = 'INSERT INTO '.$field_values['table_name'].'
+						SELECT
+							c.CategoryId,
+							SUM(od.Quantity) as Qty,
+							SUM(od.Cost) as Cost,
+							SUM(od.Price) as SaleAmount,
+							0 as Tax,
+							0 as Shipping,
+							0 as Processing,
+							SUM(od.Price - od.Cost) as Profit
+						FROM '.TABLE_PREFIX.'Orders AS o
+						LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+						ON od.OrderId = o.OrderId
+						LEFT JOIN '.TABLE_PREFIX.'Products AS p
+						ON p.ProductId = od.ProductId
+						LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
+						ON ci.ItemResourceId = p.ResourceId
+						LEFT JOIN '.TABLE_PREFIX.'Categories AS c
+						ON c.CategoryId = ci.CategoryId
+						WHERE
+							o.Status = 4
+							AND
+							ci.PrimaryCat = 1
+							AND
+							'.$cat_filter.'
+						GROUP BY c.CategoryId';
+			$this->Conn->Query($q);
+
+			$field_values['offset']++;
+		}
+
+		return $field_values;
+	}
+
+	function ReportTypeEquals($params)
+	{
+		$field_values = unserialize($this->Application->RecallVar('report_options'));
+		return ($field_values['ReportType'] == $params['value']);
+	}
+
+	function CalculateChart($params)
+	{
+
+		$a_report_options = unserialize($this->Application->RecallVar('report_options'));
+		$metric = $this->Application->RecallVar('ChartMetric');
+		if ($metric == '')
+		{
+			// get first option from unit config
+			$a_virtual_fields = $this->Application->getUnitOption('rep', 'VirtualFields');
+			foreach ($a_virtual_fields['Metric']['options'] AS $field => $label)
+			{
+				$metric = $field;
+				break;
+			}
+		}
+
+
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject('rep.params', null, Array('skip_autoload' => true));
+
+		$object->setID(1);
+		$object->SetDBField('Metric', $metric);
+
+		if (!($a_report_options['from'] && $a_report_options['to'])) {
+			// calculate from & to as extreme order dates
+			$sql = 'SELECT MAX(OrderDate) AS date_to, MIN(OrderDate) AS date_frm
+				FROM '.TABLE_PREFIX.'Orders
+				WHERE
+					Status IN (4,6)
+			';
+			$a_dates = $this->Conn->GetRow($sql);
+			$a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_frm']), date('d', $a_dates['date_frm']), date('Y', $a_dates['date_frm']));
+			$a_report_options['to'] = adodb_mktime(0, 0, 0, date('m', $a_dates['date_to']), date('d', $a_dates['date_to']) + 1, date('Y', $a_dates['date_to'])) - 1;
+		}
+
+		$filter_value = 'AND o.OrderDate >= '.$a_report_options['from'].' AND o.OrderDate <= '.$a_report_options['to'];
+
+
+		if ($a_report_options['ReportType'] == 12)
+		{
+			// Overall
+
+			$selected_days = round(($a_report_options['to'] - $a_report_options['from'] + 1) / 3600 / 24);
+			// determine date interval
+			if ($selected_days < 2)
+			{
+				$step_seconds = 3600;
+				$step_labels = Array();
+				for ($i=0; $i<24; $i++)
+				{
+					$hour = str_pad($i, 2, '0', STR_PAD_LEFT);
+					$step_labels[$i] = $hour;
+				}
+			} elseif (
+				($selected_days < 31)
+				|| (date('mY', $a_report_options['from']) == date('mY', $a_report_options['to']))
+			)
+			{
+				$step_seconds = 24*3600;
+				$step_labels = Array();
+				$curr_date = $a_report_options['from'];
+				while ($curr_date <= $a_report_options['to'])
+				{
+					$curr_date += $step_seconds;
+					$step_labels[] = date('d-M', $curr_date);
+				}
+			} else {
+				$start_year = date('Y', $a_report_options['from']);
+				$start_month = date('m', $a_report_options['from']);
+				$end_month_year = date('Ym', $a_report_options['to']);
+				// big interval - move from date to the first day ot the month
+				$a_report_options['from'] = adodb_mktime(0, 0, 0, date('m', $a_report_options['from']), 1, date('Y', $a_report_options['from']));
+				$curr_time = $a_report_options['from'];
+				while (date('Ym', $curr_time) <= $end_month_year)
+				{
+					$step_labels[date('Ym', $curr_time)] = date('M-Y', $curr_time);
+					// add month
+					$curr_time = adodb_mktime(0,0,0, date('m', $curr_time) + 1, 1, date('Y', $curr_time));
+				}
+				$step_seconds = 0;
+			}
+
+			$a_expressions = Array(
+				'Qty' => 'od.Quantity',
+				'Cost' => 'od.Cost * od.Quantity',
+				'Amount' => 'od.Price * od.Quantity',
+				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
+				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
+				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
+				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
+			);
+
+			if ($step_seconds)
+			{
+				$period_sql = 'FLOOR(
+								(o.OrderDate - '.$a_report_options['from'].')
+								/'.$step_seconds.'
+							)';
+			} else {
+				$period_sql = 'CONCAT(YEAR(FROM_UNIXTIME(o.OrderDate)),LPAD(MONTH(FROM_UNIXTIME(o.OrderDate)), 2, \'0\'))';
+			}
+
+			if ($this->Application->isModuleEnabled('in-auction'))
+			{
+				$sql = 'SELECT
+							'.$period_sql.' AS Period,
+							SUM(IF(ISNULL(eod.OptionsSalt), '.$a_expressions[$metric].', 0)) as StoreMetric,
+							SUM(IF(ISNULL(eod.OptionsSalt), 0, '.$a_expressions[$metric].')) as eBayMetric
+					FROM '.TABLE_PREFIX.'Orders AS o
+					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+					ON od.OrderId = o.OrderId
+					LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
+					ON od.OptionsSalt = eod.OptionsSalt
+					WHERE
+						o.Status IN (4,6)
+						'.$filter_value.'
+						GROUP BY Period';
+			} else 	{
+
+				$sql = 'SELECT
+							'.$period_sql.' AS Period,
+							SUM('.$a_expressions[$metric].') as StoreMetric,
+							0 as eBayMetric
+					FROM '.TABLE_PREFIX.'Orders AS o
+					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+					ON od.OrderId = o.OrderId
+					WHERE
+						o.Status IN (4,6)
+						'.$filter_value.'
+						GROUP BY Period';
+
+			}
+
+			$a_data = $this->Conn->Query($sql, 'Period');
+
+			// create series array
+			$a_serie1 = Array();
+			$a_serie2 = Array();
+			foreach ($step_labels AS $key => $label)
+			{
+				$a_serie1[$key] = (isset($a_data[$key]['eBayMetric']) && !is_null($a_data[$key]['eBayMetric'])) ? $a_data[$key]['eBayMetric'] : 0;
+				$a_serie2[$key] = (isset($a_data[$key]['StoreMetric']) && !is_null($a_data[$key]['StoreMetric'])) ? $a_data[$key]['StoreMetric'] : 0;
+			}
+
+			$show_date_from = date('m/d/Y', $a_report_options['from']);
+			$show_date_to = date('m/d/Y', $a_report_options['to']);
+			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
+
+			$this->Application->StoreVar('graph_metric', $object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
+			$this->Application->StoreVar('graph_serie1', serialize($a_serie1));
+			$this->Application->StoreVar('graph_serie2', serialize($a_serie2));
+
+			$this->Application->StoreVar('graph_serie1_label', $this->Application->Phrase('la_eBayMarketplace'));
+			$this->Application->StoreVar('graph_serie2_label', $this->Application->Phrase('la_OnlineStore'));
+			$this->Application->StoreVar('graph_labels', serialize($step_labels));
+
+			return;
+
+		}
+
+
+		$ebay_joins = '';
+		if ($this->Application->isModuleEnabled('in-auction'))
+		{
+			$ebay_joins = '
+				LEFT JOIN '.TABLE_PREFIX.'eBayOrderItems AS eod
+				ON od.OptionsSalt = eod.OptionsSalt
+			';
+		}
+
+		if ($a_report_options['ReportType'] == 1)
+		{
+			// pie chart by category
+
+			$a_expressions = Array(
+				'Qty' => 'od.Quantity',
+				'Cost' => 'od.Cost * od.Quantity',
+				'Amount' => 'od.Price * od.Quantity',
+				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
+				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
+				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
+				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
+				'StoreQty' => 'IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)',
+				'eBayQty' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)',
+				'StoreAmount' => 'IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)',
+				'eBayAmount' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)',
+				'StoreProfit' => 'IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)',
+				'eBayProfit' => 'IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)',
+			);
+
+			$lang = $this->Application->GetVar('m_lang');
+
+			$sql = 'SELECT
+						LEFT(c.l'.$lang.'_Name, 60) AS Name,
+						c.CategoryId,
+						SUM('.$a_expressions[$metric].') as Metric
+				FROM '.TABLE_PREFIX.'Orders AS o
+				LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+				ON od.OrderId = o.OrderId
+				LEFT JOIN '.TABLE_PREFIX.'Products AS p
+				ON p.ProductId = od.ProductId
+				LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
+				ON ci.ItemResourceId = p.ResourceId
+				LEFT JOIN '.TABLE_PREFIX.'Categories AS c
+				ON c.CategoryId = ci.CategoryId
+				'.$ebay_joins.'
+				WHERE
+					o.Status IN (4,6)
+					'.$filter_value.'
+				GROUP BY c.CategoryId
+				HAVING NOT ISNULL(CategoryId)
+				ORDER BY Metric DESC
+				LIMIT 0,8
+				';
+			$a_data = $this->Conn->Query($sql, 'CategoryId');
+
+			$other_metric = 0;
+			if (count($a_data) > 7)
+			{
+				// gather ids for "others" call
+				$ids = join(',', array_keys($a_data));
+				$sql = 'SELECT
+							SUM('.$a_expressions[$metric].')
+					FROM '.TABLE_PREFIX.'Orders AS o
+					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+					ON od.OrderId = o.OrderId
+					LEFT JOIN '.TABLE_PREFIX.'Products AS p
+					ON p.ProductId = od.ProductId
+					LEFT JOIN '.TABLE_PREFIX.'CategoryItems AS ci
+					ON ci.ItemResourceId = p.ResourceId
+					LEFT JOIN '.TABLE_PREFIX.'Categories AS c
+					ON c.CategoryId = ci.CategoryId
+					'.$ebay_joins.'
+					WHERE
+						o.Status IN (4,6)
+						'.$filter_value.'
+						AND c.CategoryId NOT IN ('.$ids.')
+					';
+				$other_metric = $this->Conn->GetOne($sql);
+				if ($other_metric != 0)
+				{
+					$a_data[0] = Array(
+						'Metric' => $other_metric,
+						'Name' => $this->Application->Phrase('la_text_Others'),
+					);
+				}
+			}
+
+
+			$show_date_from = date('m/d/Y', $a_report_options['from']);
+			$show_date_to = date('m/d/Y', $a_report_options['to']);
+			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
+
+			$this->Application->StoreVar('graph_metric', $this->Application->Phrase('la_text_ReportByTopProductCategories').' '.$object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
+			$this->Application->StoreVar('graph_data', serialize($a_data));
+			return;
+		}
+
+
+		if ($a_report_options['ReportType'] == 5)
+		{
+			// pie chart by product
+
+			$a_expressions = Array(
+				'Qty' => 'od.Quantity',
+				'Cost' => 'od.Cost * od.Quantity',
+				'Amount' => 'od.Price * od.Quantity',
+				'Tax' => 'o.VAT * od.Price * od.Quantity / o.SubTotal',
+				'Shipping' => 'o.ShippingCost * od.Price * od.Quantity / o.SubTotal',
+				'Processing' => 'o.ProcessingFee * od.Price * od.Quantity / o.SubTotal',
+				'Profit' => '(od.Price - od.Cost)  * od.Quantity',
+				'StoreQty' => 'IF(ISNULL(eod.OptionsSalt), od.Quantity, 0)',
+				'eBayQty' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Quantity)',
+				'StoreAmount' => 'IF(ISNULL(eod.OptionsSalt), od.Price * od.Quantity, 0)',
+				'eBayAmount' => 'IF(ISNULL(eod.OptionsSalt), 0, od.Price * od.Quantity)',
+				'StoreProfit' => 'IF(ISNULL(eod.OptionsSalt), (od.Price - od.Cost) * od.Quantity, 0)',
+				'eBayProfit' => 'IF(ISNULL(eod.OptionsSalt), 0, (od.Price - od.Cost) * od.Quantity)',
+			);
+
+			$lang = $this->Application->GetVar('m_lang');
+
+			$sql = 'SELECT
+						LEFT(p.l'.$lang.'_Name, 60) AS Name,
+						p.ProductId,
+						SUM('.$a_expressions[$metric].') as Metric
+				FROM '.TABLE_PREFIX.'Orders AS o
+				LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+				ON od.OrderId = o.OrderId
+				LEFT JOIN '.TABLE_PREFIX.'Products AS p
+				ON p.ProductId = od.ProductId
+				'.$ebay_joins.'
+				WHERE
+					o.Status IN (4,6)
+					'.$filter_value.'
+				GROUP BY p.ProductId
+				HAVING NOT ISNULL(ProductId)
+				ORDER BY Metric DESC
+				LIMIT 0,8
+				';
+			$a_data = $this->Conn->Query($sql, 'ProductId');
+
+			$other_metric = 0;
+			if (count($a_data) > 7)
+			{
+				// gather ids for "others" call
+				$ids = join(',', array_keys($a_data));
+				$sql = 'SELECT
+							SUM('.$a_expressions[$metric].')
+					FROM '.TABLE_PREFIX.'Orders AS o
+					LEFT JOIN '.TABLE_PREFIX.'OrderItems AS od
+					ON od.OrderId = o.OrderId
+					LEFT JOIN '.TABLE_PREFIX.'Products AS p
+					ON p.ProductId = od.ProductId
+					'.$ebay_joins.'
+					WHERE
+						o.Status IN (4,6)
+						'.$filter_value.'
+						AND p.ProductId NOT IN ('.$ids.')
+					';
+				$other_metric = $this->Conn->GetOne($sql);
+				if ($other_metric != 0)
+				{
+					$a_data[0] = Array(
+						'Metric' => $other_metric,
+						'Name' => $this->Application->Phrase('la_Others'),
+					);
+				}
+			}
+
+
+			$show_date_from = date('m/d/Y', $a_report_options['from']);
+			$show_date_to = date('m/d/Y', $a_report_options['to']);
+			$show_date = ($show_date_from == $show_date_to) ? $show_date_to : $show_date_from.' - '.$show_date_to;
+
+			$this->Application->StoreVar('graph_metric', $this->Application->Phrase('la_text_ReportByTopProducts').' '.$object->GetField('Metric').' :: ('.$show_date.') :: '.DOMAIN);
+			$this->Application->StoreVar('graph_data', serialize($a_data));
+		}
+
+	}
+
+	function GetRandom($params)
+	{
+		return rand(1,10000000);
+	}
+
+	function IsPHPxOrGreater($params)
+	{
+		$curver = explode(".", phpversion());
+		return ($curver[0] >= $params['version']);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/reports/reports_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/brackets/brackets_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/brackets/brackets_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/brackets/brackets_event_handler.php	(revision 16630)
@@ -0,0 +1,231 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class BracketsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnMoreBrackets' => Array ('subitem' => 'add|edit'),
+			'OnInfinity' => Array ('subitem' => 'add|edit'),
+			'OnArrange' => Array ('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Apply some special processing to object being
+	 * recalled before using it in other events that
+	 * call prepareObject
+	 *
+	 * @param kDBItem|kDBList $object
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function prepareObject(&$object, kEvent $event)
+	{
+		if ( $this->Application->GetVar('s_id') === false ) {
+			return;
+		}
+
+		/** @var kDBItem $shipping_object */
+		$shipping_object = $this->Application->recallObject('s');
+
+		/** @var LanguagesItem $lang_object */
+		$lang_object = $this->Application->recallObject('lang.current');
+
+		if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
+			$fields = Array ('Start', 'End');
+
+			/** @var kUnitFormatter $formatter */
+			$formatter = $this->Application->recallObject('kUnitFormatter');
+
+			foreach ($fields as $field) {
+				$object->SetFieldOption($field, 'formatter', 'kUnitFormatter');
+				$options = $object->GetFieldOptions($field);
+
+				$formatter->prepareOptions($field, $options, $object);
+			}
+		}
+	}
+
+	function prepareBrackets($event)
+	{
+		/** @var LanguagesItem $lang_object */
+		$lang_object = $this->Application->recallObject('lang.current');
+
+		/** @var kDBItem $shipping_object */
+		$shipping_object = $this->Application->recallObject('s');
+
+		if ( $lang_object->GetDBField('UnitSystem') != 2 || $shipping_object->GetDBField('Type') != 1 ) {
+			return;
+		}
+
+		$item_info = $this->Application->GetVar( $event->getPrefixSpecial() );
+
+		foreach ($item_info as $id => $item_data) {
+			if ( $item_info[$id]['Start_a'] === '' && $item_info[$id]['Start_b'] === '' ) {
+				$item_info[$id]['Start'] = '';
+			}
+			else {
+				$item_info[$id]['Start'] = kUtil::Pounds2Kg($item_info[$id]['Start_a'], $item_info[$id]['Start_b']);
+			}
+
+			if ( $item_info[$id]['End_a'] == '&#8734;' || $item_info[$id]['End_a'] == '&infin;' ) {
+				$item_info[$id]['End'] = '&#8734;';
+			}
+			elseif ( $item_info[$id]['End_a'] === '' && $item_info[$id]['End_b'] === '' ) {
+				$item_info[$id]['End'] = '';
+			}
+			else {
+				$item_info[$id]['End'] = kUtil::Pounds2Kg($item_info[$id]['End_a'], $item_info[$id]['End_b']);
+			}
+		}
+
+		$this->Application->SetVar($event->getPrefixSpecial(), $item_info);
+	}
+
+	/**
+	 * Adds additional 5 empty brackets
+	 *
+	 * @param kEvent $event
+	 */
+	function OnMoreBrackets($event)
+	{
+		$brackets_helper =& $this->getHelper($event);
+
+		$brackets_helper->OnMoreBrackets($event);
+	}
+
+	/**
+	 * Arrange brackets
+	 *
+	 * @param kEvent $event
+	 */
+	function OnArrange($event)
+	{
+		$brackets_helper =& $this->getHelper($event);
+
+		$brackets_helper->arrangeBrackets($event);
+		$event->CallSubEvent('OnPreSaveBrackets');
+	}
+
+	/**
+	 * Arrange infinity brackets
+	 *
+	 * @param kEvent $event
+	 */
+	function OnInfinity($event)
+	{
+		$brackets_helper =& $this->getHelper($event);
+
+		$brackets_helper->arrangeBrackets($event);
+		$event->CallSubEvent('OnPreSaveBrackets');
+
+		$brackets_helper->OnInfinity($event);
+		$event->CallSubEvent('OnPreSaveBrackets');
+	}
+
+	/**
+	 * Initializes kBracketsHelper class based on event
+	 *
+	 * @param kEvent $event
+	 * @param bool $event_readonly
+	 * @return kBracketsHelper
+	 */
+	protected function &getHelper($event, $event_readonly = false)
+	{
+		/** @var kDBItem $shipping_object */
+		$shipping_object = $this->Application->recallObject('s');
+
+		$default_start = $shipping_object->GetDBField('Type') == 1 ? 0 : 1;
+
+		if ( !$event_readonly ) {
+			$this->prepareBrackets($event);
+			$event->redirect = false;
+		}
+
+		/** @var kBracketsHelper $brackets_helper */
+		$brackets_helper = $this->Application->recallObject('BracketsHelper');
+
+		$brackets_helper->InitHelper('Start', 'End', Array (), $default_start);
+
+		return $brackets_helper;
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$linked_info = $object->getLinkedInfo();
+		$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
+
+		$brackets_helper =& $this->getHelper($event, true);
+		$brackets_helper->replaceInfinity($event);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnPreSaveBrackets($event)
+	{
+		/** @var LanguagesItem $lang_object */
+		$lang_object = $this->Application->recallObject('lang.current');
+
+		/** @var kDBItem $shipping_object */
+		$shipping_object = $this->Application->recallObject('s');
+
+		if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
+			$item_info = $this->Application->GetVar($event->getPrefixSpecial());
+
+			if ( is_array($item_info) ) {
+				foreach ($item_info as $id => $values) {
+					if ( $values['End'] == -1 ) {
+						$item_info[$id]['End_a'] = -1 / kUtil::POUND_TO_KG;
+						$item_info[$id]['End_b'] = 0;
+					}
+				}
+				$this->Application->SetVar($event->getPrefixSpecial(), $item_info);
+			}
+		}
+
+		$brackets_helper =& $this->getHelper($event, true);
+		$brackets_helper->OnPreSaveBrackets($event);
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/brackets/brackets_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/brackets/brackets_config.php
===================================================================
--- releases/5.2.2-B2/units/brackets/brackets_config.php	(revision 0)
+++ releases/5.2.2-B2/units/brackets/brackets_config.php	(revision 16630)
@@ -0,0 +1,66 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'br',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'BracketsEventHandler', 'file' => 'brackets_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'BracketsTagProcessor', 'file' => 'brackets_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnPreSave'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnArrange',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'BracketId',
+	'TableName' => TABLE_PREFIX.'ShippingBrackets',
+	'ForeignKey' => 'ShippingTypeID',
+	'ParentTableKey' => 'ShippingID',
+	'ParentPrefix' => 's',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'SubItems' => Array ('sc'),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'Fields' => Array (
+		'BracketId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Start' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'not_null' => true, 'default' => 0),
+		'End' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'not_null' => true, 'default' => 0),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/brackets/brackets_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/brackets/globals.php
===================================================================
--- releases/5.2.2-B2/units/brackets/globals.php	(revision 0)
+++ releases/5.2.2-B2/units/brackets/globals.php	(revision 16630)
@@ -0,0 +1,62 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+function bracket_comp($elem1, $elem2)
+{
+	if( ($elem1['End']>$elem2['End'] || $elem1['End'] == -1) && $elem2['End'] != -1 )
+	{
+		return 1;
+	}
+	elseif ( ($elem1['End']<$elem2['End'] || $elem2['End'] == -1) && $elem1['End'] != -1 )
+	{
+		return -1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+function bracket_id_sort($first_id, $second_id)
+{
+	$first_abs = abs($first_id);
+	$second_abs = abs($second_id);
+	$first_sign = ($first_id == 0) ? 0 : $first_id / $first_abs;
+	$second_sign = ($second_id == 0) ? 0 : $second_id / $second_abs;
+	if($first_sign != $second_sign)
+	{
+		if($first_id > $second_id) {
+			$bigger =& $first_abs;
+			$smaller =& $second_abs;
+		}
+		else {
+			$bigger =& $second_abs;
+			$smaller =& $first_abs;
+		}
+		$smaller = $bigger + $smaller;
+	}
+
+	if($first_abs > $second_abs) {
+		return 1;
+	}
+	elseif ($first_abs < $second_abs)
+	{
+		return -1;
+	}
+	else
+	{
+		return 0;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/brackets/globals.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/brackets/brackets_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/brackets/brackets_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/brackets/brackets_tag_processor.php	(revision 16630)
@@ -0,0 +1,202 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class BracketsTagProcessor extends kDBTagProcessor {
+
+	function Field($params)
+	{
+		$value = parent::Field($params);
+		$field = $this->SelectParam($params, 'name,field');
+
+		if ( ($field == 'Start' || $field == 'End') && $value == -1 ) {
+			$value = '&#8734;';
+		}
+
+		return $value;
+	}
+
+	function ShowBracketsForm($params)
+	{
+		/** @var kDBItem $shipping_object */
+		$shipping_object = $this->Application->recallObject('s');
+
+		$default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1;
+
+		/** @var kBracketsHelper $brackets_helper */
+		$brackets_helper = $this->Application->recallObject('BracketsHelper');
+
+		$brackets_helper->InitHelper('Start', 'End', Array(), $default_start );
+
+		$br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
+
+		$event = new kEvent($this->getPrefixSpecial(true) . ':OnArrange');
+		$br_data = $brackets_helper->getBrackets($event);
+		$linked_info = $br_object->getLinkedInfo($this->Special);
+
+		if (!$br_data) {
+			$sql = 	'SELECT * FROM '.$br_object->TableName.' WHERE '.$linked_info['ForeignKey'].' = '.$linked_info['ParentId'];
+			$brackets = $this->Conn->Query($sql, $br_object->IDField);
+
+			usort($brackets, Array(&$brackets_helper, 'compareBrackets'));
+
+			/** @var kDBItem $dummy */
+			$dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
+
+			// performs number formatting
+			foreach($brackets as $id => $values)
+			{
+				foreach($values as $value_key=>$value_val){
+					$dummy->SetDBField($value_key, $value_val);
+					$brackets[$id][$value_key] = $dummy->GetField($value_key);
+				}
+			}
+
+			$br_data = $brackets;
+			$brackets_helper->setBrackets($event, $brackets);
+		}
+		else {
+			usort($br_data, Array(&$brackets_helper, 'compareBrackets'));
+			$br_data = $brackets_helper->formatBrackets($br_data);
+		}
+
+		$ret = '';
+		if ( is_array($br_data) ) {
+			$block_params = $this->prepareTagParams($params);
+			$block_params['IdField'] = $br_object->IDField;
+			$block_params['name'] = $params['block'];
+			$first = true;
+
+			$main_object = $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
+//			$plan_type = $main_object->GetDBField('PlanType');
+//			$limits_format = ($plan_type == 2) ? '%d' : $br_object->getFieldOption('Start', 'format');
+
+			// this is needed to find next id
+			$br_data_copy = $br_data;
+			foreach($br_data as $id => $values)
+			{
+
+				foreach($values as $value_key => $value_val)
+				{
+					$block_params[$value_key] = $value_val;
+				}
+				reset($values);
+
+				next($br_data_copy);
+				$next_bracket = current($br_data_copy);
+
+//				$values['Start'] = sprintf($limits_format, $values['Start']);
+//				$values['End'] = sprintf($limits_format, $values['End']);
+
+				$block_params['id']	= $values[$br_object->IDField];
+				$block_params['min'] = ($id == -1) ? ($values['Start'] ? $values['Start'] : 0) : $values['Start'];
+				$block_params['max'] = ($values['End'] == -1) ? '&#8734;' : $values['End'];
+				$block_params['next_min_id'] = $next_bracket[$br_object->IDField];
+
+				$lang_object = $this->Application->recallObject('lang.current');
+				if($lang_object->GetDBField('UnitSystem') == 2 && $main_object->GetDBField('Type') == 1)
+				{
+					if($block_params['min'] === '')
+					{
+						$block_params['min_a'] = '';
+						$block_params['min_b'] = '';
+					}
+					else
+					{
+						list($block_params['min_a'], $block_params['min_b']) = kUtil::Kg2Pounds($block_params['min']);
+					}
+
+					if($block_params['max'] == '&#8734;')
+					{
+						$block_params['max_a'] = '&#8734;';
+						$block_params['max_b'] = '';
+					}
+					else
+					{
+						list($block_params['max_a'], $block_params['max_b']) = kUtil::Kg2Pounds($block_params['max']);
+					}
+				}
+
+				if($first)
+				{
+					$block_params['first'] = 1;
+					$first = false;
+				}
+				else
+				{
+					$block_params['first'] = 0;
+				}
+				$ret .= $this->Application->ParseBlock($block_params, 1);
+			}
+		}
+		return $ret;
+	}
+
+
+	/*
+	function ShowBracketsForm($params)
+	{
+		$br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
+
+		$br_data = $this->Application->GetVar('br');
+
+		if(!$br_data)
+		{
+			$sql = 	'SELECT * FROM '.$br_object->TableName.
+					' WHERE ShippingTypeID = '.$this->Application->GetVar('s_id');
+			$brackets = $this->Conn->Query($sql, 'BracketId');
+			usort($brackets, 'bracket_comp');
+
+			$br_data = array_reverse($brackets);
+			$this->Application->SetVar('br', $br_data);
+		}
+		else
+		{
+			$br_data = array_reverse($br_data);
+		}
+
+		$ret = '';
+		if( is_array($br_data) )
+		{
+			$i = -count($br_data);
+			ksort($br_data);
+			foreach($br_data as $record)
+			{
+				$temp_sorted[$i] = $record;
+				$i++;
+			}
+			$br_data = array_reverse($temp_sorted, true);
+
+			$block_params['name'] = $params['block'];
+			$first = true;
+			foreach($br_data as $id => $values)
+			{
+				$block_params['id']	= $id;
+				$block_params['start']	= ($id == -1) ? ($values['Start'] ? $values['Start'] : 0) : $values['Start'];
+				$block_params['end'] = ($values['End'] == -1) ? '&infin;' : $values['End'];
+				if ($first)
+				{
+					$block_params['first'] = 1;
+					$first = false;
+				}
+				else
+				{
+					$block_params['first'] = 0;
+				}
+				$ret .= $this->Application->ParseBlock($block_params);
+			}
+		}
+		return $ret;
+	}*/
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/brackets/brackets_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_tag_processor.php	(revision 16630)
@@ -0,0 +1,33 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class PaymentTypeCurrenciesTagProcessor extends kDBTagProcessor {
+
+		function CurrencySelected($params)
+		{
+			$object = $this->Application->recallObject($this->Prefix);
+			$payment_type_object = $this->Application->recallObject('pt');
+			$currency_object = $this->Application->recallObject('curr.active');
+
+			$pt_id = $payment_type_object->GetDBField('PaymentTypeId');
+			$curr_id = $currency_object->GetDBField('CurrencyId');
+			$sql = 'SELECT * FROM '.$object->TableName.'
+					WHERE PaymentTypeId='.$pt_id.' AND
+					CurrencyId='.$curr_id;
+			$res = $this->Conn->GetOne($sql);
+			return $res ? 1 : 0;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_event_handler.php	(revision 16630)
@@ -0,0 +1,63 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class PaymentTypeCurrenciesEventHandler extends kDBEventHandler {
+
+		/**
+		 * Creates new kDBItem
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnCreate(kEvent $event)
+		{
+			$currency_id_list = $this->Application->GetVar('currency_list');
+
+			if ( !$currency_id_list ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('skip_autoload' => true));
+
+			$pt_id = $this->Application->GetVar('pt_id');
+
+			if ( $pt_id === false ) {
+				return;
+			}
+
+			$sql = 'DELETE FROM ' . $object->TableName . '
+					WHERE PaymentTypeId = ' . $pt_id;
+			$this->Conn->Query($sql);
+
+			foreach ($currency_id_list as $id) {
+				$object->SetDBField('CurrencyId', $id);
+				$object->SetDBField('PaymentTypeId', $pt_id);
+				$this->customProcessing($event, 'before');
+
+				if ( $object->Create() ) {
+					$this->customProcessing($event, 'after');
+					$event->status = kEvent::erSUCCESS;
+				}
+				else {
+					$event->status = kEvent::erFAIL;
+					$event->redirect = false;
+					$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+					$object->setID(0);
+				}
+			}
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_config.php
===================================================================
--- releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_config.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_config.php	(revision 16630)
@@ -0,0 +1,67 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'ptc',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'PaymentTypeCurrenciesEventHandler', 'file' => 'payment_type_currencies_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'PaymentTypeCurrenciesTagProcessor', 'file' => 'payment_type_currencies_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnPreSaveAndGoToTab', 'OnPreSaveAndGo', 'OnPreSave' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnCreate',
+		),
+	),
+
+	'IDField' => 'PaymentTypeCurrencyId',
+	'TableName' => TABLE_PREFIX.'PaymentTypeCurrencies',
+	'ParentTableKey' => 'PaymentTypeId',	// linked field in master table
+	'ForeignKey' => 'PaymentTypeId',	// linked field in subtable
+	'ParentPrefix' => 'pt',
+	'AutoDelete' => true,
+
+	'SubItems' => Array (),
+
+	'ListSQLs' => Array (
+		''=> '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (),
+
+	'Fields' => Array (
+		'PaymentTypeCurrencyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'CurrencyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type_currencies/payment_type_currencies_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/order_helper.php
===================================================================
--- releases/5.2.2-B2/units/helpers/order_helper.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/order_helper.php	(revision 16630)
@@ -0,0 +1,248 @@
+<?php
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class OrderHelper extends kHelper
+	{
+		/**
+		 * Returns various information about given order
+		 *
+		 * @param OrdersItem $object
+		 * @param string $currency
+		 * @param bool $remove_errors
+		 * @return Array
+		 */
+		function getOrderInfo(&$object, $currency, $remove_errors = true)
+		{
+			$errors = $this->Application->RecallVar('checkout_errors');
+
+			$ret = Array (
+				'order' => Array (
+					'CouponId' => (int)$object->GetDBField('CouponId'),
+					'CouponName' => (string)$object->GetDBField('CouponName'),
+					'GiftCertificateId' => (int)$object->GetDBField('GiftCertificateDiscount'),
+					'GiftCertificateDiscount' => $this->convertCurrency($object->GetDBField('GiftCertificateDiscount'), $currency),
+					'DiscountTotal' => $this->convertCurrency($object->GetDBField('DiscountTotal'), $currency),
+					'SubTotal' => $this->convertCurrency($object->GetDBField('SubTotal'), $currency),
+				),
+				'items' => Array (),
+				'errors' => $errors ? unserialize($errors) : Array (),
+			);
+
+			/** @var kDBList $items */
+			$items = $this->Application->recallObject('orditems', 'orditems_List', Array ('per_page' => -1));
+
+			$items->Query();
+			$items->GoFirst();
+
+			$ret['order']['ItemsInCart'] = array_sum( $items->GetCol('Quantity') );
+
+			if ( $items->EOL() ) {
+				return $ret;
+			}
+
+			/** @var kCatDBItem $product */
+			$product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
+
+			$sql =  $product->GetSelectSQL() . '
+					WHERE ' . $product->TableName . '.' . $product->IDField . ' IN (' . implode(',', $items->GetCol('ProductId')) . ')';
+			$products = $this->Conn->Query($sql, $product->IDField);
+
+			while ( !$items->EOL() ) {
+				// prepare product from order item
+				$product->LoadFromHash( $products[ $items->GetDBField('ProductId') ] );
+				$this->Application->SetVar('orditems_id', $items->GetID()); // for edit/delete links using GET
+
+				// weird code from orditems:PrintList
+				$this->Application->SetVar('p_id', $product->GetID());
+				$this->Application->SetVar('m_cat_id', $product->GetDBField('CategoryId'));
+
+				// collect order item info
+				$url_params = Array (
+					'p_id' => $product->GetID(),
+					'm_cat_id' => $product->GetDBField('CategoryId'),
+					'pass' => 'm,p',
+				);
+
+				$product_url = $this->Application->HREF('__default__', '', $url_params);
+
+				$item_data = $items->GetDBField('ItemData');
+				$item_data = $item_data ? unserialize($item_data) : Array ();
+
+				$row_index = $items->GetDBField('ProductId') . ':' . $items->GetDBField('OptionsSalt') . ':' . $items->GetDBField('BackOrderFlag');
+
+				/** @var ImageHelper $image_helper */
+				$image_helper = $this->Application->recallObject('ImageHelper');
+
+				// TODO: find a way to specify thumbnail size & default image
+
+				$ret['items'][$row_index] = Array (
+					'product_url' => $product_url,
+					'product_type' => $product->GetDBField('Type'),
+					'options' => isset($item_data['Options']) ? $item_data['Options'] : false,
+					'free_promo_shipping' => $this->eligibleForFreePromoShipping($items),
+
+					'fields' => Array (
+						'OrderItemId' => $items->GetDBField('OrderItemId'),
+						'ProductName' => $items->GetDBField('ProductName'),
+						'PrimaryImage' => $product->GetField('PrimaryImage', 'resize:58x58;default:img/no_picture.gif'),
+						'BackOrderFlag' => (int)$items->GetDBField('BackOrderFlag'),
+						'FlatPrice' => $this->convertCurrency($items->GetDBField('FlatPrice'), $currency),
+						'Price' => $this->convertCurrency($items->GetDBField('Price'), $currency),
+						'Quantity' => (int)$items->GetDBField('Quantity'),
+						'Virtual' => (int)$items->GetDBField('Virtual'),
+						'Type' => (int)$product->GetDBField('Type'),
+
+						'cust_Availability' => $product->GetDBField('cust_Availability'),
+					),
+				);
+
+				$items->GoNext();
+			}
+
+			if ( $remove_errors ) {
+				$this->Application->RemoveVar('checkout_errors');
+			}
+
+			return $ret;
+		}
+
+		function convertCurrency($amount, $currency)
+		{
+			/** @var CurrencyRates $converter */
+			$converter = $this->Application->recallObject('CurrencyRates');
+
+			// convert primary currency to selected (if they are the same, converter will just return)
+			return (float)$converter->Convert($amount, 'PRIMARY', $this->getISO($currency));
+		}
+
+		function getISO($currency)
+		{
+			if ($currency == 'selected') {
+				$iso = $this->Application->RecallVar('curr_iso');
+			}
+			elseif ($currency == 'primary' || $currency == '') {
+				$iso = $this->Application->GetPrimaryCurrency();
+			}
+			else { //explicit currency
+				$iso = strtoupper($currency);
+			}
+
+			return $iso;
+		}
+
+		/**
+		 * Checks, that given order item is eligible  for free promo shipping
+		 *
+		 * @param kDBItem|kDBList $order_item
+		 * @return bool
+		 */
+		function eligibleForFreePromoShipping(&$order_item)
+		{
+			if ( $order_item->GetDBField('Type') != PRODUCT_TYPE_TANGIBLE ) {
+				return false;
+			}
+
+			$free_shipping = $order_item->GetDBField('MinQtyFreePromoShipping');
+
+			return $free_shipping > 0 && $free_shipping <= $order_item->GetDBField('Quantity');
+		}
+
+		/**
+		 * Returns a template, that will be used to continue shopping from "shopping cart" template
+		 *
+		 * @param string $template
+		 * @return string
+		 * @access public
+		 */
+		public function getContinueShoppingTemplate($template = '')
+		{
+			if ( !$template || $template == '__default__' ) {
+				$template = $this->Application->RecallVar('continue_shopping');
+			}
+
+			if ( !$template ) {
+				$template = 'in-commerce/index';
+			}
+
+			return $template;
+		}
+
+		/**
+		 * Detects credit card type by it's number.
+		 *
+		 * @param string $number Credit card number.
+		 *
+		 * @return     integer
+		 * @deprecated 5.2.2-B1
+		 * @see        OrderHelper::getCreditCardType()
+		 */
+		public function getCreditCartType($number)
+		{
+			kUtil::deprecatedMethod(__METHOD__, '5.2.2-B1', 'OrderHelper::getCreditCardType');
+
+			return $this->getCreditCardType($number);
+		}
+
+		/**
+		 * Detects credit card type by it's number.
+		 *
+		 * @param string $number Credit card number.
+		 *
+		 * @return integer
+		 */
+		public function getCreditCardType($number)
+		{
+			// Get rid of any non-digits.
+			$number = preg_replace('/[^\d]/', '', $number);
+
+			$mapping = Array (
+				'/^4.{15}$|^4.{12}$/' => 1, // Visa
+				'/^5[1-5].{14}$/' => 2, // MasterCard
+				'/^3[47].{13}$/' => 3, // American Express
+				'/^6011.{12}$/' => 4, // Discover
+				'/^30[0-5].{11}$|^3[68].{12}$/' => 5, // Diners Club
+				'/^3.{15}$|^2131|1800.{11}$/' => 6, // JBC
+			);
+
+			foreach ($mapping as $number_regex => $card_type) {
+				if ( preg_match($number_regex, $number) ) {
+					return $card_type;
+				}
+			}
+
+			return false;
+		}
+
+		/**
+		 * Extracts fields, used to created user from order
+		 *
+		 * @param OrdersItem $order
+		 * @param string $field_prefix
+		 * @return Array
+		 * @access public
+		 */
+		public function getUserFields(&$order, $field_prefix = 'Billing')
+		{
+			$fields_hash = Array ();
+			$names = explode(' ', $order->GetDBField($field_prefix . 'To'), 2);
+
+			$fields_hash['FirstName'] = (string)getArrayValue($names, 0);
+			$fields_hash['LastName'] = (string)getArrayValue($names, 1);
+
+			$order_fields = Array (
+				'Company', 'Phone', 'Fax', 'Email', 'Address1' => 'Street',
+				'Address2' => 'Street2', 'City', 'State', 'Zip', 'Country'
+			);
+
+			foreach ($order_fields as $src_field => $dst_field) {
+				if ( is_numeric($src_field) ) {
+					$src_field = $dst_field;
+				}
+
+				$fields_hash[$dst_field] = $order->GetDBField($field_prefix . $src_field);
+			}
+
+			return $fields_hash;
+		}
+	}

Property changes on: releases/5.2.2-B2/units/helpers/order_helper.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/ecb_currency_rates.php
===================================================================
--- releases/5.2.2-B2/units/helpers/ecb_currency_rates.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/ecb_currency_rates.php	(revision 16630)
@@ -0,0 +1,62 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ECBCurrencyRates extends CurrencyRates {
+
+	public function __construct()
+	{
+		$this->RateSource = 'http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml';
+
+		parent::__construct();
+	}
+
+	function GetRatesData()
+	{
+		$xml_parser = xml_parser_create();
+
+		/** @var kCurlHelper $curl_helper */
+		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
+
+		$xml = $curl_helper->Send($this->RateSource);
+
+		if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+			return;
+		}
+
+		xml_parse_into_struct($xml_parser, $xml, $struct, $index);
+		$data_res = Array();
+		foreach($struct as $element)
+		{
+			if(isset($element['attributes']) && isset($element['attributes']['CURRENCY']))
+			{
+				$currency = $element['attributes']['CURRENCY'];
+				$data_res[$currency]['ID'] = $currency;
+				$data_res[$currency]['TARGET'] = 'EUR';
+				$data_res[$currency]['UNITS'] = 1;
+				$data_res[$currency]['RATE'] = ($element['attributes']['RATE'] == 0) ? 0 : 1 / $element['attributes']['RATE'];
+			}
+		}
+
+		if ( !isset($data_res['EUR']) ) {
+			$data_res['EUR']['ID'] = 'EUR';
+			$data_res['EUR']['UNITS'] = 1;
+			$data_res['EUR']['TARGET'] = 'EUR';
+			$data_res['EUR']['RATE'] = 1;
+		}
+
+		$this->ExchangeRates = $data_res;
+	}
+}

Property changes on: releases/5.2.2-B2/units/helpers/ecb_currency_rates.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/bank_lv_currency_rates.php
===================================================================
--- releases/5.2.2-B2/units/helpers/bank_lv_currency_rates.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/bank_lv_currency_rates.php	(revision 16630)
@@ -0,0 +1,70 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class BankLVCurrencyRates extends CurrencyRates  {
+
+	public function __construct()
+	{
+		$this->RateSource = 'http://www.bank.lv/ValutuKursi/XML/xml.cfm';
+
+		parent::__construct();
+	}
+
+	function GetRatesData()
+	{
+		$xml_parser = xml_parser_create();
+
+		/** @var kCurlHelper $curl_helper */
+		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
+
+		$xml = $curl_helper->Send($this->RateSource);
+
+		if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+			return;
+		}
+
+		xml_parse_into_struct($xml_parser, $xml, $struct, $index);
+		$data_res = Array();
+		$currency = '';
+		foreach($struct as $element)
+		{
+			switch($element['tag'])
+			{
+				case 'ID':
+					$currency = $element['value'];
+					$data_res[$currency]['ID'] = $currency;
+					$data_res[$currency]['TARGET'] = 'LVL';
+				break;
+				case 'UNITS':
+					$data_res[$currency]['UNITS'] = $element['value'];
+				break;
+				case 'RATE':
+					$data_res[$currency]['RATE'] = $element['value'];
+				break;
+				default:
+			}
+		}
+
+		if(!$data_res['LVL'])
+		{
+			$data_res['LVL']['ID'] = 'LVL';
+			$data_res['LVL']['UNITS'] = 1;
+			$data_res['LVL']['TARGET'] = 'LVL';
+			$data_res['LVL']['RATE'] = 1;
+		}
+		$this->ExchangeRates = $data_res;
+	}
+}

Property changes on: releases/5.2.2-B2/units/helpers/bank_lv_currency_rates.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/frny_currency_rates.php
===================================================================
--- releases/5.2.2-B2/units/helpers/frny_currency_rates.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/frny_currency_rates.php	(revision 16630)
@@ -0,0 +1,91 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class FRNYCurrencyRates extends CurrencyRates {
+
+	public function __construct()
+	{
+		$this->RateSource = 'http://www.ny.frb.org/markets/fxrates/FXtoXML.cfm?FEXdate=%s&FEXtime=1200';
+
+		parent::__construct();
+	}
+
+	function GetRatesData()
+	{
+		/** @var kCurlHelper $curl_helper */
+		$curl_helper = $this->Application->recallObject('CurlHelper');
+		$curl_helper->followLocation = true;
+
+		for($i = 0; $i < 10; $i++)
+		{
+			$time = adodb_mktime() - $i * 3600 * 24;
+			$source_file = sprintf($this->RateSource, adodb_date('Y-m-d', $time));
+			$xml = $curl_helper->Send($source_file);
+
+			if ( !$curl_helper->isGoodResponseCode() || strlen($xml) == 0 ) {
+				continue;
+			}
+
+			$xml_parser = xml_parser_create();
+			xml_parse_into_struct($xml_parser, $xml, $struct, $index);
+			foreach($struct as $element)
+			{
+				if($element['tag'] == 'FRBNY:DATASET')
+				{
+					break;
+				}
+			}
+			if($element['type'] == 'open')
+			{
+				break;
+			}
+		}
+		if($element['type'] != 'open')
+		{
+			return false;
+		}
+
+		foreach($struct as $element)
+		{
+			switch($element['tag'])
+			{
+				case 'FRBNY:SERIES':
+					$currency = $element['attributes']['UNIT'];
+					if($currency)
+					{
+						$data_res[$currency]['ID'] = $currency;
+						$data_res[$currency]['UNITS'] = 1;
+					}
+				break;
+				case 'FRBNY:CURR':
+					$data_res[$currency]['TARGET'] = $element['value'];
+				break;
+				case 'FRBNY:OBS_VALUE':
+					$data_res[$currency]['RATE'] = ($element['value'] == 0) ? 0 : 1 / $element['value'];
+				break;
+				default:
+			}
+		}
+		if(!$data_res['USD'])
+		{
+			$data_res['USD']['ID'] = 'USD';
+			$data_res['USD']['UNITS'] = 1;
+			$data_res['USD']['TARGET'] = 'USD';
+			$data_res['USD']['RATE'] = 1;
+		}
+		$this->ExchangeRates = $data_res;
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/helpers/frny_currency_rates.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/helpers_config.php
===================================================================
--- releases/5.2.2-B2/units/helpers/helpers_config.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/helpers_config.php	(revision 16630)
@@ -0,0 +1,17 @@
+<?php
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'in-commerce-helpers',
+
+	'EventHandlerClass' => Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'OrderHelper', 'class' => 'OrderHelper', 'file' => 'order_helper.php', 'build_event' => ''),
+		Array ('pseudo' => 'CurrencyRates', 'class' => 'CurrencyRates', 'file' => 'currency_rates.php', 'build_event' => ''),
+		Array ('pseudo' => 'BankLVCurrencyRates', 'class' => 'BankLVCurrencyRates', 'file' => 'bank_lv_currency_rates.php', 'build_event' => ''),
+		Array ('pseudo' => 'ECBCurrencyRates', 'class' => 'ECBCurrencyRates', 'file' => 'ecb_currency_rates.php', 'build_event' => ''),
+		Array ('pseudo' => 'FRNYCurrencyRates', 'class' => 'FRNYCurrencyRates', 'file' => 'frny_currency_rates.php', 'build_event' => ''),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/helpers/helpers_config.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/helpers/currency_rates.php
===================================================================
--- releases/5.2.2-B2/units/helpers/currency_rates.php	(revision 0)
+++ releases/5.2.2-B2/units/helpers/currency_rates.php	(revision 16630)
@@ -0,0 +1,153 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CurrencyRates extends kBase {
+
+	var $RateSource;
+	var $ExchangeRates = Array();
+
+	/**
+	 * Creates currency rate update class
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->GetRatesData();
+	}
+
+	function GetRatesData()
+	{
+		$cache_key = 'currency_rates[%CurrSerial%]';
+		$rates = $this->Application->getCache($cache_key);
+		$primary = $this->Application->GetPrimaryCurrency();
+
+		if ($rates === false) {
+			$this->Conn->nextQueryCachable = true;
+			$sql = 'SELECT ISO, RateToPrimary
+					FROM ' . $this->Application->getUnitOption('curr', 'TableName') . '
+					WHERE Status = ' . STATUS_ACTIVE;
+			$rates = $this->Conn->Query($sql);
+
+			$this->Application->setCache($cache_key, $rates);
+		}
+
+		foreach ($rates as $rate) {
+			$this->SetRate($primary, $rate['ISO'], $rate['RateToPrimary']);
+		}
+	}
+
+	function GetRate($source_cur, $target_cur, $units = 1)
+	{
+		$source_cur = ($source_cur == 'PRIMARY') ? $this->Application->GetPrimaryCurrency() : $source_cur;
+		$target_cur = ($target_cur == 'PRIMARY') ? $this->Application->GetPrimaryCurrency() : $target_cur;
+		if($source_cur == $target_cur)
+		{
+			return 1;
+		}
+
+		if($this->ExchangeRates[$target_cur]['TARGET'] == $source_cur)
+		{
+			$rate = ($this->ExchangeRates[$target_cur]['RATE'] ==  0) ? false : 1 / $this->ExchangeRates[$target_cur]['RATE'];
+		}
+		elseif($this->ExchangeRates[$source_cur]['TARGET'] == $target_cur)
+		{
+			$rate = $this->ExchangeRates[$source_cur]['RATE'];
+		}
+		else
+		{
+			$rate = ($this->ExchangeRates[$target_cur]['RATE'] == 0) ? false : $this->ExchangeRates[$source_cur]['RATE'] / $this->ExchangeRates[$target_cur]['RATE'];
+		}
+		$rate *= $units;
+		return $rate;
+	}
+
+	function Convert($amount, $source_cur, $target_cur)
+	{
+		return $amount * $this->GetRate($source_cur, $target_cur);
+	}
+
+	function AddCurrencySymbol($value, $iso, $decimal_tag = '')
+	{
+		static $decimal_separator = false;
+
+		$cache_key = 'iso_masks[%CurrSerial%]';
+		$iso_masks = $this->Application->getCache($cache_key);
+
+		if ( $iso_masks === false ) {
+			$this->Conn->nextQueryCachable = true;
+			$symbol_sql = 'IF(COALESCE(Symbol, "") = "", CONCAT(ISO, "&nbsp;"), Symbol)';
+
+			$sql = 'SELECT IF(SymbolPosition = 0, CONCAT(' . $symbol_sql . ', "%s"), CONCAT("%s", ' . $symbol_sql . ')), LOWER(ISO) AS ISO
+					FROM ' . $this->Application->getUnitOption('curr', 'TableName') . '
+					WHERE Status = ' . STATUS_ACTIVE;
+			$iso_masks = $this->Conn->GetCol($sql, 'ISO');
+			$this->Application->setCache($cache_key, $iso_masks);
+		}
+
+		if ( $decimal_tag ) {
+			if ( $decimal_separator === false ) {
+				/** @var LanguagesItem $language */
+				$language = $this->Application->recallObject('lang.current');
+
+				$decimal_separator = $language->GetDBField('DecimalPoint');
+			}
+
+			list ($integer_part, $decimal_part) = explode($decimal_separator, $value);
+			$value = $integer_part . $decimal_separator . '<' . $decimal_tag . '>' . $decimal_part . '</' . $decimal_tag . '>';
+		}
+
+		$iso = strtolower($iso);
+
+		return array_key_exists($iso, $iso_masks) ? sprintf($iso_masks[$iso], $value) : $value;
+	}
+
+	function SetRate($source_cur, $target_cur, $rate, $units = 1)
+	{
+		$this->ExchangeRates[$target_cur]['TARGET']	= $source_cur;
+		$this->ExchangeRates[$target_cur]['ID']		= $target_cur;
+		$this->ExchangeRates[$target_cur]['RATE']	= $rate;
+		$this->ExchangeRates[$target_cur]['UNITS']	= $units;
+	}
+
+	function StoreRates($currencies=null)
+	{
+		/** @var kDBItem $curr_object */
+		$curr_object = $this->Application->recallObject('curr', null, Array ('skip_autoload' => true));
+
+		if ($currencies) {
+			if (!is_array($currencies)) {
+				$currencies = explode(',', $currencies);
+			}
+		}
+		else {
+			$currencies = array_keys($this->ExchangeRates);
+		}
+
+		foreach ($currencies as $id) {
+			$rate = $this->GetRate($id, 'PRIMARY');
+			if ($rate) {
+				$curr_object->Clear();
+				$curr_object->Load($id, 'ISO');
+				$curr_object->SetDBField('RateToPrimary', $rate);
+				$curr_object->SetDBField('Modified_date', adodb_mktime());
+				$curr_object->SetDBField('Modified_time', adodb_mktime());
+				$curr_object->Update();
+			}
+		}
+	}
+}

Property changes on: releases/5.2.2-B2/units/helpers/currency_rates.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/files/files_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/files/files_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/files/files_event_handler.php	(revision 16630)
@@ -0,0 +1,188 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class FilesEventHandler extends kDBEventHandler {
+
+	/**
+	 * Returns special of main item for linking with sub-item
+	 *
+	 * @param kEvent $event
+	 * @return string
+	 * @access protected
+	 */
+	protected function getMainSpecial(kEvent $event)
+	{
+		if ( $event->Special == 'downl' ) {
+			return '';
+		}
+
+		return parent::getMainSpecial($event);
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		switch ($event->Special) {
+			case 'downl':
+				$object->addFilter('is_active', '%1$s.Status = 1');
+				break;
+		}
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$parent_info = $object->getLinkedInfo($event->Special);
+
+		$sql = 'SELECT FileId
+				FROM ' . $object->TableName . '
+				WHERE IsPrimary = 1 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+		$file_id = $this->Conn->GetOne($sql);
+
+		if ( !$file_id ) {
+			$object->SetDBField('IsPrimary', 1);
+			$object->SetDBField('Status', 1);
+		}
+
+		$object->SetDBField('AddedById', $this->Application->RecallVar('user_id'));
+	}
+
+	/**
+	 * Occurs before item is changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		if ( $object->GetDBField('IsPrimary') ) {
+			$parent_info = $object->getLinkedInfo($event->Special);
+
+			$sql = 'UPDATE ' . $object->TableName . '
+					SET IsPrimary = 0
+					WHERE ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+			$this->Conn->Query($sql);
+
+			$object->SetDBField('Status', 1);
+		}
+
+		if ( $object->GetDBField('Name') == '' ) {
+			$object->SetDBField('Name', $object->GetDBField('FilePath'));
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSetPrimary($event)
+	{
+		$ids = $this->StoreSelectedIDs($event);
+		$id = array_shift($ids);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array('skip_autoload' => true) );
+
+		$object->Load($id);
+
+		$object->SetDBField('IsPrimary', 1);
+		$object->Update();
+	}
+
+	/**
+	 * Don't allow to delete primary product file, when there are no more files
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+			$ids = $event->getEventParam('ids');
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$parent_info = $object->getLinkedInfo($event->Special);
+
+			$sql = 'SELECT FileId
+					FROM ' . $object->TableName . '
+					WHERE IsPrimary = 1 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+			$primary_file_id = $this->Conn->GetOne($sql);
+
+			if ( $primary_file_id ) {
+				$file_id_index = array_search($primary_file_id, $ids);
+
+				if ( $file_id_index ) {
+					// allow deleting of primary product file, when there is another file to make primary
+					$sql = 'SELECT COUNT(*)
+							FROM ' . $object->TableName . '
+							WHERE IsPrimary = 0 AND ' . $parent_info['ForeignKey'] . ' = ' . $parent_info['ParentId'];
+					$non_primary_file_count = $this->Conn->GetOne($sql);
+
+					if ( $non_primary_file_count ) {
+						unset($ids[$file_id_index]);
+					}
+				}
+			}
+
+			$event->setEventParam('ids', $ids);
+		}
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/files/files_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/files/files.php
===================================================================
--- releases/5.2.2-B2/units/files/files.php	(revision 0)
+++ releases/5.2.2-B2/units/files/files.php	(revision 16630)
@@ -0,0 +1,37 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class FilesItem extends kDBItem {
+
+	/**
+	 * Deletes the record from database
+	 *
+	 * @param int $id
+	 * @return bool
+	 * @access public
+	 */
+	public function Delete($id = null)
+	{
+		$this->Load($id);
+		$upload_dir = $this->Fields['FilePath']['upload_dir'];
+		$file_path = FULL_PATH . $upload_dir . $this->GetDBField('FilePath');
+
+		if ( file_exists($file_path) ) {
+			unlink($file_path);
+		}
+		
+		return parent::Delete($id);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/files/files.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/files/files_config.php
===================================================================
--- releases/5.2.2-B2/units/files/files_config.php	(revision 0)
+++ releases/5.2.2-B2/units/files/files_config.php	(revision 16630)
@@ -0,0 +1,141 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'file',
+	'ItemClass' => Array ('class' => 'FilesItem', 'file' => 'files.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'FilesEventHandler', 'file' => 'files_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'ListFiles',
+			'LocalTagName' => 'PrintList',
+			'LocalSpecial' => 'downl',
+		),
+	),
+
+	/*'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => 'p',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'onPreSave' ),
+			'DoPrefix' => 'pr',
+			'DoSpecial' => 'tang',
+			'DoEvent' => 'OnArrange',
+		),
+	),*/
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'StatusField' => Array ('Status', 'IsPrimary'),
+	'IDField' => 'FileId',
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'ProductFiles',
+	'ForeignKey' => 'ProductId',
+	'ParentTableKey' => 'ProductId',
+	'ParentPrefix' => 'p',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'),
+			'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'Version' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'FilePath' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'RealPath' => Array (
+			'type' => 'string',
+			'formatter' => 'kUploadFormatter',
+			'upload_dir' => ITEM_FILES_PATH, 'include_path' => 0,
+			'size_field' => 'Size', 'max_size' => 50000000,
+			'orig_name_field' => 'FilePath',
+			'content_type_field' => 'MIMEType',
+			'not_null' => 1, 'skip_empty' =>1, 'default' => '',
+			'required' => 1,
+			'error_msgs' => Array (
+				'bad_file_format' => '!la_error_InvalidFileFormat!',
+				'bad_file_size' => '!la_error_FileTooLarge!',
+				'cant_save_file' => '!la_error_cant_save_file!',
+			),
+		),
+		'Size' => Array (
+			'type' => 'int',
+			'formatter' => 'kFilesizeFormatter',
+			'not_null' => 1, 'default' => 0,
+		),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'AddedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'AddedById' => Array ('type' => 'int', 'default' => NULL),
+		'MIMEType' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'0_0' => 'icon16_disabled.png',
+				'0_1' => 'icon16_disabled.png',
+				'1_0' => 'icon16_item.png',
+				'1_1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'FileId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+				'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
+				'FilePath' => Array ( 'filter_block' => 'grid_like_filter'),
+				'Version' => Array ( 'filter_block' => 'grid_like_filter'),
+				'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_range_filter'),
+				'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
+				'Status' => Array ( 'filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/files/files_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_config.php	(revision 16630)
@@ -0,0 +1,151 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'apayments',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatePaymentsEventHandler', 'file' => 'affiliate_payments_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AffiliatePaymentsTagProcessor', 'file' => 'affiliate_payments_tag_processor.php', 'build_event' => 'OnBuild'),
+	'AutoLoad' => true,
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => 'ord',
+			'AggregatedTagName' => 'InitPaymentsList',
+			'LocalTagName' => 'InitList',
+		),
+		Array (
+			'AggregateTo' => 'ord',
+			'AggregatedTagName' => 'ListPayments',
+			'LocalTagName' => 'ListPayments',
+		),
+		Array (
+			'AggregateTo' => 'ord',
+			'AggregatedTagName' => 'PaymentsPaginationBar',
+			'LocalTagName' => 'PaginationBar',
+		),
+		Array (
+			'AggregateTo' => 'ord',
+			'AggregatedTagName' => 'PaymentsCount',
+			'LocalTagName' => 'TotalRecords',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'AffiliatePaymentId',
+
+	'TitlePresets' => Array (
+		'payments_log' => Array (
+			'prefixes' => Array ('apayments.log_List'), 'format' => "!la_title_AffiliatePayments!",
+		),
+	),
+
+	'Sections' => Array (
+		'in-commerce:paymentlog' => Array (
+			'parent' => 'in-commerce',
+			'icon' => 'transactions',
+			'label' => 'la_tab_PaymentLog',
+			'url' => Array ('t' => 'in-commerce/payments/payments_list', 'pass' => 'm'),
+			'permissions' => Array ('view'),
+			'priority' => 6,
+			'type' => stTREE,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'AffiliatePayments',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+				LEFT JOIN '.TABLE_PREFIX.'Users au ON af.PortalUserId = au.PortalUserId'
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'PortalUserId' => 'af.PortalUserId',
+		),
+		'log' => Array (
+			'Username' => 'IF(au.Username = "", au.Email, au.Username)',
+			'PortalUserId' => 'af.PortalUserId',
+		),
+	),
+
+	'ForeignKey' => 'AffiliateId',
+	'ParentTableKey' => 'AffiliateId',
+	'ParentPrefix' => 'affil',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('PaymentDate' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'AffiliatePaymentId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s', 'left_key_field' => 'af.AffiliateId', 'left_title_field' => 'IF(u.Email = "", u.Username, u.Email)', 'not_null'=>1,'default'=>0),
+		'PaymentDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'Amount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'),
+		'Comment' => Array ('type' => 'string', 'default' => NULL),
+		'PaymentReference' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'PaymentTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+	),
+
+	'VirtualFields' => Array (
+		'Username' => Array ('type' => 'string', 'default' => ''),
+		'PortalUserId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'AffiliatePaymentId'=> Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'PaymentDate' => Array ( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'Amount' => Array ( 'filter_block' => 'grid_range_filter'),
+				'Comment' => Array ( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+				'PaymentTypeId' => Array ( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+				'PaymentReference' => Array ( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+			),
+		),
+		'Log' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'AffiliatePaymentId'=> Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Username' => Array ( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+				'PaymentDate' => Array ( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'Amount' => Array ( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_range_filter'),
+				'Comment' => Array ( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+				'PaymentTypeId' => Array ( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+				'PaymentReference' => Array ( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.17.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_tag_processor.php	(revision 16630)
@@ -0,0 +1,65 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePaymentsTagProcessor extends kDBTagProcessor  {
+
+		/**
+		 * Returns url for editing user from current record
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function UserLink($params)
+		{
+			$object = $this->getObject($params);
+			$user_id = $object->GetDBField('PortalUserId');
+
+			if (!$user_id) {
+				return '';
+			}
+
+			$url_params =  Array (
+				'm_opener' => 'd',
+				'u_mode' => 't',
+				'u_event' => 'OnEdit',
+				'u_id' => $user_id,
+				'pass' => 'all,u'
+			);
+
+			return $this->Application->HREF($params['edit_template'], '', $url_params);
+		}
+
+		function ListPayments($params)
+		{
+			$o = '';
+			$params['render_as'] = $params['item_render_as'];
+			$o_payments = $this->PrintList($params);
+
+			if ($o_payments)
+			{
+				$payments_params = Array('name' => $params['header_render_as']);
+				$o  = $this->Application->ParseBlock($payments_params);
+				$o .= $o_payments;
+			}
+			else
+			{
+				$payments_params = array('name' => $params['empty_mypayments_render_as']);
+				$o = $this->Application->ParseBlock($payments_params);
+			}
+
+			return $o;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.32.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_event_handler.php	(revision 16630)
@@ -0,0 +1,138 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePaymentsEventHandler extends kDBEventHandler {
+
+		/**
+		 * Apply some special processing to object being
+		 * recalled before using it in other events that
+		 * call prepareObject
+		 *
+		 * @param kDBItem|kDBList $object
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function prepareObject(&$object, kEvent $event)
+		{
+			if ( $event->Special == 'log' ) {
+				return ;
+			}
+
+			$parent_info = $object->getLinkedInfo();
+
+			/** @var kDBItem $parent_object */
+			$parent_object = $this->Application->recallObject($parent_info['ParentPrefix']);
+
+			$options = $object->GetFieldOptions('PaymentTypeId');
+
+			if ( $parent_object->isLoaded() ) {
+				$options['default'] = $parent_object->GetDBField('PaymentTypeId');
+				$object->SetDBField('PaymentTypeId', $parent_object->GetDBField('PaymentTypeId'));
+			}
+
+			if ( $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnNew' && $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnCreate' ) {
+				$options['options'][0] = '';
+			}
+
+			$object->setFieldOptions('PaymentTypeId', $options);
+		}
+
+		/**
+		 * Set's fields based on affiliate currently being edited
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnNew(kEvent $event)
+		{
+			parent::OnNew($event);
+
+			/** @var kDBItem $affiliate */
+			$affiliate = $this->Application->recallObject('affil');
+
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('skip_autoload' => true));
+
+			$object->SetDBField('Amount', $affiliate->GetDBField('AmountToPay'));
+			$object->SetDBField('AffiliateId', $affiliate->GetID());
+		}
+
+		/**
+		 * Updates Affiliate Record On Successfully payment creation
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterItemCreate(kEvent $event)
+		{
+			parent::OnAfterItemCreate($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$parent_info = $object->getLinkedInfo();
+
+			$sql = 'SELECT MAX(PaymentDate)
+					FROM ' . $object->TableName . '
+					WHERE ' . $parent_info['ParentTableKey'] . ' = ' . $parent_info['ParentId'];
+			$payment_date = $this->Conn->GetOne($sql);
+
+			/** @var kDBItem $affiliate */
+			$affiliate = $this->Application->recallObject('affil');
+
+			$affiliate->SetDBField('AmountToPay', $affiliate->GetDBField('AmountToPay') - $object->GetDBField('Amount'));
+			$affiliate->SetDBField('LastPaymentDate_date', $payment_date);
+			$affiliate->SetDBField('LastPaymentDate_time', $payment_date);
+			$affiliate->Update();
+		}
+
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			/** @var kDBList $object */
+			$object = $event->getObject();
+
+			if ( $event->Special == 'log' ) {
+				$object->removeFilter('parent_filter');
+			}
+
+			$types = $event->getEventParam('types');
+			if ( $types == 'my_payments' ) {
+				$user_id = $this->Application->RecallVar('user_id');
+				$object->removeFilter('parent_filter');
+				$object->addFilter('my_payments', 'au.PortalUserId = ' . $user_id);
+			}
+
+			if ( $types == 'myvisitororders' ) {
+				$user_id = $this->Application->RecallVar('user_id');
+				$object->addFilter('myitems_orders', 'ord.OrderId IS NOT NULL');
+				$object->addFilter('myitems_user1', 'au.PortalUserId = ' . $user_id);
+				$object->addFilter('myitems_user2', 'au.PortalUserId > 0');
+			}
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_payments/affiliate_payments_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/destinations/destinations_config.php
===================================================================
--- releases/5.2.2-B2/units/destinations/destinations_config.php	(revision 0)
+++ releases/5.2.2-B2/units/destinations/destinations_config.php	(revision 16630)
@@ -0,0 +1,64 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'dst',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => 'images.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'DstEventHandler', 'file' => 'dst_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnCreate', 'OnUpdate'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnZoneUpdate',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'ZoneDestId',
+	'TableName' => TABLE_PREFIX.'ShippingZonesDestinations',
+	'ForeignKey' => 'ShippingZoneId',
+	'ParentTableKey' => 'ZoneID',
+	'ParentPrefix' => 'z',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'Fields' => Array (
+		'ZoneDestId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'ShippingZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'StdDestId' => Array ('type' => 'int', 'default' => 0, ),
+		'DestValue' => Array ('type' => 'string', 'max_len' => 255, 'default' => null, ),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/destinations/destinations_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/destinations/dst_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/destinations/dst_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/destinations/dst_event_handler.php	(revision 16630)
@@ -0,0 +1,136 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class DstEventHandler extends kDBEventHandler {
+
+	/**
+	 * Creates item from submit data
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCreate(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		// creates multiple db records from single request (OnCreate event only creates 1 record)
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+		if ( !$items_info ) {
+			return;
+		}
+
+		foreach ($items_info as $field_values) {
+			$object->setID(0);
+			$object->SetFieldsFromHash($field_values);
+			$event->setEventParam('form_data', $field_values);
+			$this->customProcessing($event, 'before');
+
+			if ( $object->Create() ) {
+				$this->customProcessing($event, 'after');
+				$event->status = kEvent::erSUCCESS;
+			}
+			else {
+				$event->status = kEvent::erFAIL;
+				$event->redirect = false;
+				$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+				$object->setID(0);
+			}
+		}
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		if ( $type != 'before' ) {
+			return;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$events = $this->Application->GetVar('events');
+
+		if ( $events['z'] == 'OnUpdate' ) {
+			$object->SetDBField('ShippingZoneId', $this->Application->GetVar('z_id'));
+		}
+
+		/** @var kDBItem $zone_object */
+		$zone_object = $this->Application->recallObject('z');
+
+		if ( $zone_object->GetDBField('Type') == 3 ) {
+			$object->SetDBField('StdDestId', $this->Application->GetVar('ZIPCountry'));
+		}
+	}
+
+	 /**
+	 *
+	 *
+	 * @param kEvent $event
+	 */
+	function OnZoneUpdate($event) {
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		/** @var kDBItem $zone_object */
+		$zone_object = $this->Application->recallObject('z');
+
+		$zone_id = (int)$zone_object->GetID();
+		$zone_type = $zone_object->GetDBField('Type');
+
+		$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE ShippingZoneId = '.$zone_id;
+		$this->Conn->Query($delete_zones_sql);
+
+		if ($zone_id != 0){
+			$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE ShippingZoneId = 0';
+			$this->Conn->Query($delete_zones_sql);
+		}
+
+		$selected_destinations = $this->Application->GetVar('selected_destinations');
+		$selected_destinations_array = explode(',', $selected_destinations);
+		$selected_destinations_array = array_unique($selected_destinations_array);
+		foreach ($selected_destinations_array as $key => $dest_id) {
+
+					if ($zone_object->GetDBField('Type') == 3){
+						list ($zone_dest_id, $dest_value) = explode('|', $dest_id);
+						$dest_id = $this->Application->GetVar('CountrySelector');
+					}
+					else {
+						$dest_value = '';
+					}
+
+					if ($dest_id > 0){
+						$object->SetDBField('ShippingZoneId', $zone_id);
+						$object->SetDBField('StdDestId', $dest_id);
+						$object->SetDBField('DestValue', $dest_value);
+						$object->Create();
+					}
+
+		}
+
+
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/destinations/dst_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_config.php	(revision 16630)
@@ -0,0 +1,115 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'apt',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatePaymentTypesEventHandler', 'file' => 'affiliate_payment_types_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AffiliatePaymentTypeTagProcessor', 'file' => 'affiliate_payment_types_tp.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'PaymentTypeId',
+	'StatusField' => Array ('Status', 'IsPrimary'),	// field, that is affected by Approve/Decline events
+
+	'TitleField' => 'Name',
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('apt' => '!la_title_Adding_Affiliate_Payment_Type!'),
+			'edit_status_labels' => Array ('apt' => '!la_title_Editing_Affiliate_Payment_Type!'),
+			'new_titlefield' => Array ('apt' => '!la_title_New_Affiliate_Payment_Type!'),
+		),
+
+		'affiliate_payment_types_list' => Array ('prefixes' => Array ('apt_List'), 'format' => "!la_title_AffiliatePaymentTypes!"),
+		'affiliate_payment_types_edit' => Array ('prefixes' => Array ('apt'), 'format' => "#apt_status# '#apt_titlefield#' - !la_title_General!"),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:affiliate_payment_types'),
+
+	'Sections' => Array (
+		'in-commerce:affiliate_payment_types' => Array (
+			'parent' => 'in-commerce:affiliates_folder',
+			'icon' => 'affiliates',
+			'label' => 'la_tab_AffiliatePaymentTypes',
+			'url' => Array ('t' => 'in-commerce/affiliate_plans/affiliate_payment_types_list', 'pass' => 'm'),
+			'permissions' => Array (
+				'view', 'add', 'edit', 'delete', 'advanced:approve',
+				'advanced:decline', 'advanced:set_primary', 'advanced:move_up', 'advanced:move_down'
+			),
+			'priority' => 5.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'AffiliatePaymentTypes',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'),
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''),
+		'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'0_0' => 'icon16_disabled.png',
+				'0_1' => 'icon16_disabled.png',
+				'1_0' => 'icon16_item.png',
+				'1_1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ( 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+				'Description' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 16630)
@@ -0,0 +1,123 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePaymentTypesEventHandler extends kDBEventHandler  {
+
+		/**
+		 * Lists only active affiliate payment types on Front-End
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			if ( !$this->Application->isAdmin ) {
+				/** @var kDBList $object */
+				$object = $event->getObject();
+
+				$object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE);
+			}
+		}
+
+		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSetPrimary($event)
+		{
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$object->SetDBField('IsPrimary', 1);
+			$object->Update();
+		}
+
+
+		/**
+		 * Ensures, that user have only one "use as billing" / "use as shipping" address
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(kEvent $event)
+		{
+			parent::OnBeforeItemCreate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before item is changed
+		 *
+		 * @param kEvent $event
+		 */
+		function itemChanged($event)
+		{
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
+				$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						SET IsPrimary = 0';
+				$this->Conn->Query($sql);
+
+				$object->SetDBField($object->getStatusField(), 1);
+			}
+		}
+
+		/**
+		 * Don't allow to delete primary affiliate payment type
+		 *
+		 * @param kEvent $event
+		 * @param string $type
+		 * @return void
+		 * @access protected
+		 */
+		protected function customProcessing(kEvent $event, $type)
+		{
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				$ids = $event->getEventParam('ids');
+
+				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
+						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						WHERE IsPrimary = 1';
+				$primary_id = $this->Conn->GetOne($sql);
+
+				$ids = array_diff($ids, Array ($primary_id));
+
+				$event->setEventParam('ids', $ids);
+			}
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_tp.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_tp.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_tp.php	(revision 16630)
@@ -0,0 +1,51 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class AffiliatePaymentTypeTagProcessor extends kDBTagProcessor {
+
+	/**
+	 * Checks, that current affiliate payment type matches the one, being printed via PrintList tag
+	 *
+	 * @param $params
+	 * @return bool
+	 * @see kDBTagProcessor::PrintList()
+	 * @access protected
+	 */
+	protected function Checked($params)
+	{
+		static $checked = false;
+
+		/** @var kDBItem $affiliate */
+		$affiliate = $this->Application->recallObject( $params['prefix'] );
+
+		$payment_type = $affiliate->GetDBField( $params['field'] );
+
+		if ( $payment_type ) {
+			/** @var kDBList $object */
+			$object = $this->getObject($params);
+
+			return $payment_type == $object->GetID();
+		}
+
+		if ( !$checked ) {
+			// make first listed affiliate payment type selected
+			$checked = true;
+
+			return true;
+		}
+
+		return false;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_payment_types/affiliate_payment_types_tp.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/usps.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/usps.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/usps.php	(revision 16630)
@@ -0,0 +1,1341 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+define('MODULE_SHIPPING_USPS_TEXT_TITLE', 'United States Postal Service');
+define('MODULE_SHIPPING_USPS_TEXT_DESCRIPTION', 'You will need to have registered an account with USPS. Click <a target="_blank" href="https://secure.shippingapis.com/registration/"><strong>HERE</strong></a> for registration details. USPS expects you to use pounds as weight measure for your products.');
+define('MODULE_SHIPPING_USPS_TEXT_ERROR', 'An error occured with the USPS shipping calculations.<br>If you prefer to use USPS as your shipping method, please contact the store owner.');
+define('MODULE_SHIPPING_USPS_TEXT_DAY', 'Day');
+define('MODULE_SHIPPING_USPS_TEXT_DAYS', 'Days');
+define('MODULE_SHIPPING_USPS_TEXT_WEEKS', 'Weeks');
+
+define('MODULE_SHIPPING_USPS_STATUS', 'True'); // Do you want to offer USPS shipping?
+define('MODULE_SHIPPING_USPS_SERVER', 'production'); // An account at USPS is needed to use the Production server // production  othervise value may be 'test'
+define('MODULE_SHIPPING_USPS_HANDLING', '0'); // Handling fee for this shipping method
+define('MODULE_SHIPPING_USPS_TAX_CLASS', '0'); // Use the following tax class on the shipping fee
+define('MODULE_SHIPPING_USPS_ZONE', '0'); // If a zone is selected, only enable this shipping method for that zone.
+define('MODULE_SHIPPING_USPS_SORT_ORDER', '0'); // Sort order of display.
+define('MODULE_SHIPPING_USPS_TYPES', 'PRIORITY, PARCEL'); //  EXPRESS, FIRST CLASS, BMP, MEDIA  'Select the domestic services to be offered:
+define('MODULE_SHIPPING_USPS_TYPES_INTL', 'EXPRESS MAIL INTERNATIONAL (EMS), EXPRESS MAIL INT, EXPRESS MAIL INT FLAT RATE ENV, PRIORITY MAIL INT, PRIORITY MAIL INT FLAT RATE ENV, PRIORITY MAILINT FLAT RATE BOX, FIRST-CLASS MAIL INT');//  'GLOBAL EXPRESS, GLOBAL EXPRESS NON-DOC RECT, GLOBAL EXPRESS NON-DOC NON-RECT,  Select the international services to be offered:
+define('MODULE_SHIPPING_USPS_OPTIONS', 'Display weight, Display transit time'); //
+
+//configuration values for insurance
+define('MODULE_SHIPPING_USPS_INS1', '1.65');// 'US/Canada insurance for totals $.01-$50.00
+define('MODULE_SHIPPING_USPS_INS2', '2.05');// 'US/Canada insurance for totals $50.01-$100
+define('MODULE_SHIPPING_USPS_INS3', '2.45');// 'US/Canada insurance for totals $100.01-$200
+define('MODULE_SHIPPING_USPS_INS4', '4.60');// 'US/Canada insurance for totals $200.01-$300
+define('MODULE_SHIPPING_USPS_INS5', '.90');// 'US/Canada insurance for every $100 over $300 (add)
+define('MODULE_SHIPPING_USPS_INS6', '2.40');//  'International insurance for totals $.01-$50.00
+define('MODULE_SHIPPING_USPS_INS7', '3.30');// 'International insurance for totals $50.01-$100
+define('MODULE_SHIPPING_USPS_INS8', '4.20');// 'International insurance for totals $100.01-$200
+define('MODULE_SHIPPING_USPS_INS9', '5.10');// 'International insurance for totals $200.01-$300
+define('MODULE_SHIPPING_USPS_INS10', '.90');// 'International insurance for every $100 over $300 (add)
+define('MODULE_SHIPPING_USPS_INSURE', 'True');// 'Insure packages shipped by USPS?
+define('MODULE_SHIPPING_USPS_INSURE_TAX', 'True');// 'Insure tax on packages shipped by USPS?
+
+class USPS extends ShippingQuoteEngine
+{
+	var $countries, $pounds, $ounces, $insurance_cost = 0, $shipping_origin_country, $store_first_name, $store_last_name, $company_name, $store_name, $store_address1, $store_address2, $store_city, $store_state, $store_zip5, $store_zip4, $store_phone, $usps_userid;
+	var $order = Array();
+	var $types = Array();
+	var $intl_types = Array();
+
+	/**
+	 * Path to a request log file
+	 *
+	 * @var string
+	 */
+	var $logFilePath = '';
+
+	/**
+	 * Creates USPS processing class
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->logFilePath = (defined('RESTRICTED') ? RESTRICTED : WRITEABLE . '/user_files') . '/usps.log';
+
+        // EXPRESS, FIRST CLASS, PRIORITY, PARCEL, BMP, MEDIA
+		$this->types = Array(
+			'EXPRESS' => 'Express Mail',
+			'FIRST CLASS' => 'First Class Mail',
+			'PRIORITY' => 'Priority Mail',
+			'PARCEL' => 'Parcel Post',
+			'BPM' => 'Bound Printed Matter',
+			'MEDIA' => 'Media Mail'
+		);
+
+		$this->intl_types = Array(
+			// 'GLOBAL EXPRESS' => 'Global Express Guaranteed',
+			// 'GLOBAL EXPRESS NON-DOC RECT' => 'Global Express Guaranteed Non-Document Rectangular',
+			// 'GLOBAL EXPRESS NON-DOC NON-RECT' => 'Global Express Guaranteed Non-Document Non-Rectangular',
+			'EXPRESS MAIL INT' => 'Express Mail International (EMS)',
+			'EXPRESS MAIL INT FLAT RATE ENV' => 'Express Mail International (EMS) Flat Rate Envelope',
+			'PRIORITY MAIL INT' => 'Priority Mail International',
+			'PRIORITY MAIL INT FLAT RATE ENV' => 'Priority Mail International Flat Rate Envelope',
+			'PRIORITY MAIL INT FLAT RATE BOX' => 'Priority Mail International Flat Rate Box',
+			'FIRST-CLASS MAIL INT' => 'First-Class Mail International'
+		);
+
+		// get 2-symbol country code
+		$country = $this->Application->ConfigValue('Comm_Shipping_Country');
+
+		if ($country != '') {
+			$this->shipping_origin_country = $this->GetUSPSCountry($country, '');
+		}
+
+		$contact_name = trim($this->_prepare_xml_param($this->Application->ConfigValue('Comm_Contacts_Name')));
+		$split_pos = strpos($contact_name, ' ');
+		if ($split_pos === false) {
+			$this->store_first_name = $contact_name;
+			$this->store_last_name = '';
+		} else {
+			$this->store_first_name = substr($contact_name, 0, $split_pos);
+			$this->store_last_name = trim(substr($contact_name, $split_pos));
+		}
+		$this->company_name = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_CompanyName'));
+		$this->store_name = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_StoreName'));
+		$this->store_address1 = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Shipping_AddressLine1'));
+		$this->store_address2 = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Shipping_AddressLine2'));
+
+		if ($this->store_address2 == '') {
+			$this->store_address2 = $this->store_address1;
+			$this->store_address1 = '';
+		}
+
+		$this->store_city = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Shipping_City'));
+		$this->store_state = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Shipping_State'));
+		$zip = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Shipping_ZIP'));
+		$this->store_zip5 = substr($zip, 0, 5);
+		$this->store_zip4 = trim(substr($zip, 6), '-');
+		$this->store_phone = $this->_prepare_xml_param($this->Application->ConfigValue('Comm_Contacts_Phone'));
+
+		// get username and password fron config.
+		$a_params = $this->LoadParams();
+		$this->usps_userid = $a_params['AccountLogin'];
+
+		// Note by Erik: DO NOT CHANGE THIS ARRAY. It's values are sent to USPS service and any changes may impact class main functionality.
+		$this->countries = array(
+			'AF' => 'Afghanistan',
+            'AL' => 'Albania',
+            'DZ' => 'Algeria',
+            'AD' => 'Andorra',
+            'AO' => 'Angola',
+            'AI' => 'Anguilla',
+            'AG' => 'Antigua and Barbuda',
+            'AR' => 'Argentina',
+            'AM' => 'Armenia',
+            'AW' => 'Aruba',
+            'AU' => 'Australia',
+            'AT' => 'Austria',
+            'AZ' => 'Azerbaijan',
+            'BS' => 'Bahamas',
+        	'BH' => 'Bahrain',
+            'BD' => 'Bangladesh',
+            'BB' => 'Barbados',
+            'BY' => 'Belarus',
+            'BE' => 'Belgium',
+            'BZ' => 'Belize',
+            'BJ' => 'Benin',
+            'BM' => 'Bermuda',
+            'BT' => 'Bhutan',
+            'BO' => 'Bolivia',
+            'BA' => 'Bosnia-Herzegovina',
+            'BW' => 'Botswana',
+            'BR' => 'Brazil',
+            'VG' => 'British Virgin Islands',
+            'BN' => 'Brunei Darussalam',
+            'BG' => 'Bulgaria',
+            'BF' => 'Burkina Faso',
+            'MM' => 'Burma',
+            'BI' => 'Burundi',
+            'KH' => 'Cambodia',
+            'CM' => 'Cameroon',
+            'CA' => 'Canada',
+            'CV' => 'Cape Verde',
+            'KY' => 'Cayman Islands',
+            'CF' => 'Central African Republic',
+            'TD' => 'Chad',
+            'CL' => 'Chile',
+            'CN' => 'China',
+            'CX' => 'Christmas Island (Australia)',
+            'CC' => 'Cocos Island (Australia)',
+            'CO' => 'Colombia',
+            'KM' => 'Comoros',
+            'CG' => 'Congo (Brazzaville),Republic of the',
+            'ZR' => 'Congo, Democratic Republic of the',
+            'CK' => 'Cook Islands (New Zealand)',
+            'CR' => 'Costa Rica',
+            'CI' => 'Cote d\'Ivoire (Ivory Coast)',
+            'HR' => 'Croatia',
+            'CU' => 'Cuba',
+            'CY' => 'Cyprus',
+            'CZ' => 'Czech Republic',
+            'DK' => 'Denmark',
+            'DJ' => 'Djibouti',
+            'DM' => 'Dominica',
+            'DO' => 'Dominican Republic',
+            'TP' => 'East Timor (Indonesia)',
+            'EC' => 'Ecuador',
+            'EG' => 'Egypt',
+            'SV' => 'El Salvador',
+            'GQ' => 'Equatorial Guinea',
+            'ER' => 'Eritrea',
+            'EE' => 'Estonia',
+            'ET' => 'Ethiopia',
+            'FK' => 'Falkland Islands',
+            'FO' => 'Faroe Islands',
+            'FJ' => 'Fiji',
+            'FI' => 'Finland',
+            'FR' => 'France',
+            'GF' => 'French Guiana',
+            'PF' => 'French Polynesia',
+            'GA' => 'Gabon',
+            'GM' => 'Gambia',
+            'GE' => 'Georgia, Republic of',
+            'DE' => 'Germany',
+            'GH' => 'Ghana',
+            'GI' => 'Gibraltar',
+            'GB' => 'Great Britain and Northern Ireland',
+            'GR' => 'Greece',
+            'GL' => 'Greenland',
+            'GD' => 'Grenada',
+            'GP' => 'Guadeloupe',
+            'GT' => 'Guatemala',
+            'GN' => 'Guinea',
+            'GW' => 'Guinea-Bissau',
+            'GY' => 'Guyana',
+            'HT' => 'Haiti',
+            'HN' => 'Honduras',
+            'HK' => 'Hong Kong',
+            'HU' => 'Hungary',
+            'IS' => 'Iceland',
+            'IN' => 'India',
+            'ID' => 'Indonesia',
+            'IR' => 'Iran',
+            'IQ' => 'Iraq',
+            'IE' => 'Ireland',
+            'IL' => 'Israel',
+            'IT' => 'Italy',
+            'JM' => 'Jamaica',
+            'JP' => 'Japan',
+            'JO' => 'Jordan',
+            'KZ' => 'Kazakhstan',
+            'KE' => 'Kenya',
+            'KI' => 'Kiribati',
+            'KW' => 'Kuwait',
+            'KG' => 'Kyrgyzstan',
+            'LA' => 'Laos',
+            'LV' => 'Latvia',
+            'LB' => 'Lebanon',
+            'LS' => 'Lesotho',
+            'LR' => 'Liberia',
+            'LY' => 'Libya',
+            'LI' => 'Liechtenstein',
+            'LT' => 'Lithuania',
+            'LU' => 'Luxembourg',
+            'MO' => 'Macao',
+            'MK' => 'Macedonia, Republic of',
+            'MG' => 'Madagascar',
+            'MW' => 'Malawi',
+            'MY' => 'Malaysia',
+            'MV' => 'Maldives',
+            'ML' => 'Mali',
+            'MT' => 'Malta',
+            'MQ' => 'Martinique',
+            'MR' => 'Mauritania',
+            'MU' => 'Mauritius',
+            'YT' => 'Mayotte (France)',
+            'MX' => 'Mexico',
+            'MD' => 'Moldova',
+            'MC' => 'Monaco (France)',
+            'MN' => 'Mongolia',
+            'MS' => 'Montserrat',
+            'MA' => 'Morocco',
+            'MZ' => 'Mozambique',
+            'NA' => 'Namibia',
+            'NR' => 'Nauru',
+            'NP' => 'Nepal',
+            'NL' => 'Netherlands',
+            'AN' => 'Netherlands Antilles',
+            'NC' => 'New Caledonia',
+            'NZ' => 'New Zealand',
+            'NI' => 'Nicaragua',
+            'NE' => 'Niger',
+            'NG' => 'Nigeria',
+            'KP' => 'North Korea (Korea, Democratic People\'s Republic of)',
+            'NO' => 'Norway',
+            'OM' => 'Oman',
+            'PK' => 'Pakistan',
+            'PA' => 'Panama',
+            'PG' => 'Papua New Guinea',
+            'PY' => 'Paraguay',
+            'PE' => 'Peru',
+            'PH' => 'Philippines',
+            'PN' => 'Pitcairn Island',
+            'PL' => 'Poland',
+            'PT' => 'Portugal',
+            'QA' => 'Qatar',
+            'RE' => 'Reunion',
+            'RO' => 'Romania',
+            'RU' => 'Russia',
+            'RW' => 'Rwanda',
+            'SH' => 'Saint Helena',
+            'KN' => 'Saint Kitts (St. Christopher and Nevis)',
+            'LC' => 'Saint Lucia',
+            'PM' => 'Saint Pierre and Miquelon',
+            'VC' => 'Saint Vincent and the Grenadines',
+            'SM' => 'San Marino',
+            'ST' => 'Sao Tome and Principe',
+            'SA' => 'Saudi Arabia',
+            'SN' => 'Senegal',
+            'YU' => 'Serbia-Montenegro',
+            'SC' => 'Seychelles',
+            'SL' => 'Sierra Leone',
+            'SG' => 'Singapore',
+            'SK' => 'Slovak Republic',
+            'SI' => 'Slovenia',
+            'SB' => 'Solomon Islands',
+            'SO' => 'Somalia',
+            'ZA' => 'South Africa',
+            'GS' => 'South Georgia (Falkland Islands)',
+            'KR' => 'South Korea (Korea, Republic of)',
+            'ES' => 'Spain',
+            'LK' => 'Sri Lanka',
+            'SD' => 'Sudan',
+            'SR' => 'Suriname',
+            'SZ' => 'Swaziland',
+            'SE' => 'Sweden',
+            'CH' => 'Switzerland',
+            'SY' => 'Syrian Arab Republic',
+            'TW' => 'Taiwan',
+            'TJ' => 'Tajikistan',
+            'TZ' => 'Tanzania',
+            'TH' => 'Thailand',
+            'TG' => 'Togo',
+            'TK' => 'Tokelau (Union) Group (Western Samoa)',
+            'TO' => 'Tonga',
+            'TT' => 'Trinidad and Tobago',
+            'TN' => 'Tunisia',
+            'TR' => 'Turkey',
+            'TM' => 'Turkmenistan',
+            'TC' => 'Turks and Caicos Islands',
+            'TV' => 'Tuvalu',
+            'UG' => 'Uganda',
+            'UA' => 'Ukraine',
+            'AE' => 'United Arab Emirates',
+            'UY' => 'Uruguay',
+            'UZ' => 'Uzbekistan',
+            'VU' => 'Vanuatu',
+            'VA' => 'Vatican City',
+            'VE' => 'Venezuela',
+            'VN' => 'Vietnam',
+            'WF' => 'Wallis and Futuna Islands',
+            'WS' => 'Western Samoa',
+            'YE' => 'Yemen',
+            'ZM' => 'Zambia',
+            'ZW' => 'Zimbabwe'
+        );
+
+		$this->countryinsure = array(
+			'AF' => 0,
+            'AL' => 0,
+            'DZ' => 2185,
+            'AD' => 5000,
+            'AO' => 0,
+            'AI' => 415,
+            'AG' => 60,
+            'AR' => 5000,
+            'AM' => 1350,
+            'AW' => 830,
+            'AU' => 3370,
+            'AT' => 5000,
+            'AZ' => 5000,
+            'BS' => 2795,
+            'BH' => 0,
+            'BD' => 5000,
+            'BB' => 220,
+            'BY' => 1323,
+            'BE' => 5000,
+            'BZ' => 1600,
+            'BJ' => 170,
+            'BM' => 440,
+            'BT' => 440,
+            'BO' => 0,
+            'BA' => 5000,
+            'BW' => 145,
+            'BR' => 5000,
+            'VG' => 165,
+            'BN' => 4405,
+            'BG' => 1030,
+            'BF' => 530,
+            'MM' => 4045,
+            'BI' => 790,
+            'KH' => 0,
+            'CM' => 5000,
+            'CA' => 675,
+            'CV' => 0,
+            'KY' => 0,
+            'CF' => 4405,
+            'TD' => 440,
+            'CL' => 0,
+            'CN' => 1130,
+            'CX' => 3370,
+            'CC' => 3370,
+            'CO' => 0,
+            'KM' => 690,
+            'CG' => 1685,
+            'ZR' => 0,
+            'CK' => 980,
+            'CR' => 0,
+            'CI' => 5000,
+            'HR' => 5000,
+            'CU' => 0,
+            'CY' => 5000,
+            'CZ' => 5000,
+            'DK' => 5000,
+            'DJ' => 880,
+            'DM' => 0,
+            'DO' => 0,
+            'TP' => 0,
+            'EC' => 0,
+            'EG' => 1685,
+            'SV' => 0,
+            'GQ' => 0,
+            'ER' => 0,
+            'EE' => 2020,
+            'ET' => 1000,
+            'FK' => 510,
+            'FO' => 5000,
+            'FJ' => 600,
+            'FI' => 5000,
+            'FR' => 5000,
+            'GF' => 5000,
+            'PF' => 1015,
+            'GA' => 485,
+            'GM' => 2575,
+            'GE' => 1350,
+            'DE' => 5000,
+            'GH' => 5000,
+            'GI' => 5000,
+            'GB' => 857,
+            'GR' => 5000,
+            'GL' => 5000,
+            'GD' => 350,
+            'GP' => 5000,
+            'GT' => 0,
+            'GN' => 875,
+            'GW' => 21,
+            'GY' => 10,
+            'HT' => 0,
+            'HN' => 0,
+            'HK' => 5000,
+            'HU' => 5000,
+            'IS' => 5000,
+            'IN' => 2265,
+            'ID' => 0,
+            'IR' => 0,
+            'IQ' => 0,
+            'IE' => 5000,
+            'IL' => 0,
+            'IT' => 5000,
+            'JM' => 0,
+            'JP' => 5000,
+            'JO' => 0,
+            'KZ' => 5000,
+            'KE' => 815,
+            'KI' => 0,
+            'KW' => 1765,
+            'KG' => 1350,
+            'LA' => 0,
+            'LV' => 1350,
+            'LB' => 440,
+            'LS' => 440,
+            'LR' => 440,
+            'LY' => 0,
+            'LI' => 5000,
+            'LT' => 5000,
+            'LU' => 5000,
+            'MO' => 4262,
+            'MK' => 2200,
+            'MG' => 675,
+            'MW' => 50,
+            'MY' => 1320,
+            'MV' => 0,
+            'ML' => 950,
+            'MT' => 5000,
+            'MQ' => 5000,
+            'MR' => 635,
+            'MU' => 270,
+            'YT' => 5000,
+            'MX' => 0,
+            'MD' => 1350,
+            'MC' => 5000,
+            'MN' => 440,
+            'MS' => 2200,
+            'MA' => 5000,
+            'MZ' => 0,
+            'NA' => 4405,
+            'NR' => 220,
+            'NP' => 0,
+            'NL' => 5000,
+            'AN' => 830,
+            'NC' => 1615,
+            'NZ' => 980,
+            'NI' => 440,
+            'NE' => 810,
+            'NG' => 205,
+            'KP' => 0,
+            'NO' => 0,
+            'OM' => 575,
+            'PK' => 270,
+            'PA' => 0,
+            'PG' => 445,
+            'PY' => 0,
+            'PE' => 0,
+            'PH' => 270,
+            'PN' => 0,
+            'PL' => 1350,
+            'PT' => 5000,
+            'QA' => 2515,
+            'RE' => 5000,
+            'RO' => 5000,
+            'RU' => 5000,
+            'RW' => 0,
+            'SH' => 170,
+            'KN' => 210,
+            'LC' => 400,
+            'PM' => 5000,
+            'VC' => 130,
+            'SM' => 5000,
+            'ST' => 440,
+            'SA' => 0,
+            'SN' => 865,
+            'YU' => 5000,
+            'SC' => 0,
+            'SL' => 0,
+            'SG' => 4580,
+            'SK' => 5000,
+            'SI' => 4400,
+            'SB' => 0,
+            'SO' => 440,
+            'ZA' => 1760,
+            'GS' => 510,
+            'KR' => 5000,
+            'ES' => 5000,
+            'LK' => 35,
+            'SD' => 0,
+            'SR' => 535,
+            'SZ' => 560,
+            'SE' => 5000,
+            'CH' => 5000,
+            'SY' => 3080,
+            'TW' => 1350,
+            'TJ' => 1350,
+            'TZ' => 230,
+            'TH' => 1350,
+            'TG' => 2190,
+            'TK' => 295,
+            'TO' => 515,
+            'TT' => 930,
+            'TN' => 2200,
+            'TR' => 880,
+            'TM' => 675,
+            'TC' => 0,
+            'TV' => 4715,
+            'UG' => 0,
+            'UA' => 5000,
+            'AE' => 5000,
+            'UY' => 0,
+            'UZ' => 5000,
+            'VU' => 0,
+            'VA' => 5000,
+            'VE' => 0,
+            'VN' => 0,
+            'WF' => 1615,
+            'WS' => 295,
+            'YE' => 0,
+            'ZM' => 540,
+            'ZW' => 600,
+            'US' => 5000
+    	);
+	}
+
+	function SetInsurance()
+	{
+		$this->insurance_cost = 0;
+
+		// Insurance module by Kevin Shelton
+		// divide the value of the order among the packages based on the order total or subtotal depending on whether or not you have configured to insure tax
+		$shipping_weight = $this->order['ShippingWeight'];
+		$shipping_num_boxes = $this->order['ShippingNumBoxes'];
+		$costperpkg = $this->order['SubTotal'] / $shipping_num_boxes;
+
+		// retrieve the maximum allowed insurance for the destination country and if the package value exceeds it then set package value to the maximum allowed
+
+		$maxins = $this->countryinsure[$this->order['ShippingCountry']];
+		if ($costperpkg > $maxins) $costperpkg = $maxins;
+
+		// if insurance not allowed for destination or insurance is turned off add nothing to shipping cost
+
+		if (($maxins == 0) || (MODULE_SHIPPING_USPS_INSURE == 'False')) {
+			$insurance = 0;
+		}
+		// US and Canada share the same insurance calculation (though not the same maximum)
+		else if (($this->order['ShippingCountry'] == 'US') || ($this->order['ShippingCountry'] == 'CA'))
+		{
+			if ($costperpkg<=50) {
+				$insurance=MODULE_SHIPPING_USPS_INS1;
+			}
+			else if ($costperpkg<=100) {
+				$insurance=MODULE_SHIPPING_USPS_INS2;
+			}
+			else if ($costperpkg<=200) {
+				$insurance=MODULE_SHIPPING_USPS_INS3;
+			}
+			else if ($costperpkg<=300) {
+				$insurance=MODULE_SHIPPING_USPS_INS4;
+			}
+			else {
+				$insurance = MODULE_SHIPPING_USPS_INS4 + ((ceil($costperpkg/100) -3) * MODULE_SHIPPING_USPS_INS5);
+			}
+		}
+		// if insurance allowed and is not US or Canada then calculate international insurance
+		else {
+			if ($costperpkg<=50) {
+			    $insurance=MODULE_SHIPPING_USPS_INS6;
+			}
+			else if ($costperpkg<=100) {
+			    $insurance=MODULE_SHIPPING_USPS_INS7;
+			}
+			else if ($costperpkg<=200) {
+			    $insurance=MODULE_SHIPPING_USPS_INS8;
+			}
+			else if ($costperpkg<=300) {
+			    $insurance=MODULE_SHIPPING_USPS_INS9;
+			}
+			else {
+			    $insurance = MODULE_SHIPPING_USPS_INS9 + ((ceil($costperpkg/100) - 3) * MODULE_SHIPPING_USPS_INS10);
+			}
+		}
+		// usps doesnt accept zero weight
+		$shipping_weight = ($shipping_weight < 0.1 ? 0.1 : $shipping_weight);
+		$shipping_pounds = floor ($shipping_weight);
+		$shipping_ounces = round(16 * ($shipping_weight - floor($shipping_weight)));
+		$this->_setWeight($shipping_pounds, $shipping_ounces);
+		// Added by Kevin Chen (kkchen@uci.edu); Fixes the Parcel Post Bug July 1, 2004
+		// Refer to http://www.usps.com/webtools/htm/Domestic-Rates.htm documentation
+		// Thanks Ryan
+		if($shipping_pounds > 35 || ($shipping_pounds == 0 && $shipping_ounces < 6)){
+			$this->_setMachinable('False');
+		}
+		else{
+			$this->_setMachinable('True');
+		}
+
+		$this->insurance_cost = $insurance;
+		// End Kevin Chen July 1, 2004
+	}
+
+	function _setService($service)
+	{
+		$this->service = $service;
+	}
+
+	function _setWeight($pounds, $ounces=0)
+	{
+		$this->pounds = $pounds;
+		$this->ounces = $ounces;
+	}
+
+	function _setContainer($container)
+	{
+		$this->container = $container;
+	}
+
+	function _setSize($size)
+	{
+		$this->size = $size;
+	}
+
+	function _setMachinable($machinable)
+	{
+		$this->machinable = $machinable;
+	}
+
+	function PhoneClean($phone)
+	{
+		$res = preg_replace('/[(]|[)]|[\-]|[ ]|[#]|[\.]|[a-z](.*)|[A-Z](.*)/g', '', $phone);
+		if ( strlen($res) > 10 ) {
+			$res = substr($res, 0, 10);
+		}
+		return $res != '' ? $res : $phone;
+	}
+
+	function GetQuote($method = '')
+	{
+		if ( isset($this->types[$method]) || in_array($method, $this->intl_types)) {
+			$this->_setService($method);
+		}
+		$this -> _setContainer('None');
+		$this -> _setSize('REGULAR');
+		$this -> SetInsurance(); // ???
+		if ($this->order['ShippingCountry'] == $this->shipping_origin_country) {
+			$request='<?xml version="1.0"?>';
+			// PASSWORD="'.$this->usps_password.'"
+			$request.= '<RateV3Request USERID="'.$this->usps_userid.'">';
+			$services_count = 0;
+			if (isset($this->service)) {
+				$this->types = array($this->service => $this->types[$this->service]);
+			}
+			$dest_zip = str_replace(' ', '', $this->order['ShippingZip']);
+			$dest_zip = substr($dest_zip, 0, 5);
+			reset($this->types);
+			$allowed_types = explode(", ", MODULE_SHIPPING_USPS_TYPES);
+
+	    	while (list($key, $value) = each($this->types))
+	    	{
+	 		 	if ( !in_array($key, $allowed_types) ) continue;
+				$request .= '<Package ID="'.$services_count.'">'.
+				          '<Service>'.$key.'</Service>'.
+				          '<ZipOrigination>'.$this->store_zip5.'</ZipOrigination>'.
+				          '<ZipDestination>'.$dest_zip.'</ZipDestination>'.
+				          '<Pounds>'.$this->pounds.'</Pounds>'.
+				          '<Ounces>'.$this->ounces.'</Ounces>'.
+				          '<Size>'.$this->size.'</Size>'.
+				          '<Machinable>'.$this->machinable.'</Machinable>'.
+				          '</Package>';
+	     	 	$services_count++;
+			}
+			$request .= '</RateV3Request>';
+			$api_query = 'RateV3';
+		}
+	  	else {
+			$request  = '<IntlRateRequest USERID="'.$this->usps_userid.'">'.
+			            '<Package ID="0">'.
+			            '<Pounds>'.$this->pounds.'</Pounds>'.
+			            '<Ounces>'.$this->ounces.'</Ounces>'.
+			            '<MailType>Package</MailType>'.
+			            '<Country>'.$this->countries[$this->order['ShippingCountry']].'</Country>'.
+			            '</Package>'.
+			            '</IntlRateRequest>';
+			$api_query = 'IntlRate';
+		}
+		$request = 'API='.$api_query.'&XML=' . kUtil::escape($request, kUtil::ESCAPE_URL);
+		$body = $this->PostQuery($request);
+		$body = str_replace(chr(146), '', $body); // for bad `
+
+		// check for errors
+		if (strpos($body, '<Error>') !== false) {
+			$errors = Array ();
+			preg_match_all('/<Number>(.*?)<\/Number>/s', $body, $error_numbers);
+			preg_match_all('/<Description>(.*?)<\/Description>/s', $body, $error_descriptions);
+
+			foreach ($error_numbers[1] as $index => $error_number) {
+				$errors[$index] = $error_descriptions[1][$index];
+				if ($this->Application->isDebugMode()) {
+					$errors[$index] .= ' (' . $error_number . ')';
+				}
+			}
+
+			$errors = array_unique($errors); // we may have same errors on many packages, so don't show duplicates
+			return Array('error' => implode('<br/>', $errors));
+		}
+
+		// parse response
+
+		/** @var kXMLHelper $xml_helper */
+		$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+		/** @var kXMLNode $root_node */
+		$root_node =& $xml_helper->Parse($body);
+
+		$rates = Array();
+		// Domestic shipping
+		if ($this->order['ShippingCountry'] == $this->shipping_origin_country) {
+			$i = 0;
+			$postage_node =& $root_node->FindChild('Package');
+			do {
+				// $parcel_node =& $postage_node->firstChild;
+				$service = $postage_node->FindChildValue('MailService');
+				if ( $service != '' ) {
+					$i++;
+					$rates[$i] = Array();
+					$rates[$i]['Title'] = $service;
+					$rates[$i]['Rate'] = $this->insurance_cost + $postage_node->FindChildValue('Rate');
+				}
+			}
+			while ( $postage_node =& $postage_node->NextSibling());
+		}
+		else {
+			// for International Rates !!!
+		    $allowed_types = array();
+			foreach( explode(", ", MODULE_SHIPPING_USPS_TYPES_INTL) as $value ) {
+				$allowed_types[$value] = $this->intl_types[$value];
+			}
+			$i = 0;
+			$service_node =& $root_node->FindChild('Service');
+			do {
+				$service = trim($service_node->FindChildValue('SvcDescription'));
+				if( !in_array($service, $allowed_types) ) continue;
+				$i++;
+				if ( $service_node->FindChildValue('MaxWeight') >= $this->pounds ) {
+					$rates[$i] = Array();
+					$rates[$i]['Title'] = $service;
+					$rates[$i]['MaxDimensions'] = $service_node->FindChildValue('MaxDimensions');
+					$rates[$i]['MaxWeight'] = $service_node->FindChildValue('MaxWeight');
+					$rates[$i]['SvcCommitments'] = $service_node->FindChildValue('SvcCommitments');
+					$rates[$i]['Rate'] = $this->insurance_cost + $service_node->FindChildValue('Postage');
+				}
+			}
+			while ( $service_node =& $service_node->NextSibling());
+	  	}
+	  	// print_r($rates);
+	  	// die('here');
+		return $rates;
+	}
+
+	function PostOrder()
+	{
+		$request='';
+		$base_request = '';
+		$this->SetInsurance();
+		// $this->order['ShippingCountry'] = $this->GetUSPSCountry($this->order['ShippingCountry']);
+
+		// Domestic Order
+		if ($this->order['ShippingCountry'] == $this->shipping_origin_country) {
+
+			// $dest_zip = str_replace(' ', '', $this->order['ShippingZip5']);
+			$this->order['ShippingZip5'] = substr($this->order['ShippingZip5'], 0, 5);
+			$WeightInOunces = floor($this->pounds * 16 + $this->ounces);
+
+			$base_request ='
+			<Option>1</Option>
+			<ImageParameters></ImageParameters>
+			<FromName>'.$this->store_name.'</FromName>
+			<FromFirm>'.$this->company_name.'</FromFirm>
+			<FromAddress1>'.$this->store_address1.'</FromAddress1>
+			<FromAddress2>'.$this->store_address2.'</FromAddress2>
+			<FromCity>'.$this->store_city.'</FromCity>
+			<FromState>'.$this->store_state.'</FromState>
+			<FromZip5>'.$this->store_zip5.'</FromZip5>
+			<FromZip4>'.$this->store_zip4.'</FromZip4>
+			<ToName>'.$this->order['FirstName'].' '.$this->order['LastName'].'</ToName>
+			<ToFirm>'.$this->order['ShippingCompany'].'</ToFirm>
+			<ToAddress1>'.$this->order['ShippingAddress2'].'</ToAddress1>
+			<ToAddress2>'.$this->order['ShippingAddress1'].'</ToAddress2>
+			<ToCity>'.$this->order['ShippingCity'].'</ToCity>
+			<ToState>'.$this->order['ShippingState'].'</ToState>
+			<ToZip5>'.$this->order['ShippingZip5'].'</ToZip5>
+			<ToZip4>'.$this->order['ShippingZip4'].'</ToZip4>
+			<WeightInOunces>'.$WeightInOunces.'</WeightInOunces>
+			<ServiceType>'.$this->order['ShippingService'].'</ServiceType>
+			<ImageType>PDF</ImageType>
+			<LabelDate>'.date('m/d/Y',time()).'</LabelDate>
+			<CustomerRefNo></CustomerRefNo>
+			<AddressServiceRequested></AddressServiceRequested>
+			<SenderName></SenderName><SenderEMail></SenderEMail>
+			<RecipientName></RecipientName>
+			<RecipientEMail></RecipientEMail>
+			';
+
+			$api_query = 'DeliveryConfirmationV3';
+			$xml_request = 'DeliveryConfirmationV3.0Request';
+		}
+		else {
+
+			// International Order(s)
+			$shipping_service = strtolower($this->order['ShippingService']);
+
+		    $base_request = '<Option/>
+		    <ImageParameters/>
+		    <FromFirstName>'.$this->store_first_name.'</FromFirstName>
+		    <FromLastName>'.$this->store_last_name.'</FromLastName>
+		    <FromFirm>'.$this->company_name.'</FromFirm>
+		    <FromAddress1>'.$this->store_address1.'</FromAddress1>
+		    <FromAddress2>'.$this->store_address2.'</FromAddress2>
+		    <FromCity>'.$this->store_city.'</FromCity>
+		    <FromState>'.$this->store_state.'</FromState>
+		    <FromZip5>'.$this->store_zip5.'</FromZip5>
+		    <FromPhone>'.$this->PhoneClean($this->store_phone).'</FromPhone>
+		    <ToName>'.$this->order['FirstName'].' '.$this->order['LastName'].'</ToName>
+		    <ToFirm>'.$this->order['ShippingCompany'].'</ToFirm>
+		    <ToAddress1></ToAddress1>
+		    <ToAddress2>'.$this->order['ShippingAddress2'].'</ToAddress2>
+		    <ToAddress3>'.$this->order['ShippingAddress1'].'</ToAddress3>
+		    <ToCity>'.$this->order['ShippingCity'].'</ToCity>';
+		    if ( $this->order['ShippingProvince'] != '' ) {
+		    	$base_request.='
+		    	<ToProvince>'.$this->order['ShippingProvince'].'</ToProvince>';
+		    }
+		    $base_request.='
+		    <ToCountry>'.$this->countries[$this->order['ShippingCountry']].'</ToCountry>
+		    <ToPostalCode>'.$this->order['ShippingZip'].'</ToPostalCode>
+		    <ToPOBoxFlag>N</ToPOBoxFlag>
+		    <ToPhone>'.$this->PhoneClean($this->order['ShippingPhone']).'</ToPhone>
+		    <ToFax>'.$this->PhoneClean($this->order['ShippingFax']).'</ToFax>
+		    <ToEmail>'.$this->order['Email'].'</ToEmail>
+		    <ShippingContents>';
+
+		    // add items
+			foreach ( $this->order['Items'] as $k => $value ) {
+				 $base_request.='
+				 <ItemDetail>
+					<Description>Computer Parts</Description>
+					<Quantity>'.$value['Qty'].'</Quantity>
+					<Value>'.($value['Price'] * $value['Qty']).'</Value>
+					<NetPounds>'.$value['NetPounds'].'</NetPounds>
+					<NetOunces>'.$value['NetOunces'].'</NetOunces>
+					<HSTariffNumber>123456</HSTariffNumber>
+					<CountryOfOrigin>United States</CountryOfOrigin>
+				 </ItemDetail>';
+			}
+		    // end add items
+
+		    $base_request.='
+		    </ShippingContents>
+		    <GrossPounds>'.$this->pounds.'</GrossPounds>
+		    <GrossOunces>'.$this->ounces.'</GrossOunces>
+		    <ContentType>MERCHANDISE</ContentType>
+		    <Agreement>Y</Agreement>
+		    <InvoiceNumber>'.$this->order['InvoiceNumber'].'</InvoiceNumber>
+		    <ImageType>PDF</ImageType>
+		    <ImageLayout>ALLINONEFILE</ImageLayout>
+		    <LabelDate>'.date('m/d/Y',time()).'</LabelDate>
+		    ';
+
+			if (strpos($shipping_service, 'express') !== false) {
+				$xml_request = 'ExpressMailIntlRequest';
+				$api_query = 'ExpressMailIntl';
+			}
+			elseif (strpos($shipping_service, 'priority') !== false) {
+				$xml_request = 'PriorityMailIntlRequest';
+				$api_query = 'PriorityMailIntl';
+			}
+			else {
+				$xml_request = 'FirstClassMailIntlRequest';
+				$api_query = 'FirstClassMailIntl';
+			}
+		}
+
+		$request.= '<'.$xml_request.' USERID="'.$this->usps_userid.'">';
+		$request.= $base_request;
+		$request.= '</'.$xml_request.'>';
+
+		// die($request);
+
+		$request = 'API='.$api_query.'&XML='.kUtil::escape($request, kUtil::ESCAPE_URL);
+
+		$body = $this->PostQuery($request, 1);
+
+		// check for errors
+		if (strpos($body, '<Error>') !== false) {
+			$errors = Array ();
+			preg_match_all('/<Number>(.*?)<\/Number>/s', $body, $error_numbers);
+			preg_match_all('/<Description>(.*?)<\/Description>/s', $body, $error_descriptions);
+
+			foreach ($error_numbers[1] as $index => $error_number) {
+				$errors[$index] = Array ('error_number' => $error_number, 'error_description' => $error_descriptions[1][$index]);
+			}
+
+			// TODO: find a way to return other error messages in same package as well
+			return $errors[0];
+		}
+
+		// parse response
+		$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+		/** @var kXMLNode $root_node */
+		$root_node =& $xml_helper->Parse($body);
+		$Postage = 0;
+
+		$label_file = $TrackingNumber = $PostnetBarCode = '';
+
+		// Domestic shipping
+		if ($this->order['ShippingCountry'] == $this->shipping_origin_country ) {
+			$delivery_node =& $root_node->FindChild('DeliveryConfirmationV3.0Response');
+			do {
+				$TrackingNumber = $delivery_node->FindChildValue('DeliveryConfirmationNumber');
+				$PostnetBarCode = $delivery_node->FindChildValue('Postnet');
+				$DeliveryConfirmationLabel = base64_decode($delivery_node->FindChildValue('DeliveryConfirmationLabel'));
+			}
+			while ( $delivery_node =& $delivery_node->NextSibling());
+		}
+		else {
+
+			if (strpos($shipping_service, 'express') !== false) {
+				$node_title = 'ExpressMailIntlResponse';
+			}
+			elseif (strpos($shipping_service, 'priority') !== false) {
+				$node_title = 'PriorityMailIntlResponse';
+			}
+			else {
+ 				$node_title = 'FirstClassMailIntlResponse';
+			}
+
+			$delivery_node =& $root_node->FindChild($node_title);
+			$PostnetBarCode = $delivery_node->FindChildValue('BarcodeNumber');
+			$Postage = $delivery_node->FindChildValue('Postage');
+			$DeliveryConfirmationLabel = base64_decode($delivery_node->FindChildValue('LabelImage'));
+
+		}
+
+		if ( $TrackingNumber != '' ) {
+			$label_file = USPS_LABEL_FOLDER.$TrackingNumber.".pdf";
+		}
+		elseif ( $PostnetBarCode != '' ) {
+			$label_file = USPS_LABEL_FOLDER.$PostnetBarCode.".pdf";
+		}
+
+		if ( $label_file != '' ) {
+			/** @var FileHelper $file_helper */
+			$file_helper = $this->Application->recallObject('FileHelper');
+
+			$file_helper->CheckFolder(USPS_LABEL_FOLDER);
+
+			if (!$handle = fopen($label_file, 'a')) echo "Cannot open file ($label_file)";
+			if ( @fwrite($handle, $DeliveryConfirmationLabel) === FALSE) echo "Cannot write to file ($label_file)";
+		}
+
+		return array('TrackingNumber' => $TrackingNumber, 'PostnetBarCode' => $PostnetBarCode, 'Postage' => $Postage);
+	}
+
+	function GetUSPSCountry($country, $default = 'US')
+	{
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$country = $cs_helper->getCountryIso($country);
+
+		return $country == '' ? $default : $country;
+	}
+
+	function GetShippingQuotes($params = null)
+	{
+		$weights = kUtil::Kg2Pounds($params['packages']['0']['weight']);
+		$weight = '';
+		$weight = $weights[0];
+		if ( $weights[1] != '' ) {
+			$weight.='.'.$weights[1];
+		}
+		$country = $this->GetUSPSCountry($params['dest_country']);
+
+		$this->order = Array();
+		$this->order['ShippingWeight'] = $weight;
+		$this->order['ShippingNumBoxes'] = 1;
+		$this->order['ShippingZip'] = $params['dest_postal'];
+		$this->order['SubTotal'] = $params['amount'];
+		$this->order['ShippingCountry'] = $country;
+
+		$shipping_types = Array();
+		$rates = $this->GetQuote();
+
+		if ( !isset($rates['error']) ) {
+			$this->Application->RemoveVar('sqe_error');
+
+			$i = 1;
+			foreach ($rates as $k => $rate ) {
+				 $shipping_types['USPS_'.$i] = Array(
+		            'ShippingId' => 'USPS_'.$i,
+		            'TotalCost' => $rate['Rate'],
+		            'ShippingName' => $rate['Title'],
+		            'Type' => '1',
+		            'CODFlat' => '0',
+		            'CODPercent' => '0',
+		            'PortalGroups' => ',15,',
+		            'InsuranceFee' => '',
+		            'COD' => '0',
+		            'SelectedOnly' => '0',
+		            'Code' => $rate['Title']
+				 );
+				 $i++;
+			}
+		}
+		else {
+			// for Front-End (shipping screen) and Admin (Shipping Tab on editing order)
+			$this->Application->StoreVar('sqe_error', $rates['error']);
+		}
+
+		$this->Application->StoreVar('current_usps_shipping_types', serialize($shipping_types));
+		return $shipping_types;
+	}
+
+	function TrackOrder($TrackingNumber='')
+	{
+		if ( $TrackingNumber != '' ) {
+			// http://testing.shippingapis.com/ShippingAPITest.dll?API=TrackV2&XML=<TrackFieldRequest USERID="402INTEC7634"><TrackID ID="EJ958083578US"></TrackID></TrackFieldRequest>
+
+			$request = '<TrackRequest USERID="'.$this->usps_userid.'"><TrackID ID="'.$TrackingNumber.'"></TrackID></TrackRequest>';
+			$api_query = 'TrackV2';
+			$request = 'API='.$api_query.'&XML='.kUtil::escape($request, kUtil::ESCAPE_URL);
+			$body = $this->PostQuery($request);
+
+			// check for errors
+			if (strpos($body, '<Error>') !== false) {
+				$errors = Array ();
+				preg_match_all('/<Number>(.*?)<\/Number>/s', $body, $error_numbers);
+				preg_match_all('/<Description>(.*?)<\/Description>/s', $body, $error_descriptions);
+
+				foreach ($error_numbers[1] as $index => $error_number) {
+					$errors[$index] = $error_descriptions[1][$index];
+					if ($this->Application->isDebugMode()) {
+						$errors[$index] .= ' (' . $error_number . ')';
+					}
+				}
+
+				$errors = array_unique($errors); // we may have same errors on many packages, so don't show duplicates
+				return Array('error' => implode('<br/>', $errors));
+			}
+
+			$xml_helper = $this->Application->recallObject('kXMLHelper');
+
+			/** @var kXMLNode $root_node */
+			$root_node =& $xml_helper->Parse($body);
+
+			// Tracking Shipping
+			$delivery_node =& $root_node->FindChild('TrackInfo');
+			$TrackSummary = $delivery_node->FindChildValue('TrackSummary');
+			// echo ' TrackSummary ('.$TrackingNumber.') = '.$TrackSummary.'<br>';
+
+			return strpos($TrackSummary, 'delivered') !== false ? 1 : 0;
+		}
+		else
+			return false;
+	}
+
+	function ProcessTrackOrders()
+	{
+		$sql = sprintf('SELECT `OrderId`, `ShippingTracking` FROM %s WHERE `Status` > 3 AND `Delivered` = 0', TABLE_PREFIX.'Orders');
+		$orders = $this->Application->Conn->Query($sql);
+		foreach ( $orders as $k => $order ) {
+			// try to track order
+			if ( $order['ShippingTracking'] != '' && $this->TrackOrder($order['ShippingTracking']) ) {
+				$update_order = sprintf("UPDATE %s SET `Delivered` = 1 WHERE %s = %s",
+					TABLE_PREFIX.'Orders',
+					$this->Application->getUnitOption('ord', 'IDField'),
+					$order[$this->Application->getUnitOption('ord', 'IDField')]
+				);
+				$this->Application->Conn->Query($update_order);
+			}
+		}
+	}
+
+	function PostQuery($request, $secure=0)
+	{
+		switch (MODULE_SHIPPING_USPS_SERVER) {
+			case 'production':
+				$usps_server = $secure > 0 ? 'https://secure.shippingapis.com' : 'http://production.shippingapis.com' ;
+			    $api_dll = 'ShippingAPI.dll';
+			break;
+
+			case 'test':
+				$usps_server = $secure > 0 ? 'https://secure.shippingapis.com' : 'http://testing.shippingapis.com';
+				$api_dll = 'ShippingAPITest.dll';
+			break;
+		}
+
+		$curl = curl_init();
+		curl_setopt($curl, CURLOPT_URL, $usps_server.'/'.$api_dll.'?'.$request);
+		curl_setopt($curl, CURLOPT_HEADER, 0);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		$body = curl_exec($curl);
+		curl_close($curl);
+
+		if ($this->logFilePath) {
+			$fp = fopen($this->logFilePath, 'a');
+
+			if ($fp) {
+				$request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n",
+			   		adodb_date('m/d/Y H:i:s'),
+					$this->Application->getClientIp(),
+			   		$usps_server . '/' . $api_dll . '?' . urldecode($request),
+			   		$body
+			   	);
+
+			   	fwrite($fp, $request_url);
+			   	fclose($fp);
+			}
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Returns available shipping types
+	 *
+	 * @return Array
+	 * @todo Get possible shipping types based on MODULE_SHIPPING_USPS_TYPES and MODULE_SHIPPING_USPS_TYPES_INTL consntants
+	 */
+	function GetAvailableTypes()
+	{
+		return Array (
+			Array (
+				'_ClassName' => get_class($this),
+				'_Id' => 'USPS',
+				'_Name' => 'USPS (Default)'
+			)
+		);
+	}
+
+	function LoadParams()
+	{
+		$sql = 'SELECT Properties FROM '.$this->Application->getUnitOption('sqe', 'TableName').'
+				WHERE ClassName="USPS"';
+		$params = $this->Conn->GetOne($sql);
+
+		return unserialize($params);
+	}
+
+	function _prepare_xml_param($value) {
+		return strip_tags($value);
+	}
+
+	/**
+	 * Returns virtual field names, that will be saved as properties
+	 *
+	 * @return Array
+	 */
+	function GetEngineFields()
+	{
+		return Array ('AccountLogin');
+	}
+
+	/**
+	 * Creates new USPS order
+	 *
+	 * @param OrdersItem $object
+	 * @param bool $dry_run
+	 * @return Array
+	 */
+	function MakeOrder(&$object, $dry_run = false)
+	{
+		$ShippingInfo = unserialize($object->GetDBField('ShippingInfo'));
+		$ShippingCode = $USPSMethod = '';
+		$ShippingCountry = $this->GetUSPSCountry($object->GetDBField('ShippingCountry'));
+
+		$UserName = explode(" ", $object->GetDBField('ShippingTo'));
+
+		$item_table = TABLE_PREFIX.'OrderItems';
+		if ($this->Application->isAdminUser) {
+			// this strange contraption actually uses temp table from object (when in temp mode)
+			$order_table = $object->TableName;
+			$item_table = str_replace('Orders', 'OrderItems', $order_table);
+		}
+
+		$sOrder = Array (
+			'FirstName' => $UserName[0],
+			'LastName' => $UserName[1],
+			'ShippingCompany' => $object->GetDBField('ShippingCompany'),
+			'ShippingAddress1' => $object->GetDBField('ShippingAddress1'),
+			'ShippingAddress2' => $object->GetDBField('ShippingAddress2'),
+			'ShippingCity' => $object->GetDBField('ShippingCity'),
+			'ShippingZip' => $object->GetDBField('ShippingZip'),
+			'ShippingCountry' => $ShippingCountry,
+			'ShippingPhone' => $this->PhoneClean($object->GetDBField('ShippingPhone')),
+			'ShippingFax' =>  $this->PhoneClean($object->GetDBField('ShippingFax')),
+			'ShippingNumBoxes' => '1',
+		);
+
+		$sql = 'SELECT SUM(`Quantity` * `Weight`)
+				FROM ' . $item_table . '
+				WHERE ' . $object->IDField . ' = ' . $object->GetID();
+		$weight = $this->Application->Conn->GetOne($sql);
+
+		$f_weight = kUtil::Kg2Pounds($weight);
+		$sOrder['ShippingWeight'] = $f_weight[0].'.'.$f_weight[1];
+
+		foreach ($ShippingInfo as $k => $ShippingRow) {
+			$ShippingCode = $ShippingRow['Code'];
+		}
+
+		if ( $object->GetDBField('ShippingCountry') == 'USA' ) {
+			$sOrder['ShippingState'] = $object->GetDBField('ShippingState');
+			$USPSMethod = $ShippingCode;
+			unset($sOrder['ShippingZip']);
+
+			$sOrder['ShippingZip5'] = substr(trim($object->GetDBField('ShippingZip')), 0, 5);
+			$sOrder['ShippingZip4'] = '';
+			$sOrder['SubTotal'] = $object->GetDBField('SubTotal');
+		}
+		else {
+			$USPSMethod = array_search($ShippingCode, $this->intl_types);
+			$sOrder['ShippingProvince'] = '';
+
+			if ( $ShippingCountry == 'CA' ) {
+				$sOrder['ShippingProvince'] = $object->GetField('ShippingState');
+			}
+
+			// add items
+			$sql = 'SELECT `Quantity`, `Weight`, `Price`
+					FROM ' . $item_table . '
+					WHERE ' . $object->IDField . ' = ' . $object->GetID();
+			$order_items = $this->Application->Conn->Query($sql);
+
+			$i = 1;
+			$Items = Array();
+
+			foreach ($order_items as $k => $order_item) {
+				$p_weight = Array();
+				$p_weight = kUtil::Kg2Pounds($order_item['Weight']);
+				$Items[$i] = Array('Qty' => $order_item['Quantity'], 'Price' => $order_item['Price'], 'NetPounds' => $p_weight[0], 'NetOunces' => $p_weight[1]);
+				$i++;
+			}
+
+			$sOrder['Items'] = $Items;
+			$sOrder['InvoiceNumber'] = $object->GetDBField('OrderNumber');
+		}
+
+		$sOrder['ShippingService'] = $USPSMethod;
+
+		// make USPS order
+		$this->order = $sOrder;
+		$usps_data = $this->PostOrder();
+
+		// if errors
+		if ( array_key_exists('error_number', $usps_data) ) {
+			return $usps_data;
+		}
+
+		if ( array_key_exists('Postage', $usps_data) ) {
+			$ShippingPrice = '';
+			$ShippingPrice = $usps_data['Postage'];
+		}
+
+		$ShippingTracking = '';
+
+		if ( isset($usps_data['TrackingNumber']) && $usps_data['TrackingNumber'] != '' ) {
+			$ShippingTracking = $usps_data['TrackingNumber'];
+		}
+
+		if ( isset($usps_data['PostnetBarCode']) && $usps_data['PostnetBarCode'] != '' && $ShippingTracking == '' ) {
+			$ShippingTracking = $usps_data['PostnetBarCode'];
+		}
+
+		if ($dry_run == false) {
+			$object->SetDBField('ShippingTracking', $ShippingTracking);
+			$object->Update();
+		}
+		else {
+			$full_path = USPS_LABEL_FOLDER . $ShippingTracking . ".pdf";
+
+			if (file_exists($full_path)) {
+				unlink($full_path);
+			}
+		}
+
+		return $usps_data;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/usps.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engines_config.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engines_config.php	(revision 16630)
@@ -0,0 +1,223 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'sqe',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ShippingQuoteEngineEventHandler', 'file' => 'shipping_quote_engine_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'ShippingQuoteEngine', 'class' => 'ShippingQuoteEngine', 'file' => 'shipping_quote_engine.php', 'build_event' => ''),
+		Array ('pseudo' => 'CustomShippingQuoteEngine', 'class' => 'CustomShippingQuoteEngine', 'file' => 'custom_shipping_quote_engine.php', 'build_event' => ''),
+		Array ('pseudo' => 'Intershipper', 'class' => 'Intershipper', 'file' => 'intershipper.php', 'build_event' => ''),
+		Array ('pseudo' => 'USPS', 'class' => 'USPS', 'file' => 'usps.php', 'build_event' => ''),
+		Array ('pseudo' => 'ShippingQuoteCollector', 'class' => 'ShippingQuoteCollector', 'file' => 'shipping_quote_collector.php', 'build_event' => ''),
+	),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'EngineId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'edit_status_labels' => Array ('sqe' => '!la_title_EditingShippingQuoteEngine!'),
+		),
+		'engine_list' =>Array (
+			'prefixes' => Array ('sqe_List'), 'format' => "!la_title_ShippingQuoteEngines!",
+		),
+		'engine_edit' =>Array (
+			'prefixes' => Array ('sqe'), 'format' => "#sqe_status# '#sqe_titlefield#' - !la_title_General!",
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:shipping_quote_engines'),
+
+	'Sections' => Array (
+		'in-commerce:shipping_quote_engines' => Array (
+			'parent' => 'in-commerce:shipping_folder',
+			'icon' => 'conf_shipping',
+			'label' => 'la_tab_ShippingQuoteEngines',
+			'url' => Array ('t' => 'in-commerce/shipping/shipping_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'edit', 'advanced:approve', 'advanced:decline'),
+			'priority' => 4.2,
+			'type' => stTAB,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'ShippingQuoteEngines',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'FlatSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+		'PercentSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'error_msgs' => Array (
+				'curl_not_present' => '!la_error_EnableCurlFirst!',
+				'from_info_not_filled_in' => '!la_error_FillInShippingFromAddress!',
+			),
+			'default' => 0, 'not_null' => 1,
+		),
+		'Properties' => Array ('type' => 'string', 'default' => NULL),
+		'ClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+	),
+
+	'VirtualFields' => Array (
+		'AccountLogin' => Array ('type' => 'string', 'default' => ''),
+		'AccountPassword' => Array ('type' => 'string', 'default' => ''),
+		'UPSEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'UPSAccount' => Array ('type' => 'string', 'default' => ''),
+		'UPSInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'FDXEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'FDXAccount' => Array ('type' => 'string', 'default' => ''),
+		'FDXInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'DHLEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'DHLAccount' => Array ('type' => 'string', 'default' => ''),
+		'DHLInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'USPEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'USPAccount' => Array ('type' => 'string', 'default' => ''),
+		'USPInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'ARBEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'ARBAccount' => Array ('type' => 'string', 'default' => ''),
+		'ARBInvoiced' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			'default' => 0
+		),
+		'1DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'2DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'3DYEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'GNDEnabled' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			'default' => 0
+		),
+		'ShipMethod' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				'DRP' => 'Drop-Off At Carrier Location',
+				'PCK' => 'Schedule A Special Pickup',
+				'SCD' => 'Regularly Scheduled Pickup'),
+			'default' => null
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+				'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'FlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
+				'PercentSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engines_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/intershipper.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/intershipper.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/intershipper.php	(revision 16630)
@@ -0,0 +1,517 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class Intershipper extends ShippingQuoteEngine {
+
+	var $state = Array();
+	var $quote = Array();
+	var $quotes = Array();
+	var $package_id;
+	var $box_id;
+	var $shipment_id;
+
+	var $FlatSurcharge = 0;
+	var $PercentSurcharge = 0;
+
+	function _stripTags($params)
+	{
+		foreach ($params as $param_name => $param_value) {
+			if (is_array($param_value)) {
+				$params[$param_name] = $this->_stripTags($param_value);
+			}
+			else {
+				$params[$param_name] = strip_tags($param_value);
+			}
+		}
+
+		return $params;
+	}
+
+	function BuildUrl($params = null)
+	{
+		$params = $this->_stripTags($params);
+
+		$this->shipment_id = isset($params['shipment_id']) ? $params['shipment_id'] : $this->GenerateId();
+		$url = 'www.intershipper.com/Interface/Intershipper/XML/v2.0/HTTP.jsp';
+		$uri =	'Username='.			$params['AccountLogin'].
+				'&Password='.			$params['AccountPassword'].
+				'&Version='.			'2.0.0.0'.
+				'&ShipmentID='.			$this->shipment_id.
+				'&QueryID='.			$this->shipment_id.
+				'&TotalCarriers='.		count($params['carriers']);
+
+		$i = 0;
+		foreach($params['carriers'] as $carrier)
+		{
+			$i++;
+			$uri .= '&CarrierCode'.$i.'='.	kUtil::escape($carrier['name'], kUtil::ESCAPE_URL).
+			'&CarrierAccount'.$i.'='.		kUtil::escape($carrier['account'], kUtil::ESCAPE_URL).
+			'&CarrierInvoiced'.$i.'='.		$carrier['invoiced'];
+		}
+
+		$uri .= '&TotalClasses='.	count($params['classes']);
+		$i = 0;
+		foreach($params['classes'] as $class)
+		{
+			$i++;
+			$uri .= '&ClassCode'.$i.'='.	$class;
+		}
+		$uri .= '&DeliveryType='.	'COM'.
+			'&ShipMethod='.			$params['ShipMethod'].
+
+			'&OriginationName='.	kUtil::escape( $params['orig_name'], kUtil::ESCAPE_URL ).
+			'&OriginationAddress1='.kUtil::escape( $params['orig_addr1'], kUtil::ESCAPE_URL ).
+			'&OriginationAddress2='.kUtil::escape( $params['orig_addr2'], kUtil::ESCAPE_URL ).
+			'&OriginationCity='.	kUtil::escape( $params['orig_city'], kUtil::ESCAPE_URL ).
+			'&OriginationState='.	kUtil::escape( $params['orig_state'], kUtil::ESCAPE_URL ).
+			'&OriginationPostal='.	kUtil::escape( $params['orig_postal'], kUtil::ESCAPE_URL ).
+			'&OriginationCountry='.	kUtil::escape( $params['orig_country'], kUtil::ESCAPE_URL ).
+
+			'&DestinationName='.	kUtil::escape( $params['dest_name'], kUtil::ESCAPE_URL ).
+			'&DestinationAddress1='.kUtil::escape( $params['dest_addr1'], kUtil::ESCAPE_URL ).
+			'&DestinationAddress2='.kUtil::escape( $params['dest_addr2'], kUtil::ESCAPE_URL ).
+			'&DestinationCity='.	kUtil::escape( $params['dest_city'], kUtil::ESCAPE_URL ).
+			'&DestinationState='.	kUtil::escape( $params['dest_state'], kUtil::ESCAPE_URL ).
+			'&DestinationPostal='.	kUtil::escape( $params['dest_postal'], kUtil::ESCAPE_URL ).
+			'&DestinationCountry='.	kUtil::escape( $params['dest_country'], kUtil::ESCAPE_URL ).
+
+			'&Currency='.			'USD'.
+			'&TotalPackages='.		count($params['packages']);
+
+		$i = 0;
+		foreach($params['packages'] as $package)
+		{
+			$i++;
+			$uri .=	'&BoxID'.$i.'='.	kUtil::escape( $package['package_key'] , kUtil::ESCAPE_URL ).
+			'&Weight'.$i.'='.			$package['weight'].
+			'&WeightUnit'.$i.'='.		$package['weight_unit'].
+			'&Length'.$i.'='.			$package['length'].
+			'&Width'.$i.'='.			$package['width'].
+			'&Height'.$i.'='.			$package['height'].
+			'&DimensionalUnit'.$i.'='.	$package['dim_unit'].
+			'&Packaging'.$i.'='.		$package['packaging'].
+			'&Contents'.$i.'='.			$package['contents'].
+			'&Insurance'.$i.'='.		$package['insurance'];
+		}
+
+		return Array('url' => $url, 'uri' => $uri);
+	}
+
+	function MergeParams($custom_params)
+	{
+		$params = $this->LoadParams();
+
+		$this->FlatSurcharge = $params['FlatSurcharge'];
+		$this->PercentSurcharge = $params['PercentSurcharge'];
+
+		if($custom_params['carriers'])
+		{
+			$params['carriers'] = $custom_params['carriers'];
+		}
+		else
+		{
+			$carrier_codes = Array('UPS', 'FDX', 'DHL', 'USP', 'ARB');
+			$i = 0;
+			foreach($carrier_codes as $carrier)
+			{
+				if(isset($params[$carrier.'Enabled']) && $params[$carrier.'Enabled'])
+				{
+					$i++;
+					$params['carriers'][$i]['name'] = $carrier;
+					$params['carriers'][$i]['account'] = $params[$carrier.'Account'];
+					$params['carriers'][$i]['invoiced'] = (int) $params[$carrier.'Invoiced'];
+				}
+			}
+		}
+
+		if($custom_params['classes'])
+		{
+			$params['classes'] = $custom_params['classes'];
+		}
+		else
+		{
+			$classes = Array('1DY', '2DY', '3DY', 'GND');
+			foreach($classes as $class)
+			{
+				if(isset($params[$class.'Enabled']) && $params[$class.'Enabled'])
+				{
+					$params['classes'][] = $class;
+				}
+			}
+		}
+
+		if (isset($custom_params['orig_addr1'])) {
+			$params['orig_name']		=	$custom_params['orig_name'];
+			$params['orig_addr1']		=	$custom_params['orig_addr1'];
+			$params['orig_addr2']		=	$custom_params['orig_addr2'];
+			$params['orig_city']		=	$custom_params['orig_city'];
+			$params['orig_state']		=	$custom_params['orig_state'];
+			$params['orig_postal']		=	$custom_params['orig_postal'];
+			$params['orig_country']		=	$custom_params['orig_country'];
+		}
+		else {
+			$params['orig_name']		=	$this->Application->ConfigValue('Comm_StoreName');
+			$params['orig_addr1']		=	$this->Application->ConfigValue('Comm_Shipping_AddressLine1');
+			$params['orig_addr2']		=	$this->Application->ConfigValue('Comm_Shipping_AddressLine2');
+			$params['orig_city']		=	$this->Application->ConfigValue('Comm_Shipping_City');
+			$params['orig_state']		=	$this->Application->ConfigValue('Comm_Shipping_State');
+			$params['orig_postal']		=	$this->Application->ConfigValue('Comm_Shipping_ZIP');
+			$params['orig_country']		=	$this->Application->ConfigValue('Comm_Shipping_Country');
+		}
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		if (strlen($params['orig_country']) == 3) {
+			// got 3symbol ISO code -> resolve to 2symbol ISO code
+			$params['orig_country'] = $cs_helper->getCountryIso( $params['orig_country'] );
+		}
+
+		if (strlen($params['orig_state']) != 2) {
+			// got state name instead of ISO code -> resolve it to ISO code
+			$country_iso = $cs_helper->getCountryIso($params['orig_country'], true);
+			$params['orig_state'] = $cs_helper->getStateIso($params['orig_state'], $country_iso);
+		}
+
+		if (isset($custom_params['ShipMethod'])) {
+			$params['ShipMethod']	=	$custom_params['ShipMethod'];
+		}
+
+		$params['packages']			=	$custom_params['packages'];
+
+		$params['dest_name']		=	$custom_params['dest_name'];
+		$params['dest_addr1']		=	$custom_params['dest_addr1'];
+		$params['dest_addr2']		=	$custom_params['dest_addr2'];
+		$params['dest_city']		=	$custom_params['dest_city'];
+		$params['dest_state']		=	$custom_params['dest_state'];
+		$params['dest_postal']		=	$custom_params['dest_postal'];
+		$params['dest_country']		=	$custom_params['dest_country'];
+
+		if (strlen($params['dest_country']) == 3) {
+			// got 3symbol ISO code -> resolve to 2symbol ISO code
+			$params['dest_country'] = $cs_helper->getCountryIso( $params['dest_country'] );
+		}
+
+		if(!$params['dest_city'] || !$params['dest_country'] ||
+				(($params['dest_country'] == 'US' || $params['dest_country'] == 'CA') && !$params['dest_state']) ||
+				!$params['dest_postal'] || !$params['packages'])
+		{
+			$valid = false;
+		}
+		else
+		{
+			$valid = true;
+		}
+
+		return $valid ? $params : false;
+	}
+
+	function GenerateId()
+	{
+		static $id;
+		if(!$id)
+		{
+			$id = rand(0, 1000000);
+		}
+		return $id;
+	}
+
+	function getShipmentId()
+	{
+		return $this->shipment_id;
+	}
+
+	function GetShippingQuotes($params = null)
+	{
+		if(!is_array($params)) $params = unserialize($params);
+		$params = $this->MergeParams($params);
+
+		if($params == false)
+		{
+			trigger_error('Incorrect params given to <em>intershipper</em> engine', E_USER_WARNING);
+			return;
+		}
+
+		$target_url = $this->BuildUrl($params);
+		// print_r($target_url);
+
+		$depth = Array();
+
+		$xml_parser = xml_parser_create();
+		xml_set_element_handler( $xml_parser, Array(&$this, 'startElement'), Array(&$this, 'endElement') );
+		xml_set_character_data_handler( $xml_parser, Array(&$this, 'characterData') );
+
+		/** @var kCurlHelper $curl_helper */
+		$curl_helper = $this->Application->recallObject('CurlHelper');
+
+		$curl_helper->SetPostData($target_url['uri']);
+		$newdata = $curl_helper->Send($target_url['url']);
+
+ 		$newdata = substr($newdata, strpos($newdata, '<'));
+
+		if (!xml_parse($xml_parser, $newdata, 1)) {
+    	    trigger_error(sprintf('XML error: %s at line %d'),
+			xml_error_string(xml_get_error_code($xml_parser)),
+			xml_get_current_line_number($xml_parser), E_USER_WARNING);
+		}
+
+		xml_parser_free($xml_parser);
+
+		return array_shift($this->quotes);		// array_shift must be removed after!!!
+	}
+
+	function startElement(&$Parser, &$Elem, $Attr)
+	{
+		array_push($this->state, $Elem);
+		$states = implode(' ',$this->state);
+		//check what state we are in
+		if($states == 'SHIPMENT PACKAGE') {
+			$this->package_id = $Attr['ID'];
+		}
+		elseif($states == 'SHIPMENT PACKAGE QUOTE') {
+			$quote = Array('package_id' => $this->package_id, 'id' => $Attr['ID']);
+		}
+	}
+
+	function characterData($Parser, $Line)
+	{
+		$states = join (' ',$this->state);
+		switch($states)
+		{
+			case 'SHIPMENT ERROR':
+				trigger_error($error = $Line, E_USER_WARNING);
+			break;
+			case 'SHIPMENT SHIPMENTID':
+				$this->shipment_id = $Line;
+			break;
+			case 'SHIPMENT PACKAGE BOXID':
+				$this->box_id = $Line;
+			break;
+		  	case 'SHIPMENT PACKAGE QUOTE CARRIER NAME':
+				$this->quote['carrier_name'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE CARRIER CODE':
+				$this->quote['carrier_code'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE CLASS NAME':
+				$this->quote['class_name'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE CLASS CODE':
+				$this->quote['class_code'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE SERVICE NAME':
+				$this->quote['service_name'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE SERVICE CODE':
+				$this->quote['service_code'] = $Line;
+			break;
+			case 'SHIPMENT PACKAGE QUOTE RATE AMOUNT':
+				$this->quote['amount'] = $Line / 100;
+			break;
+			default:
+		}
+	}
+
+	function endElement($Parser, $Elem)
+	{
+		$states = implode(' ',$this->state);
+		if ($states == 'SHIPMENT PACKAGE QUOTE') {
+			unset($this->quote['id']);
+			unset($this->quote['package_id']);
+			// the $key is a combo of the carrier_code and service_code
+			// this is the logical way to key each quote returned
+
+			$this->quote['amount'] = $this->quote['amount']*(1+$this->PercentSurcharge/100) + $this->FlatSurcharge;
+
+			$amount_plain = $this->quote['amount'] * 100;
+			$key = 'INTSH_'.$this->quote['carrier_code'].'_'.$this->quote['class_code'].'_'.$amount_plain;
+			$this->quote['ShippingId'] = $key;
+			$this->quote['ShippingName'] = $this->quote['carrier_code'].' - '.$this->quote['service_name'];
+			$this->quote['TotalCost'] = $this->quote['amount'];
+			$this->quotes[$this->box_id][$key] = $this->quote;
+
+		}
+		array_pop($this->state);
+	}
+
+	function LoadParams()
+	{
+		$sql = 'SELECT Properties, FlatSurcharge, PercentSurcharge FROM '.$this->Application->getUnitOption('sqe', 'TableName').'
+				WHERE Name="Intershipper.com"';
+		$data = $this->Conn->GetRow($sql);
+
+		$params = unserialize(getArrayValue($data, 'Properties'));
+		return array_merge($params, array('FlatSurcharge' => $data['FlatSurcharge'], 'PercentSurcharge' => $data['PercentSurcharge']));
+	}
+
+	function GetAvailableTypes()
+	{
+		$params = $this->LoadParams();
+
+		$carrier_codes = Array('UPS', 'FDX', 'DHL', 'USP', 'ARB');
+		$classes = Array('1DY', '2DY', '3DY', 'GND');
+		$i = 0;
+		foreach($carrier_codes as $carrier)
+		{
+			if(isset($params[$carrier.'Enabled']) && $params[$carrier.'Enabled'])
+			{
+				foreach($classes as $class)
+				{
+					if(isset($params[$class.'Enabled']) && $params[$class.'Enabled'])
+					{
+						$a_type['_ClassName'] = get_class($this);
+						$a_type['_Id'] = 'INTSH_'.$carrier.'_'.$class;
+						$a_type['_Name'] = '(Intershipper) '.$carrier.' '.$class;
+						$ret[] = $a_type;
+					}
+				}
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * Returns virtual field names, that will be saved as properties
+	 *
+	 * @return Array
+	 */
+	function GetEngineFields()
+	{
+		return Array (
+			'AccountLogin',
+			'UPSEnabled', 'UPSAccount', 'UPSInvoiced', 'FDXEnabled', 'FDXAccount', 'FDXInvoiced',
+			'DHLEnabled', 'DHLAccount', 'DHLInvoiced', 'USPEnabled', 'USPAccount', 'USPInvoiced',
+			'ARBEnabled', 'ARBAccount', 'ARBInvoiced', '1DYEnabled', '2DYEnabled', '3DYEnabled',
+			'GNDEnabled', 'ShipMethod',
+		);
+	}
+}
+
+/*$params = Array(
+	'AccountLogin'		=>	'login',
+	'AccountPassword'	=>	'password',
+	'carriers'	=>	Array(
+						Array(
+							'name'		=>	'UPS',
+							'account'	=>	'',
+							'invoiced'	=>	'0'
+						),
+						Array(
+							'name'		=>	'DHL',
+							'account'	=>	'',
+							'invoiced'	=>	'0'
+						),
+						Array(
+							'name'		=>	'FDX',
+							'account'	=>	'',
+							'invoiced'	=>	'0'
+						),
+						Array(
+							'name'		=>	'USP',
+							'account'	=>	'',
+							'invoiced'	=>	'0'
+						),
+						Array(
+							'name'		=>	'ARB',
+							'account'	=>	'',
+							'invoiced'	=>	'0'
+						),
+					),
+	'classes'		=>	Array('1DY', '2DY', '3DY', 'GND'),
+
+	'ShipMethod'	=>	'DRP',
+
+	'orig_name'		=>	'John%20Smith',
+	'orig_addr1'	=>	'2275%20Union%20Road',
+	'orig_city'		=>	'Cheektowaga',
+	'orig_state'	=>	'NY',
+	'orig_postal'	=>	'14227',
+	'orig_country'	=>	'US',
+
+	// this section is required
+	'dest_name'		=>	'Vasya%20Pupkin',
+	'dest_addr1'	=>	'175%20E.Hawthorn%20pkwy.',
+	'dest_city'		=>	'Vernon%20Hills',
+	'dest_state'	=>	'IL',
+	'dest_postal'	=>	'60061',
+	'dest_country'	=>	'US',
+
+	// this section is required
+	'packages' 		=>	Array(
+		Array(
+			'package_key'	=>	'package1',
+			'weight'		=>	'50',
+			'weight_unit'	=>	'LB',
+			'length'		=>	'25',
+			'width'			=>	'15',
+			'height'		=>	'15',
+			'dim_unit'		=>	'IN',
+			'packaging'		=>	'BOX',
+			'contents'		=>	'OTR',
+			'insurance'		=>	'0'
+		),
+		Array(
+			'package_key'	=>	'package2',
+			'weight'		=>	'50',
+			'weight_unit'	=>	'LB',
+			'length'		=>	'25',
+			'width'			=>	'15',
+			'height'		=>	'15',
+			'dim_unit'		=>	'IN',
+			'packaging'		=>	'BOX',
+			'contents'		=>	'OTR',
+			'insurance'		=>	'0'
+		),
+	),
+
+	'shipment_id'	=>	1234;
+);
+*/
+
+/*
+
+Returns:
+
+$quotes = Array(
+	'package1'	=>
+		Array(
+			Array(
+				'id'	=>	'INTSH_FDX_2DY',
+				'type' => 'FDX',
+				..
+				'amount' =>	24.24,
+			)
+			Array(
+				'type' => 'FDX',
+				..
+				'amount' =>	24.24,
+			)
+		),
+	'package2'	=>
+		Array(
+			Array(
+				'id'	=>	'INTSH_FDX_3DY',
+				'type' => 'FDX',
+				..
+				'amount' =>	24.24,
+			)
+			Array(
+				'type' => 'FDX',
+				..
+				'amount' =>	24.24,
+			)
+		),
+	)
+*/
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/intershipper.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/custom_shipping_quote_engine.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/custom_shipping_quote_engine.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/custom_shipping_quote_engine.php	(revision 16630)
@@ -0,0 +1,180 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CustomShippingQuoteEngine extends ShippingQuoteEngine {
+
+	function GetShippingQuotes($params)
+	{
+		$packages = $params['packages'];
+		$default_pack = array_shift($packages);
+		$query = $this->QueryShippingCost($params['dest_country'], $params['dest_state'], $params['dest_postal'], $default_pack['weight'], $params['items'], $params['amount'], $params['shipping_type'], $params['promo_params']);
+		$shipping_types = $this->Conn->Query($query, 'ShippingId');
+
+		if (!$this->Application->isAdminUser) {
+			$user_groups = explode(',', $this->Application->RecallVar('UserGroups'));
+			$filteres_shipping_types = array();
+			foreach ($shipping_types as $key=>$shipping_type) {
+				$shipping_type_groups = explode(',', trim($shipping_type['PortalGroups'], ','));
+				if (array_intersect($shipping_type_groups, $user_groups)) {
+					$filteres_shipping_types[$key] = $shipping_type;
+				}
+			}
+			$shipping_types = $filteres_shipping_types;
+		}
+
+		return $shipping_types;
+	}
+
+	function QueryShippingCost($user_country, $user_state, $user_zip, $weight, $items, $amount, $shipping_type=null, $promo_params)
+	{
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$user_country_id = $cs_helper->getCountryStateId($user_country, DESTINATION_TYPE_COUNTRY);
+		$user_state_id = $cs_helper->getCountryStateId($user_state, DESTINATION_TYPE_STATE);
+
+		$user_zip = (string) $user_zip;
+		$weight = (float) $weight;
+		$items = (int) $items;
+		$amount = (float) $amount;
+
+		$promo_weight = $promo_params['weight'];
+		$promo_amount = (float) $promo_params['amount'];
+		$promo_items = (float) $promo_params['items'];
+
+		if (isset($shipping_type)) $shipping_type = (int) $shipping_type;
+
+		$query = 'SELECT
+									CONCAT("CUST_", st.ShippingID) as ShippingId,
+									IF(st.Type = 4, st.BaseFee, '.# taking only base fee for handling
+										'IF (
+												st.IsFreePromoShipping = 1 AND
+												( (st.FreeShippingMinAmount != 0 AND st.FreeShippingMinAmount <= '.$amount.') OR
+												(st.Type = 1 AND '.$promo_weight.' = 0) OR
+												(st.Type = 2 AND '.$promo_items.' = 0) OR
+												(st.Type = 3 AND '.$promo_amount.' = 0)
+												), 0,
+											MIN(
+											IF(st.BaseFee IS NULL, 0, st.BaseFee) +
+											IF(st.CostType IN (1,3), IF(sc.Flat IS NULL, 0, sc.Flat), 0) +
+											IF(st.CostType IN (2,3),
+												IF(sc.PerUnit IS NULL, 0, sc.PerUnit)
+												*
+												( CASE st.Type
+													WHEN 1 THEN IF(st.IsFreePromoShipping = 1, '.$promo_weight.', '.$weight.')
+													WHEN 2 THEN IF(st.IsFreePromoShipping = 1, '.$promo_items.', '.$items.')
+													WHEN 3 THEN IF(st.IsFreePromoShipping = 1, '.$promo_amount.', '.$amount.')
+													ELSE 0 END ),
+												0)
+											)
+										)
+									) AS TotalCost,
+									st.Name as ShippingName,
+									st.Type as Type,
+									st.CODFlatSurcharge as CODFlat,
+									st.CODPercentSurcharge as CODPercent,
+									st.PortalGroups as PortalGroups,
+									IF (
+										st.InsuranceType = 1,
+										st.InsuranceFee,
+										st.InsuranceFee * '.$amount.' / 100
+									) AS InsuranceFee,
+									IF(sz.CODallowed IS NULL, 0, sz.CODallowed) AS COD,
+									st.Status = 2 as SelectedOnly,
+									st.Code
+								FROM '.TABLE_PREFIX.'ShippingType AS st '. 																#all shipping types
+								'LEFT JOIN '.TABLE_PREFIX.'ShippingBrackets AS sb	'.											#getting brackets by shipping type
+								'ON sb.ShippingTypeID = st.ShippingID	'.
+								'LEFT JOIN '.TABLE_PREFIX.'ShippingZones AS sz '.													#getting zones by shipping type
+								'ON sz.ShippingTypeID = st.ShippingID '.
+								'LEFT JOIN '.TABLE_PREFIX.'ShippingZonesDestinations AS szd	'.						#getting destinations by shipping type
+								'ON szd.ShippingZoneId = sz.ZoneID '.
+								'LEFT JOIN '.TABLE_PREFIX.'ShippingCosts AS sc	'.													#getting costs by bracket and zone
+								'ON sc.BracketId = sb.BracketId AND sc.ZoneID = sz.ZoneID '.
+								'WHERE
+									'.(isset($shipping_type) ? 'st.ShippingID = '.$shipping_type.' AND ' : '').'
+									(st.Status >= 1) '.		# enabled (1) or Selected Only (2) shipping types
+									'AND
+									(
+										'.# handlign should require brackets/zones (st.Type = 4) # handling - does not required brackets
+										# OR
+										'(
+											( st.Type IN (1,2,3,4) ) '. # bracket dependant types
+											'AND
+											'.# Zone match
+											'(	(sz.Type = 1 AND
+													(szd.StdDestId = '.$user_country_id.') '.# user country id
+												')
+												OR
+												(sz.Type = 2 AND
+													(szd.StdDestId = '.$user_state_id.') '.# user state id
+												')
+												OR
+												(sz.Type = 3 AND
+													(szd.StdDestId = '.$user_country_id.') '.# user country id
+													'AND
+													(szd.DestValue = '.$this->Conn->qstr($user_zip).') '.# user zip code
+												')
+											)
+											AND
+											'.# Bracket match
+											'( (st.Type = 1
+													AND
+												 sb.Start <= IF(st.IsFreePromoShipping = 1, '.$promo_weight.', '.$weight.') AND (sb.End > IF(st.IsFreePromoShipping = 1, '.$promo_weight.', '.$weight.') OR sb.End = -1) '.# items total weight
+												')
+												OR
+												(st.Type = 2
+													AND
+												 sb.Start <= IF(st.IsFreePromoShipping = 1, '.$promo_items.', '.$items.') AND (sb.End > IF(st.IsFreePromoShipping = 1, '.$promo_items.', '.$items.') OR sb.End = -1) '.# items total qty
+												')
+												OR
+												(st.Type = 3
+													AND
+												 sb.Start <= IF(st.IsFreePromoShipping = 1, '.$promo_amount.', '.$amount.') AND (sb.End > IF(st.IsFreePromoShipping = 1, '.$promo_amount.', '.$amount.') OR sb.End = -1) '.# items total amount
+												')
+												OR
+												st.Type = 4 '.# handling - does not depend on brackets
+											')
+											AND
+											'.# Empty costs handling
+											'( (st.ZeroIfEmpty = 0	AND (sc.Flat IS NOT NULL OR sc.PerUnit IS NOT NULL) ) '.# if no shimpent on empty - flat or perunit should be filled in
+												'OR
+												(st.ZeroIfEmpty = 1)	'.		# zero on empty - is ok (nulls will be converted in SELECT part)
+												'OR
+												(st.Type = 4) 	'.				# ignore costs for handling
+											')
+										)
+									)
+								GROUP BY st.ShippingId 			'.	# getting minimal price (possible with closest address match) for every shipping type
+								'ORDER BY TotalCost asc';
+		return $query;
+	}
+
+	function GetAvailableTypes()
+	{
+		$conn =& $this->Application->GetADODBConnection();
+		$types = $conn->Query('SELECT * FROM '.TABLE_PREFIX.'ShippingType');
+
+		$ret = array();
+		foreach ($types as $a_type) {
+			$a_type['_ClassName'] = get_class($this);
+			$a_type['_Id'] = 'CUST_'.$a_type['ShippingID'];
+			$a_type['_Name'] = '(Custom) '.$a_type['Name'];
+			$ret[] = $a_type;
+		}
+		return $ret;
+
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/custom_shipping_quote_engine.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(revision 16630)
@@ -0,0 +1,141 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ShippingQuoteEngineEventHandler extends kDBEventHandler {
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		/** @var ShippingQuoteEngine $engine */
+		$engine = $this->Application->recallObject($object->GetDBField('ClassName'));
+
+		$engine_fields = $engine->GetEngineFields();
+		$properties = $object->GetDBField('Properties');
+		$properties = $properties ? unserialize($properties) : Array ();
+
+		// common fields for all shipping quote engines
+		if ( $object->GetDBField('AccountPassword') != '' ) {
+			// don't erase password by accident
+			$engine_fields[] = 'AccountPassword';
+		}
+
+		// save shipping quote specific fields
+		foreach ($engine_fields as $engine_field) {
+			$properties[$engine_field] = $object->GetDBField($engine_field);
+		}
+
+		$object->SetDBField('Properties', serialize($properties));
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$from_country = $this->Application->ConfigValue('Comm_Shipping_Country');
+		$has_states = strlen($from_country) == 3 ? $cs_helper->CountryHasStates($from_country) : false;
+
+		$valid_address = $from_country && ($has_states && $this->Application->ConfigValue('Comm_Shipping_State') || !$has_states) && $this->Application->ConfigValue('Comm_Shipping_City') && $this->Application->ConfigValue('Comm_Shipping_ZIP');
+
+		if ( !function_exists('curl_init') ) {
+			$object->SetError('Status', 'curl_not_present');
+		}
+		elseif ( ($object->GetDBField('Status') == STATUS_ACTIVE) && !$valid_address ) {
+			$object->SetError('Status', 'from_info_not_filled_in');
+		}
+	}
+
+	/**
+	 * Sets virtual fields from serialized properties array
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(kEvent $event)
+	{
+		parent::OnAfterItemLoad($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$properties = $object->GetDBField('Properties');
+
+		if ( $properties ) {
+			$object->SetDBFieldsFromHash(unserialize($properties));
+		}
+	}
+
+	/**
+	 * Deletes cached shipping quotes on any setting change
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemCreate(kEvent $event)
+	{
+		parent::OnAfterItemCreate($event);
+
+		$this->_deleteQuoteCache();
+	}
+
+	/**
+	 * Deletes cached shipping quotes on any setting change
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemUpdate(kEvent $event)
+	{
+		parent::OnAfterItemUpdate($event);
+
+		$this->_deleteQuoteCache();
+	}
+
+	/**
+	 * Deletes cached shipping quotes on any setting change
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemDelete(kEvent $event)
+	{
+		parent::OnAfterItemDelete($event);
+
+		$this->_deleteQuoteCache();
+	}
+
+	/**
+	 * Deletes cached shipping quotes
+	 *
+	 */
+	function _deleteQuoteCache()
+	{
+		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemCache
+				WHERE VarName LIKE "ShippingQuotes%"';
+		$this->Conn->Query($sql);
+	}
+}

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine.php	(revision 16630)
@@ -0,0 +1,209 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ShippingQuoteEngine extends kHelper {
+
+	/**
+	 * Quote engine specific properties
+	 *
+	 * @var Array
+	 */
+	var $properties = Array ();
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->initProperties();
+	}
+
+	/**
+	 * $params = Array(
+	 *		'AccountLogin'		=>	'login',
+	 *		'AccountPassword'	=>	'pass',
+	 *		'carriers'	=>	Array(
+	 *							Array(
+	 *								'name'		=>	'UPS',
+	 *								'account'	=>	'',
+	 *								'invoiced'	=>	'0'
+	 *							),
+	 *							Array(
+	 *								'name'		=>	'DHL',
+	 *								'account'	=>	'',
+	 *								'invoiced'	=>	'0'
+	 *							),
+	 *							Array(
+	 *								'name'		=>	'FDX',
+	 *								'account'	=>	'',
+	 *								'invoiced'	=>	'0'
+	 *							),
+	 *							Array(
+	 *								'name'		=>	'USP',
+	 *								'account'	=>	'',
+	 *								'invoiced'	=>	'0'
+	 *							),
+	 *							Array(
+	 *								'name'		=>	'ARB',
+	 *								'account'	=>	'',
+	 *								'invoiced'	=>	'0'
+	 *							),
+	 *						),
+	 *		'classes'		=>	Array('1DY', '2DY', '3DY', 'GND'),
+	 *
+	 *		'ShipMethod'	=>	'DRP',
+	 *
+	 *		'orig_name'		=>	'John%20Smith',
+	 *		'orig_addr1'	=>	'2275%20Union%20Road',
+	 *		'orig_city'		=>	'Cheektowaga',
+	 *		'orig_state'	=>	'NY',
+	 *		'orig_postal'	=>	'14227',
+	 *		'orig_country'	=>	'US',
+	 *
+	 *		// this section is required
+	 *		'dest_name'		=>	'Vasya%20Pupkin',
+	 *		'dest_addr1'	=>	'175%20E.Hawthorn%20pkwy.',
+	 *		'dest_city'		=>	'Vernon%20Hills',
+	 *		'dest_state'	=>	'IL',
+	 *		'dest_postal'	=>	'60061',
+	 *		'dest_country'	=>	'US',
+	 *
+	 *		// this section is required
+	 *		'packages' 		=>	Array(
+	 *			Array(
+	 *				'package_key'	=>	'package1',
+	 *				'weight'		=>	'50',
+	 *				'weight_unit'	=>	'LB',
+	 *				'length'		=>	'25',
+	 *				'width'			=>	'15',
+	 *				'height'		=>	'15',
+	 *				'dim_unit'		=>	'IN',
+	 *				'packaging'		=>	'BOX',
+	 *				'contents'		=>	'OTR',
+	 *				'insurance'		=>	'0'
+	 *			),
+	 *			Array(
+	 *				'package_key'	=>	'package2',
+	 *				'weight'		=>	'50',
+	 *				'weight_unit'	=>	'LB',
+	 *				'length'		=>	'25',
+	 *				'width'			=>	'15',
+	 *				'height'		=>	'15',
+	 *				'dim_unit'		=>	'IN',
+	 *				'packaging'		=>	'BOX',
+	 *				'contents'		=>	'OTR',
+	 *				'insurance'		=>	'0'
+	 *			),
+	 *		),
+	 *
+	 *		'shipment_id'	=>	1234;
+	 *	);
+	 *
+	 *
+	 *	Returns:
+	 *
+	 *	$quotes = Array(
+	 *		'package1'	=>
+	 *			Array(
+	 *				Array(
+	 *					'id'	=>	'INTSH_FDX_2DY',
+	 *					'type' => 'FDX',
+	 *					..
+	 *					'amount' =>	24.24,
+	 *				)
+	 *				Array(
+	 *					'type' => 'FDX',
+	 *					..
+	 *					'amount' =>	24.24,
+	 *				)
+	 *			),
+	 *		'package2'	=>
+	 *			Array(
+	 *				Array(
+	 *					'id'	=>	'INTSH_FDX_3DY',
+	 *					'type' => 'FDX',
+	 *	 				..
+	 *					'amount' =>	24.24,
+	 *				)
+	 *				Array(
+	 *					'type' => 'FDX',
+	 *					..
+	 *					'amount' =>	24.24,
+	 *				)
+	 *			),
+	 *		)
+	 *
+	 * @param Array $params
+	 */
+	function GetShippingQuotes($params)
+	{
+
+	}
+
+	/**
+	 * Returns list of shipping types, that can be selected on product editing page
+	 *
+	 * @return Array
+	 */
+	function GetAvailableTypes()
+	{
+		return Array ();
+
+	}
+
+	/**
+	 * Returns virtual field names, that will be saved as properties
+	 *
+	 * @return Array
+	 */
+	function GetEngineFields()
+	{
+		return Array ();
+	}
+
+	/**
+	 * Sends order to shipping quote engine
+	 *
+	 * @param OrdersItem $object
+	 * @param bool $dry_run
+	 * @return Array
+	 */
+	function MakeOrder(&$object, $dry_run = false)
+	{
+		return Array ();
+	}
+
+	/**
+	 * Loads properties of shipping quote engine
+	 *
+	 */
+	function initProperties()
+	{
+		$sql = 'SELECT Properties, FlatSurcharge, PercentSurcharge
+				FROM ' . $this->Application->getUnitOption('sqe', 'TableName') . '
+				WHERE LOWER(ClassName) = ' . $this->Conn->qstr( strtolower( get_class($this) ) );
+		$data = $this->Conn->GetRow($sql);
+
+		if (is_array($data)) {
+			$properties = $data['Properties'] ? unserialize($data['Properties']) : Array ();
+			$properties['FlatSurcharge'] = $data['FlatSurcharge'];
+			$properties['PercentSurcharge'] = $data['PercentSurcharge'];
+
+			$this->properties = $properties;
+		}
+		else {
+			$this->properties = Array ();
+		}
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_engine.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_collector.php
===================================================================
--- releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_collector.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_collector.php	(revision 16630)
@@ -0,0 +1,196 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ShippingQuoteCollector extends ShippingQuoteEngine {
+
+	function GetShippingQuotes($params)
+	{
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+		$has_states = $cs_helper->CountryHasStates($params['dest_country']);
+
+		if (
+			!$params['dest_city'] || !$params['dest_country'] ||
+			($has_states && !$params['dest_state']) ||
+			!$params['dest_postal'] || !$params['packages']
+		) {
+			return Array ();
+		}
+
+		$cached_var_name = 'ShippingQuotes' . crc32(serialize($params));
+
+		$shipping_types = $this->Application->getDBCache($cached_var_name);
+
+		if ($shipping_types) {
+			return unserialize($shipping_types);
+		}
+
+		$quotes_valid = true;
+		$shipping_types = Array();
+		$classes = $this->getEngineClasses();
+
+		foreach ($classes as $class) {
+			/** @var ShippingQuoteEngine $object */
+			$object = $this->Application->recallObject($class);
+
+			$new_shipping_types = $object->GetShippingQuotes($params);
+
+			if (is_array($new_shipping_types)) {
+				$shipping_types = array_merge($shipping_types, $new_shipping_types);
+			}
+			else {
+				$quotes_valid = false;
+			}
+		}
+
+		uasort($shipping_types, Array(&$this, 'price_sort'));
+
+		// exclude not available shipping quotes by products
+		$limit_types = unserialize($params['limit_types']);
+
+		if (is_array($limit_types) && !in_array('ANY', $limit_types)) {
+			if (count($limit_types) == 0) {
+				break;
+			}
+
+			$available_types = Array ();
+			foreach ($shipping_types as $a_type) {
+				$include = false; // exclude by default
+
+				foreach ($limit_types as $limit) {
+					$include = $include || preg_match("/^$limit/", $a_type['ShippingId']);
+					if ($include) {
+						break;
+					}
+				}
+
+				if (!$include) {
+					continue;
+				}
+
+				$available_types[ $a_type['ShippingId'] ] = $a_type;
+			}
+
+			$shipping_types = $available_types;
+		}
+
+		// exclude Selected Products Only shipping types, not matching products
+		$available_types = Array();
+
+		foreach ($shipping_types as $a_type) {
+			if (getArrayValue($a_type, 'SelectedOnly')) {
+				if (!is_array($limit_types) || !in_array($a_type['ShippingId'], $limit_types)) {
+					continue;
+				}
+			}
+
+			$available_types[ $a_type['ShippingId'] ] = $a_type;
+		}
+
+		$shipping_types = $available_types;
+
+		if ($quotes_valid) {
+			$this->Application->setDBCache($cached_var_name, serialize($shipping_types), 24 * 3600);
+		}
+
+		return $shipping_types;
+	}
+
+	function GetAvailableShippingTypes()
+	{
+		$shipping_types = Array ();
+		$classes = $this->getEngineClasses();
+
+		foreach ($classes as $class) {
+			/** @var ShippingQuoteEngine $object */
+			$object = $this->Application->recallObject($class);
+
+			$new_shipping_types = $object->GetAvailableTypes();
+			$shipping_types = array_merge($shipping_types, $new_shipping_types);
+		}
+
+		uasort($shipping_types, Array(&$this, 'SortShippingTypes'));
+
+		return $shipping_types;
+	}
+
+	/**
+	 * Returns all enabled shipping quote engine classes
+	 *
+	 * @return Array
+	 */
+	function getEngineClasses()
+	{
+		$sql = 'SELECT Classname
+				FROM ' . $this->Application->getUnitOption('sqe', 'TableName') . '
+				WHERE Status = ' . STATUS_ACTIVE;
+		$classes = $this->Conn->GetCol($sql);
+
+		// always persists
+		$classes[] = 'CustomShippingQuoteEngine';
+
+		return $classes;
+	}
+
+	/**
+	 * Returns shipping quote engine, that matches shipping type used in order
+	 *
+	 * @param Array $shipping_info
+	 * @param int $package_num
+	 * @return ShippingQuoteEngine
+	 */
+	function &GetClassByType($shipping_info, $package_num = 1)
+	{
+		if ( !$shipping_info || !array_key_exists($package_num, $shipping_info) ) {
+			return false;
+		}
+
+		$classes = $this->getEngineClasses();
+		$shipping_id = $shipping_info[$package_num]['ShippingId'];
+
+		foreach ($classes as $class) {
+			/** @var ShippingQuoteEngine $object */
+			$object = $this->Application->recallObject($class);
+
+			$shipping_types = $object->GetAvailableTypes();
+
+			foreach ($shipping_types as $index => $shipping_type) {
+				if ( preg_match('/^' . preg_quote($shipping_type['_Id'], '/') . '/', $shipping_id) ) {
+					return $class;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	function SortShippingTypes($elem1, $elem2)
+	{
+		if ($elem1['_Name'] == $elem2['_Name']) {
+			return 0;
+		}
+
+		return $elem1['_Name'] < $elem2['_Name'] ? -1 : 1;
+	}
+
+	function price_sort($elem1, $elem2)
+	{
+		if ($elem1['TotalCost'] == $elem2['TotalCost']) {
+			return 0;
+		}
+
+		return $elem1['TotalCost'] < $elem2['TotalCost'] ? -1 : 1;
+	}
+}

Property changes on: releases/5.2.2-B2/units/shipping_quote_engines/shipping_quote_collector.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/.htaccess
===================================================================
--- releases/5.2.2-B2/units/.htaccess	(revision 0)
+++ releases/5.2.2-B2/units/.htaccess	(revision 16630)
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/.htaccess
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_event_handler.php	(revision 16630)
@@ -0,0 +1,448 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ProductOptionCombinationsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		if ( $type == 'after' ) {
+			return;
+		}
+
+		switch ($event->Name) {
+			case 'OnCreate':
+			case 'OnUpdate':
+				/** @var kDBItem $object */
+				$object = $event->getObject();
+
+				$options = unserialize($object->GetDBField('Combination'));
+				ksort($options);
+				$object->SetDBField('CombinationCRC', kUtil::crc32(serialize($options)));
+				break;
+
+			case 'OnMassDelete':
+				// delete only option combinations that has no associated inventory
+				/** @var kDBItem $object */
+				$object = $event->getObject();
+
+				$ids = $event->getEventParam('ids');
+
+				$sql = 'SELECT ' . $object->IDField . '
+						FROM ' . $object->TableName . '
+						WHERE 	(' . $object->IDField . ' IN (' . implode(',', $ids) . ')) AND
+								(QtyInStock = 0) AND (QtyReserved = 0) AND (QtyBackOrdered = 0) AND (QtyOnOrder = 0)';
+				$event->setEventParam('ids', $this->Conn->GetCol($sql));
+				break;
+		}
+	}
+
+	/**
+	 * GetOptionValues
+	 *
+	 * @param kEvent $event
+	 */
+	function GetOptionValues($event, $option_id)
+	{
+		$object = $event->getObject();
+		if ($object->IsTempTable()) {
+			$table = $this->Application->GetTempName(TABLE_PREFIX.'ProductOptions', 'prefix:'.$event->Prefix);
+		}
+		else {
+			$table = TABLE_PREFIX.'ProductOptions';
+		}
+		$query = 'SELECT `Values` FROM '.$table.' WHERE ProductOptionId = '.$option_id;
+		return explode(',', $this->Conn->GetOne($query));
+	}
+
+	function CreateCombinations(kEvent $event, $fields, $current_option=null)
+	{
+		$recursed = false;
+		$combination = $fields['Combination'];
+		foreach ($combination as $option_id => $option)
+		{
+			if ($option_id == $current_option || $recursed) continue;
+			if ($option == '_ANY_') {
+				$recursed = true;
+				$values = $this->GetOptionValues($event, $option_id);
+				foreach ($values as $a_value) {
+					$fields['Combination'][$option_id] = $a_value;
+					$this->CreateCombinations($event, $fields, $option_id);
+				}
+			}
+		}
+
+		if (!$recursed) {
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$salt = $fields['Combination'];
+			ksort($salt);
+			$object->Load(kUtil::crc32(serialize($salt)), 'CombinationCRC');
+			$object->SetFieldsFromHash($fields);
+			$event->setEventParam('form_data', $fields);
+
+			$this->customProcessing($event,'before');
+			if ( $object->isLoaded() ) { // Update if such combination already exists
+				if( $object->Update() )
+				{
+					$this->customProcessing($event,'after');
+					$event->status=kEvent::erSUCCESS;
+				}
+			}
+			else {
+				if( $object->Create($event->getEventParam('ForceCreateId')) )
+				{
+					$this->customProcessing($event,'after');
+					$event->status=kEvent::erSUCCESS;
+				}
+			}
+		}
+	}
+
+	function UpdateCombinations(kEvent $event, $fields, $current_option=null)
+	{
+		$recursed = false;
+		$combination = $fields['Combination'];
+		foreach ($combination as $option_id => $option)
+		{
+			if ($option_id == $current_option || $recursed) continue;
+			if ($option == '_ANY_') {
+				$recursed = true;
+				$values = $this->GetOptionValues($event, $option_id);
+				foreach ($values as $a_value) {
+					$fields['Combination'][$option_id] = $a_value;
+					$this->UpdateCombinations($event, $fields, $option_id);
+				}
+			}
+		}
+
+		if (!$recursed) {
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$edit_id = $object->GetId();
+			$salt = $fields['Combination'];
+			ksort($salt);
+			// try to load combination by salt - if loaded, it will update the combination
+			$object->Load(kUtil::crc32(serialize($salt)), 'CombinationCRC');
+			if ( !$object->isLoaded() ) {
+				$object->Load($edit_id);
+			}
+			$object->SetFieldsFromHash($fields);
+			$event->setEventParam('form_data', $fields);
+
+			$this->customProcessing($event,'before');
+			if( $object->Update() )
+			{
+				$this->customProcessing($event,'after');
+				$event->status=kEvent::erSUCCESS;
+			}
+		}
+	}
+
+	/**
+	 * Creates new kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCreate(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+		if ( !$items_info ) {
+			return;
+		}
+
+		list($id, $field_values) = each($items_info);
+		$object->setID($id);
+		$object->SetFieldsFromHash($field_values);
+		$event->setEventParam('form_data', $field_values);
+
+		if ( !$object->Validate() ) {
+			$event->status = kEvent::erFAIL;
+			$event->redirect = false;
+			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+			return;
+		}
+
+		$this->CreateCombinations($event, $field_values);
+	}
+
+	/**
+	 * Updates kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnUpdate(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array('skip_autoload' => true) );
+
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		if($items_info)
+		{
+			foreach($items_info as $id => $field_values)
+			{
+				$object->Load($id);
+ 				$object->SetFieldsFromHash($field_values);
+				$event->setEventParam('form_data', $field_values);
+
+ 				if (!$object->Validate()) {
+					$event->status = kEvent::erFAIL;
+					$event->redirect = false;
+					return;
+				}
+				$this->UpdateCombinations($event, $field_values);
+
+ 				/*$this->customProcessing($event, 'before');
+				if( $object->Update($id) )
+				{
+					$this->customProcessing($event, 'after');
+					$event->status=kEvent::erSUCCESS;
+				}
+				else
+				{
+					$event->status=kEvent::erFAIL;
+					$event->redirect=false;
+					break;
+				}*/
+			}
+		}
+		$this->Application->SetVar($event->GetPrefixSpecial().'_id', '');
+	}
+
+	/**
+	 * Builds item (loads if needed)
+	 *
+	 * Pattern: Prototype Manager
+	 *
+	 * @param kEvent $event
+	 * @access protected
+	 */
+	protected function OnItemBuild(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->dbBuild($object, $event);
+
+		$sql = $this->ItemPrepareQuery($event);
+		$sql = $this->Application->ReplaceLanguageTags($sql);
+		$object->setSelectSQL($sql);
+
+		// 2. loads if allowed
+		$auto_load = $this->Application->getUnitOption($event->Prefix, 'AutoLoad');
+		$skip_autoload = $event->getEventParam('skip_autoload');
+
+		if ( $auto_load && !$skip_autoload ) {
+			$this->LoadItem($event);
+		}
+
+		/** @var Params $actions */
+		$actions = $this->Application->recallObject('kActions');
+
+		$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
+		$actions->Set($event->getPrefixSpecial() . '_GoId', '');
+	}
+
+	/**
+	 * Load item if id is available
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function LoadItem(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$id = $this->getPassedID($event);
+
+		if ( !$id ) {
+			$event->CallSubEvent('OnNew');
+
+			return;
+		}
+
+		if ( $object->Load($id) ) {
+			/** @var Params $actions */
+			$actions = $this->Application->recallObject('kActions');
+
+			$actions->Set($event->getPrefixSpecial() . '_id', $object->GetId());
+		}
+	}
+
+	/**
+	 * Returns special of main item for linking with sub-item
+	 *
+	 * @param kEvent $event
+	 * @return string
+	 * @access protected
+	 */
+	protected function getMainSpecial(kEvent $event)
+	{
+		$special = $event->getEventParam('main_special');
+
+		if ( $special === false || $special == '$main_special' ) {
+			$special = $event->Special;
+		}
+
+		if ( $special == 'grid' ) {
+			$special = '';
+		}
+
+		return $special;
+	}
+
+	/**
+	 * Occurs before an item has been cloned
+	 * Id of newly created item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeClone(kEvent $event)
+	{
+		parent::OnBeforeClone($event);
+
+		$event->Init($event->Prefix, '-item');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$options_mapping = $this->Application->GetVar('poc_mapping');
+		if ( !$options_mapping ) {
+			return;
+		}
+
+		foreach ($options_mapping as $original => $new) {
+			$n_combs = array ();
+			$comb_data = unserialize($object->GetDBField('Combination'));
+
+			foreach ($comb_data as $key => $val) {
+				$n_key = $key == $original ? $new : $key;
+				$n_combs[$n_key] = $val;
+			}
+
+			ksort($n_combs);
+			$n_combs = serialize($n_combs);
+			$n_crc = kUtil::crc32($n_combs);
+			$object->SetDBField('Combination', $n_combs);
+			$object->SetDBField('CombinationCRC', $n_crc);
+		}
+	}
+
+	/**
+	 * Restore back values from live table to temp table before overwriting live with temp
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeDeleteFromLive(kEvent $event)
+	{
+		parent::OnBeforeDeleteFromLive($event);
+
+		// check if product inventory management is via options and then proceed
+
+		$id = $event->getEventParam('id');
+		$products_table = $this->Application->getUnitOption('p', 'TableName');
+		$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+
+		$sql = 'SELECT p.InventoryStatus
+				FROM ' . $products_table . ' p
+				LEFT JOIN ' . $table_name . ' poc ON poc.ProductId = p.ProductId
+				WHERE poc.' . $id_field . ' = ' . $id;
+		$inventory_status = $this->Conn->GetOne($sql);
+
+		if ( $inventory_status == ProductInventory::BY_OPTIONS ) {
+			/** @var kDBItem $live_object */
+			$live_object = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
+
+			$live_object->SwitchToLive();
+			$live_object->Load($id);
+
+			/** @var kDBItem $temp_object */
+			$temp_object = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
+
+			$temp_object->SwitchToTemp();
+			$temp_object->Load($id);
+
+			$temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
+			$temp_object->Update();
+		}
+	}
+
+	/**
+	 * Create search filters based on search query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSearch(kEvent $event)
+	{
+		parent::OnSearch($event);
+
+		$this->_saveProduct($event);
+	}
+
+	/**
+	 * Clear search keywords
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSearchReset(kEvent $event)
+	{
+		parent::OnSearchReset($event);
+
+		$this->_saveProduct($event);
+	}
+
+	/**
+	 * Makes event remember product id (if passed)
+	 *
+	 * @param kEvent $event
+	 */
+	function _saveProduct($event)
+	{
+		$product_id = $this->Application->GetVar('p_id');
+
+		if ($product_id) {
+			$event->SetRedirectParam('p_id', $product_id);
+		}
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_option_combinations/products_option_combination_item.php
===================================================================
--- releases/5.2.2-B2/units/product_option_combinations/products_option_combination_item.php	(revision 0)
+++ releases/5.2.2-B2/units/product_option_combinations/products_option_combination_item.php	(revision 16630)
@@ -0,0 +1,50 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class kPOCItem extends kDBItem
+	{
+
+		/**
+		 * Returns unformatted field value
+		 *
+		 * @param string $field
+		 * @return string
+		 * @access public
+		 */
+		function GetDBField($field)
+		{
+			if ($field == 'FinalPrice') {
+				$product = $this->Application->recallObject('p');
+
+				switch($this->GetDBField('PriceType'))
+				{
+					case 1: // = (override)
+						return $this->GetDBField('Price');
+						break;
+					case 2: // flat
+						return $product->GetDBField('Price') + $this->GetDBField('Price');
+						break;
+					case 3: // percent
+						return $product->GetDBField('Price') * (1 + $this->GetDBField('Price')/100);
+						break;
+				}
+			}
+			else {
+				$ret = parent::GetDBField($field);
+			}
+			return $ret;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_option_combinations/products_option_combination_item.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_option_combinations/product_option_formatters.php
===================================================================
--- releases/5.2.2-B2/units/product_option_combinations/product_option_formatters.php	(revision 0)
+++ releases/5.2.2-B2/units/product_option_combinations/product_option_formatters.php	(revision 16630)
@@ -0,0 +1,143 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class kCombinationFormatter extends kFormatter {
+
+		/**
+		 * Formats value of a given field
+		 *
+		 * @param string $value
+		 * @param string $field_name
+		 * @param kDBItem|kDBList $object
+		 * @param string $format
+		 * @return string
+		 */
+		function Format($value, $field_name, $object, $format=null)
+		{
+			$o = '';
+			$options = $object->GetFieldOptions($field_name);
+			if ( isset($format) ) $options['format'] = $format;
+			$data = unserialize($value);
+			$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+			$top_prefix = $this->Application->GetTopmostPrefix($object->Prefix);
+			$use_temp = substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't';
+
+			foreach ($data as $key=>$val) {
+				$conv_key = $opt_helper->ConvertKey($key, $object->GetDBField('ProductId'),$use_temp);
+
+				if (is_array($val)) {
+					$val = join(',', $val);
+				}
+
+				$o .= sprintf($options['format'], $conv_key['Name'], $val);
+			}
+			return $o;
+		}
+
+		/**
+		 * Performs basic type validation on form field value
+		 *
+		 * @param mixed $value
+		 * @param string $field_name
+		 * @param kDBItem $object
+		 * @return mixed
+		 * @access public
+		 */
+		public function Parse($value, $field_name, &$object)
+		{
+			if ( !is_array($value) ) {
+				$object->SetError($field_name, 'required');
+				return '';
+			}
+			else {
+				if ( $object->isRequired($field_name) ) {
+					foreach ($value as $key => $val) {
+						if ( $val == '' ) {
+							$object->SetError($field_name, 'required');
+						}
+					}
+				}
+			}
+			return serialize($value);
+		}
+	}
+
+	class kCombPriceFormatter extends kFormatter {
+
+		/**
+		 * Formats value of a given field
+		 *
+		 * @param string $value
+		 * @param string $field_name
+		 * @param kDBItem|kDBList $object
+		 * @param string $format
+		 * @return string
+		 */
+		function Format($value, $field_name, $object, $format=null)
+		{
+			$options = $object->GetFieldOptions($field_name);
+			$converted = array_key_exists('converted', $options) ? $options['converted'] : false;
+
+			if ($converted) {
+				$lang = $this->Application->recallObject('lang.current');
+				return $lang->formatNumber($object->GetDBField($field_name), 2);
+			}
+
+			$data = unserialize($object->GetDBField('Combination'));
+			$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+			$price = $object->GetDBField('BasePrice');
+			$addition = 0;
+
+			$top_prefix = $this->Application->GetTopmostPrefix($object->Prefix);
+			$use_temp = substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't';
+
+			foreach ($data as $key=>$val) {
+				$conv_key = $opt_helper->ConvertKey($key, $object->GetDBField('ProductId'), $use_temp);
+				$parsed = $opt_helper->ExplodeOptionValues($conv_key);
+				if (!$parsed) continue;
+
+				$conv_prices = $parsed['Prices'];
+				$conv_price_types = $parsed['PriceTypes'];
+
+				if ($conv_price_types[$val] == '$')
+				{
+					$addition += $conv_prices[$val];
+				}
+				elseif ($conv_price_types[$val] == '%')
+				{
+					$addition += $price * $conv_prices[$val] / 100;
+				}
+			}
+
+			$price += $addition;
+
+			$price_type = $object->GetDBField('PriceType');
+			$price_mod = $object->GetDBField('Price');
+			switch ($price_type) {
+				case 1: // = override
+					$price = $price_mod;
+					break;
+				case 2: // flat
+					$price = $price + $price_mod;
+					break;
+				case 3: // percent
+					$price = $price * (1 + $price_mod / 100);
+					break;
+			}
+			return $price;
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_option_combinations/product_option_formatters.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_config.php
===================================================================
--- releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_config.php	(revision 0)
+++ releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_config.php	(revision 16630)
@@ -0,0 +1,148 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'poc',
+	'ItemClass' => Array ('class' => 'kPOCItem', 'file' => 'products_option_combination_item.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ProductOptionCombinationsEventHandler', 'file' => 'product_option_combinations_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ProductOptionCombinationsTagProcessor', 'file' => 'product_option_combinations_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'kCombinationFormatter', 'class' => 'kCombinationFormatter', 'file' => 'product_option_formatters.php', 'build_event' => ''),
+		Array ('pseudo' => 'kCombPriceFormatter', 'class' => 'kCombPriceFormatter', 'file' => 'product_option_formatters.php', 'build_event' => ''),
+	),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'TitleField' => 'CombinationId',
+	'IDField' => 'CombinationId',
+	'TableName' => TABLE_PREFIX.'ProductOptionCombinations',
+	'ForeignKey' => Array ('p' => 'ProductId'),
+	'ParentTableKey' => Array ('p' => 'ProductId'),
+	'ParentPrefix' => 'p',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = %1$s.ProductId
+				LEFT JOIN '.TABLE_PREFIX.'ProductsPricing ON '.TABLE_PREFIX.'ProductsPricing.ProductId = %1$s.ProductId AND '.TABLE_PREFIX.'ProductsPricing.IsPrimary = 1',
+	),
+
+	'ItemSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Combination' => 'asc'),
+			'ForcedSorting' => Array ('Priority' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'CombinationId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'Combination' => Array ('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format' =>"%s: %s<br>", 'default' => NULL),
+		'CombinationCRC' => Array ('type' => 'string', 'not_null' => 1, 'default' => 0, ),
+		'PriceType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ),
+		'Price' => Array ('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ),
+		'WeightType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ),
+		'Weight' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'default' => 0, ),
+		'Availability' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 1,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'QtyInStock' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0),
+		'QtyReserved' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0),
+		'QtyBackOrdered' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0),
+		'QtyOnOrder' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0),
+		'SKU' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'FinalPrice' => 'IF(%1$s.PriceType = 1, %1$s.Price,
+												IF(%1$s.PriceType = 2, '.TABLE_PREFIX.'ProductsPricing.Price + %1$s.Price,
+													'.TABLE_PREFIX.'ProductsPricing.Price * (1 + %1$s.Price/100)
+													)
+												)',
+			'BasePrice' => TABLE_PREFIX.'ProductsPricing.Price',
+		),
+	),
+
+	'VirtualFields' => Array (
+		'FinalPrice' => Array ('type' => 'float', 'formatter' => 'kCombPriceFormatter', 'format' => '%.2f', 'default' => NULL),
+		'BasePrice' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
+				'SKU' => Array ( 'filter_block' => 'grid_like_filter'),
+				'Availability' => Array ( 'filter_block' => 'grid_options_filter'),
+				'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_range_filter'),
+//				'Weight' => Array ( 'data_block' => 'weight_td', 'filter_block' => 'grid_range_filter'),
+			),
+		),
+
+		'Inventory' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Selector' => 'radio',
+			'Fields' => Array (
+				'Combination' => Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
+				'SKU' => Array ('filter_block' => 'grid_like_filter'),
+				'QtyInStock' => Array ('filter_block' => 'grid_range_filter'),
+				'QtyReserved' => Array ('filter_block' => 'grid_range_filter'),
+				'QtyBackOrdered' => Array ('filter_block' => 'grid_range_filter'),
+				'QtyOnOrder' => Array ('filter_block' => 'grid_range_filter'),
+			),
+		),
+
+		'Radio' => Array (
+			'Selector' => 'radio',
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
+				'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_range_filter'),
+//				'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_range_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_tag_processor.php	(revision 16630)
@@ -0,0 +1,58 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class ProductOptionCombinationsTagProcessor extends kDBTagProcessor {
+
+		function ListOptions($params)
+		{
+			$o = '';
+
+			return $o;
+		}
+
+		function ListValues($params)
+		{
+			$o = '';
+
+			return $o;
+		}
+
+		function ShowCombination($params)
+		{
+			$object = $this->getObject($params);
+			$combination = unserialize($object->GetDBField('Combination'));
+
+			$block_params['name'] = $params['render_as'];
+
+			$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+			$o = '';
+			$i = 0;
+			foreach ($combination as $opt => $val) {
+				$i++;
+				$block_params['option_id'] = $opt;
+				$conv_key = $opt_helper->ConvertKey($opt, $object->GetDBField('ProductId'));
+				$block_params['option_name'] = $conv_key['Name'];
+
+				if (is_array($val)) {
+					$val = join(',', $val);
+				}
+				$block_params['option_value'] = $val;
+				$block_params['is_last'] = $i == count($combination);
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+			return $o;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/product_option_combinations/product_option_combinations_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type/payment_type_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/payment_type/payment_type_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type/payment_type_event_handler.php	(revision 16630)
@@ -0,0 +1,295 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class PaymentTypeEventHandler extends kDBEventHandler
+{
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();
+
+		$common_events = Array (
+			'OnMassApprove'=>'iterateItems',
+			'OnMassDecline'=>'OnMassDecline',
+			'OnMassMoveUp'=>'iterateItems',
+			'OnMassMoveDown'=>'iterateItems',
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $common_events);
+	}
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnItemBuild' => Array ('self' => true),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Set's new category as primary for product
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSetPrimary($event)
+	{
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$this->StoreSelectedIDs($event);
+		$ids=$this->getSelectedIDs($event);
+		if($ids)
+		{
+			$id = array_shift($ids);
+			$table_info = $object->getLinkedInfo();
+
+			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 0 ');
+			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 1, Status = 1 WHERE PaymentTypeId = '.$id.' ');
+		}
+		$event->SetRedirectParam('opener', 's');
+	}
+
+	function OnMassDecline($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		$this->StoreSelectedIDs($event);
+		$ids = $this->getSelectedIDs($event);
+
+		if ( $ids ) {
+			$status_field = $object->getStatusField();
+
+			foreach ($ids as $id) {
+				$object->Load($id);
+
+				if ( !$object->GetDBField("IsPrimary") ) {
+					$object->SetDBField($status_field, 0);
+				}
+
+				if ( $object->Update() ) {
+					$event->status = kEvent::erSUCCESS;
+					$event->SetRedirectParam('opener', 's');
+				}
+				else {
+					$event->status = kEvent::erFAIL;
+					$event->redirect = false;
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$status_field = $object->getStatusField();
+
+		if ( $object->GetDBField('IsPrimary') == 1 && $object->GetDBField($status_field) == 0 ) {
+			$object->SetDBField($status_field, 1);
+		}
+
+		$this->convertGroups($event);
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$this->convertGroups($event);
+	}
+
+	/**
+	 * Disable delete on primary payment type
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$ids_ok = Array ();
+			$ids = $event->getEventParam('ids');
+
+			foreach ($ids as $id) {
+				$object->Load($id);
+
+				if ( $object->GetDBField('IsPrimary') ) {
+					$this->Application->StoreVar('pt_delete_error', '1');
+				}
+				else {
+					$ids_ok[] = $id;
+				}
+			}
+
+			$event->setEventParam('ids', $ids_ok);
+		}
+	}
+
+	/**
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		$this->Application->StoreVar('check_unused_currencies', 1);
+
+		parent::OnSave($event);
+	}
+
+	/**
+	 * Sets default payment type group
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
+
+		$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+		$fields['PortalGroups']['default'] = ','.$default_group.',';
+		$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+	}
+
+	/**
+	 * Earlier version of group selector control needs such conversion (also used in shipping)
+	 *
+	 * @param kEvent $event
+	 */
+	function convertGroups($event)
+	{
+		$object = $event->getObject();
+
+		$selected_groups = $object->GetDBField('PortalGroups');
+		if ($selected_groups) {
+			$selected_groups = str_replace('|', ',', $selected_groups);
+			$selected_groups = ','.trim($selected_groups, ',').',';
+			$object->SetDBField('PortalGroups', $selected_groups);
+		}
+	}
+
+	/**
+	 * Returns ID of current item to be edited
+	 * by checking ID passed in get/post as prefix_id
+	 * or by looking at first from selected ids, stored.
+	 * Returned id is also stored in Session in case
+	 * it was explicitly passed as get/post
+	 *
+	 * @param kEvent $event
+	 * @return int
+	 * @access public
+	 */
+	public function getPassedID(kEvent $event)
+	{
+		if ( $event->Special == 'auto-ord' ) {
+			/** @var kDBItem $main_object */
+			$main_object = $this->Application->recallObject('ord');
+
+			return $main_object->GetDBField('PaymentType');
+		}
+		elseif ( substr($event->Special, 0, 3) == 'gw-' ) {
+			// returns first matched enabled payment type
+			return Array (
+				'Status' => STATUS_ACTIVE,
+				TABLE_PREFIX . 'Gateways.Name' => $event->getEventParam('gateway')
+			);
+		}
+
+		return parent::getPassedID($event);
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) {
+			// "enabled" special or Front-End
+			$object->addFilter('enabled_filter', '%1$s.Status = ' . STATUS_ACTIVE);
+		}
+
+		// site domain payment type picker
+		if ( $event->Special == 'selected' || $event->Special == 'available' ) {
+			/** @var EditPickerHelper $edit_picker_helper */
+			$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
+
+			$edit_picker_helper->applyFilter($event, 'PaymentTypes');
+		}
+
+		// apply domain-based payment type filtering
+		$payment_types = $this->Application->siteDomainField('PaymentTypes');
+
+		if ( strlen($payment_types) ) {
+			$payment_types = explode('|', substr($payment_types, 1, -1));
+			$object->addFilter('domain_filter', '%1$s.PaymentTypeId IN (' . implode(',', $payment_types) . ')');
+		}
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type/payment_type_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type/payment_type_config.php
===================================================================
--- releases/5.2.2-B2/units/payment_type/payment_type_config.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type/payment_type_config.php	(revision 16630)
@@ -0,0 +1,174 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'pt',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'PaymentTypeEventHandler', 'file' => 'payment_type_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'PaymentTypeTagProcessor', 'file' => 'payment_type_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'PaymentTypeId',
+	'StatusField' => Array ('Status', 'IsPrimary'),
+	'TableName' => TABLE_PREFIX.'PaymentTypes',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('pt' => '!la_title_AddingPaymentType!'),
+			'edit_status_labels' => Array ('pt' => '!la_title_EditingPaymentType!'),
+			'new_titlefield' => Array ('pt' => '!la_title_NewPaymentType!'),
+		),
+
+		'payment_type_list' =>Array (
+			'prefixes' => Array ('pt_List'), 'format' => "!la_title_PaymentTypes!",
+		),
+
+		'payment_type_edit' =>Array (
+			'prefixes' => Array ('pt'),
+			'new_titlefield' => Array ('pt' => '!la_title_NewPaymentType!'),
+			'format' => "#pt_status# '#pt_titlefield#' - !la_title_General!",
+		),
+
+		'gateway' => Array ('prefixes' => Array ('pt'), 'format' => "#pt_status# '#pt_titlefield#' - !la_title_Gateway!"),
+		'group_list' => Array ('prefixes' => Array ('pt'), 'format' => "#pt_status# '#pt_titlefield#' - !la_title_Groups!"),
+
+		'payment_currencies_edit' => Array ('prefixes' => Array ('pt'), 'format' => "#pt_status# '#pt_titlefield#' - !la_title_Currencies!"),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/payment_type/payment_type_edit', 'priority' => 1),
+			'gateway' => Array ('title' => 'la_tab_Gateway', 't' => 'in-commerce/payment_type/payment_type_gateway', 'priority' => 2),
+			'currencies' => Array ('title' => 'la_tab_Currencies', 't' => 'in-commerce/payment_type/payment_type_currencies', 'priority' => 3),
+			'groups' => Array ('title' => 'la_tab_UserGroups', 't' => 'in-commerce/payment_type/payment_type_groups', 'priority' => 4),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:payment_types'),
+
+	'Sections' => Array (
+		'in-commerce:payment_types' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_payment_types',
+			'label' => 'la_tab_PaymentTypes',
+			'url' => Array ('t' => 'in-commerce/payment_type/payment_type_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete'),
+			'priority' => 5,
+			'type' => stTREE,
+		),
+	),
+
+	'TitleField' => 'Name', // field, used in bluebar when editing existing item
+	'SubItems' => Array ('gwfv', 'ptc'),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'Gateway' => TABLE_PREFIX . 'Gateways.Name',
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN ' . TABLE_PREFIX . 'Gateways ON %1$s.GatewayId = ' . TABLE_PREFIX . 'Gateways.GatewayId',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('Priority' => 'desc'),
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100),
+		'Description' => Array (
+			'type' => 'string', 'max_len' => 255,
+			'formatter' => 'kMultiLanguage', 'db_type' => 'varchar(255)',
+			'default' => null
+		),
+		'Instructions' => Array (
+			'type' => 'string',
+			'formatter' => 'kMultiLanguage', 'db_type' => 'text', 'using_fck' => 1,
+			'default' => null
+		),
+		'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ),
+		'GatewayId' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Gateways',
+			'option_key_field' => 'GatewayId',
+			'option_title_field' => 'Name',
+			'default' => 1, 'not_null' => 1,
+		),
+		'PlacedOrdersEdit' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.00'),
+		'PortalGroups' => Array ('type' => 'string', 'default' => null),
+	),
+
+	'VirtualFields' => Array (
+		'Gateway' => Array ('type' => 'string', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'0_0' => 'icon16_disabled.png',
+				'0_1' => 'icon16_disabled.png',
+				'1_0' => 'icon16_item.png',
+				'1_1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+				'Name' => Array ( 'title' => 'la_col_PaymentTypeName', 'data_block' => 'payment_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200),
+				'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
+				'BuiltIn' => Array ( 'title' => 'la_col_BuiltIn', 'filter_block' => 'grid_options_filter', 'width' => 100),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type/payment_type_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.19.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/payment_type/payment_type_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/payment_type/payment_type_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/payment_type/payment_type_tag_processor.php	(revision 16630)
@@ -0,0 +1,53 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class PaymentTypeTagProcessor extends kDBTagProcessor {
+
+		function DeleteError($params){
+			$o = '';
+			$error = $this->Application->RecallVar('pt_delete_error');
+			if ($error){
+				$params['name']=$params['block'];
+				$o = $this->Application->ParseBlock($params);
+				$this->Application->RemoveVar('pt_delete_error');
+			}
+			return $o;
+		}
+
+		function ListGroups($params)
+		{
+
+			$object = $this->getObject($params);
+			$selected = trim($object->GetDBField('PortalGroups'), ',');
+			$selected_arr = explode(',', $selected);
+			$all_groups = $this->Conn->Query('SELECT GroupId, Name FROM '.TABLE_PREFIX.'UserGroups ORDER BY NAME', 'GroupId');
+
+
+			$o = '';
+			$mode = array_key_exists('mode', $params) ? $params['mode'] : false;
+
+			foreach ($all_groups as $a_group) {
+				$is_selected = in_array($a_group['GroupId'], $selected_arr);
+				$continue = $mode == 'selected' ? !$is_selected : $is_selected;
+				if ($continue) continue;
+				$block_params = $a_group;
+				$block_params['name']	= $params['render_as'];
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+
+			return $o;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/payment_type/payment_type_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/manufacturers/manufacturers_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/manufacturers/manufacturers_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/manufacturers/manufacturers_tag_processor.php	(revision 16630)
@@ -0,0 +1,55 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ManufacturersTagProcessor extends kDBTagProcessor{
+
+	function BuildListSpecial($params)
+	{
+		if ($this->Special != '') return $this->Special;
+		if ( isset($params['parent_cat_id']) ) {
+			$parent_cat_id = $params['parent_cat_id'];
+		}
+		else {
+			$parent_cat_id = $this->Application->GetVar('c_id');
+			if (!$parent_cat_id) {
+				$parent_cat_id = $this->Application->GetVar('m_cat_id');
+			}
+		}
+		$recursive = isset($params['recursive']);
+
+		$list_unique_key = $this->getUniqueListKey($params).$recursive;
+		if ($list_unique_key == '') {
+			return parent::BuildListSpecial($params);
+		}
+
+		return crc32($parent_cat_id.$list_unique_key);
+	}
+
+	function ListManufacturers($params)
+	{
+		return $this->PrintList2($params);
+	}
+
+	function ManufacturerLink($params)
+	{
+		$object = $this->getObject($params);
+
+		$params['pass'] = 'm,manuf';
+		$params['m_cat_id'] = 0;
+		$params['manuf_id']	= $object->GetID();
+
+	 	return $this->Application->ProcessParsedTag('m', 'Link', $params);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/manufacturers/manufacturers_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.14.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/manufacturers/manufacturers_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/manufacturers/manufacturers_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/manufacturers/manufacturers_event_handler.php	(revision 16630)
@@ -0,0 +1,137 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ManufacturersEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			'OnItemBuild' => Array('self' => true),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		if ( $this->Application->isAdminUser ) {
+			return;
+		}
+
+		$category_id = $this->Application->GetVar('m_cat_id');
+		$parent_category_id = $event->getEventParam('parent_cat_id');
+
+		if ( (string)$parent_category_id !== '' ) {
+			if ( $parent_category_id != 'any' && $parent_category_id > 0 ) {
+				$category_id = $parent_category_id;
+			}
+		}
+
+		$sql = 'SELECT m.ManufacturerId, COUNT(p.ProductId)
+				FROM ' . TABLE_PREFIX . 'Manufacturers m
+				LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ManufacturerId = m.ManufacturerId
+				LEFT JOIN ' . TABLE_PREFIX . 'CategoryItems ci ON ci.ItemResourceId = p.ResourceId
+				LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON c.CategoryId = ci.CategoryId
+				WHERE (ci.PrimaryCat = 1) AND (p.Status = ' . STATUS_ACTIVE . ') AND (c.Status = ' . STATUS_ACTIVE . ') GROUP BY m.ManufacturerId';
+
+		// add category filter
+
+		$tree_indexes = $this->Application->getTreeIndex($category_id);
+
+		// if category_id is 0 returs false
+		if ( $tree_indexes ) {
+			$sql .= ' AND c.TreeLeft BETWEEN ' . $tree_indexes['TreeLeft'] . ' AND ' . $tree_indexes['TreeRight'];
+		}
+
+		$manufacturers = $this->Conn->GetCol($sql);
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		$object->addFilter('category_manufacturer_filter', $manufacturers ? '%1$s.ManufacturerId IN (' . implode(',', $manufacturers) . ')' : 'FALSE');
+	}
+
+	/**
+	 * Pre-fills states dropdown with correct values
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(kEvent $event)
+	{
+		parent::OnAfterItemLoad($event);
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->PopulateStates($event, 'State', 'Country');
+	}
+
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->CheckStateField($event, 'State', 'Country');
+		$cs_helper->PopulateStates($event, 'State', 'Country');
+	}
+
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->CheckStateField($event, 'State', 'Country');
+		$cs_helper->PopulateStates($event, 'State', 'Country');
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/manufacturers/manufacturers_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/manufacturers/manufacturers_config.php
===================================================================
--- releases/5.2.2-B2/units/manufacturers/manufacturers_config.php	(revision 0)
+++ releases/5.2.2-B2/units/manufacturers/manufacturers_config.php	(revision 16630)
@@ -0,0 +1,136 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'manuf',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ManufacturersEventHandler', 'file' => 'manufacturers_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ManufacturersTagProcessor', 'file' => 'manufacturers_tag_processor.php', 'build_event' => 'OnBuild'),
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'ManufacturerId',
+	'TableName' => TABLE_PREFIX.'Manufacturers',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'),
+			'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
+		),
+		'manuf_list' => Array (
+			'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!",
+		),
+		'manuf_edit' => Array (
+			'prefixes' => Array ('manuf'),
+			'new_titlefield' => Array ('manuf' => '!la_title_NewManufacturer!'),
+			'format' => "#manuf_status# '#manuf_titlefield#' - !la_title_General!",
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:manufacturers'),
+
+	'Sections' => Array (
+		'in-commerce:manufacturers' => Array (
+			'parent' => 'in-commerce',
+			'icon' => 'manufacturers',
+			'label' => 'la_tab_Manufacturers',
+			'url' => Array ('t' => 'in-commerce/manufacturers/manufacturers_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete'),
+			'priority' => 4,
+			'type' => stTREE,
+		),
+	),
+
+	'TitleField' => 'Name', // field, used in bluebar when editing existing item
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'ManufacturerId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'required' =>true, 'max_len' =>255),
+		'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+		'URL' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'max_len' =>255),
+		'Logo' => Array (
+			'type' => 'string',
+			'formatter' => 'kPictureFormatter',
+			'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => IMAGES_PATH.'manufacturers/',
+			'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!',
+			'multiple' => false, 'thumb_format' => 'resize:100x100',
+			'max_len' => 255, 'not_null' => 1, 'default' => ''
+		),
+		'IsPopular' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Email' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'default' => null, 'error_msgs' => Array ('invalid_format' => '!la_invalid_email!') ),
+		'Phone' => Array ('type' => 'string', 'default' => null),
+		'Fax' => Array ('type' => 'string', 'default' => null),
+		'Address1' => Array ('type' => 'string', 'default' => null),
+		'Address2' => Array ('type' => 'string', 'default' => null),
+		'City' => Array ('type' => 'string', 'default' => null),
+		'State' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'option_key_field' => 'DestAbbr', 'option_title_field' => 'Translation', 'default' => null),
+		'Zip' => Array ('type' => 'string', 'default' => null),
+		'Country' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+								FROM '.TABLE_PREFIX.'CountryStates
+								WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+								ORDER BY Name',
+			'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', 'default' => null
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'ManufacturerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ('title' => 'la_col_ManufacturerName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+				'IsPopular' => Array ('title' => 'la_col_IsPopular', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'URL' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+			),
+		),
+	),
+
+	'ConfigMapping' => Array (
+		'PerPage' => 'Comm_Perpage_Manufacturers',
+		'ShortListPerPage' => 'Comm_Perpage_Manufacturers_Short',
+	),
+);

Property changes on: releases/5.2.2-B2/units/manufacturers/manufacturers_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.6
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping/shipping_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/shipping/shipping_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping/shipping_tag_processor.php	(revision 16630)
@@ -0,0 +1,343 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+// include globals.php from current folder
+kUtil::includeOnce(MODULES_PATH . '/in-commerce/units/pricing/globals.php');
+
+class ShippingTagProcessor extends kDBTagProcessor {
+
+	function CostInputSize($params)
+	{
+		$object = $this->Application->recallObject( $this->getPrefixSpecial() );
+		$prec_before_sep = $object->GetDBField('PrecisionBeforeSep');
+		$prec_after_sep = $object->GetDBField('PrecisionAfterSep');
+		return $prec_before_sep + $prec_after_sep + 1 + ($prec_before_sep > 3 ? 1:0);
+	}
+
+	function ShowCostsTable($params)
+	{
+		$object = $this->Application->recallObject( $this->getPrefixSpecial() );
+		$zones_object = $this->Application->recallObject('z');
+		$brackets_object = $this->Application->recallObject('br');
+
+		/** @var kDBItem $costs_object */
+		$costs_object = $this->Application->recallObject('sc');
+
+		$main_processor = $this->Application->recallObject('m_TagProcessor');
+
+		$zones_sql = 'SELECT * FROM '.$zones_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Name ASC';
+		$brackets_sql = 'SELECT * FROM '.$brackets_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Start ASC';
+
+		$sql = 'SELECT * FROM '.$costs_object->TableName;
+		$costs_array = $this->Conn->Query($sql, 'ShippingCostId');
+
+		$zones = $this->Conn->Query($zones_sql, 'ZoneID');
+		$brackets = $this->Conn->Query($brackets_sql, 'BracketId');
+
+		$oddevenparam['odd'] = 'table-color1';
+		$oddevenparam['even'] = 'table-color2';
+
+		if(!$zones || !$brackets)
+		{
+			return '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td>'.$this->Application->Phrase('la_NoZonesOrBrackets').'</td></tr>';
+		}
+
+		uasort($brackets, 'bracket_comp');
+
+		if( $this->Application->GetLinkedVar('CostsTableAligment') )
+		{
+			$column_items = $brackets;
+			$column_object =& $brackets_object;
+			$column_params['header_caption'] = 'bracket_caption';
+			$column_params['IdField'] = 'BracketId';
+			$column_params['prefix'] = 'br';
+
+			$row_items = $zones;
+			$row_object =& $zones_object;
+			$row_params['header_caption'] = 'zone_caption';
+			$row_params['IdField'] = 'ZoneID';
+			$row_params['prefix'] = 'z';
+		}
+		else
+		{
+			$column_items = $zones;
+			$column_object =& $zones_object;
+			$column_params['header_caption'] = 'zone_caption';
+			$column_params['IdField'] = 'ZoneID';
+			$column_params['prefix'] = 'z';
+
+			$row_items = $brackets;
+			$row_object =& $brackets_object;
+			$row_params['header_caption'] = 'bracket_caption';
+			$row_params['IdField'] = 'BracketId';
+			$row_params['prefix'] = 'br';
+		}
+
+		$costs_table = '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td>&nbsp;</td>';
+
+		foreach($column_items as $id => $record)
+		{
+			$column_object->Load($id);
+			$head_row_params = $column_params;
+			$head_row_params['name'] = 'column_header';
+			$costs_table .= $this->Application->ParseBlock($head_row_params);
+		}
+		$costs_table .= '</tr>';
+
+		$cost_ids = Array();
+		foreach($row_items as $id =>$record)
+		{
+			$costs_table .= '<tr class="'.$main_processor->Odd_Even($oddevenparam).'">';
+			$row_object->Load($id);
+			$head_row_params = $row_params;
+			$head_row_params['name'] = 'row_header';
+			$costs_table .= $this->Application->ParseBlock($head_row_params);
+			foreach($column_items as $col_id => $col_record)
+			{
+				$res = false;
+
+				foreach($costs_array as $cost_id => $cost_record)
+				{
+					if($cost_record[$row_params['IdField']] == $id && $cost_record[$column_params['IdField']] == $col_id)
+					{
+						$costs_object->SetDBFieldsFromHash($cost_record);
+						$res = true;
+						break;
+					}
+				}
+
+				if($res == false)
+				{
+					$costs_object->Clear();
+					$sql = 'SELECT MIN(ShippingCostId) FROM '.$costs_object->TableName;
+					$new_id = $cost_ids ? min( $this->Conn->GetOne($sql) - 1, min($cost_ids) - 1 ) : 0;
+					$costs_object->SetDBField( 'ShippingCostId', $new_id );
+					$cost_ids[] = $new_id;
+				}
+				$column_object->Load($col_id);
+				$costs_object->SetID($costs_object->GetDBField('ShippingCostId'));
+				$cost_cell_params['name'] = 'cost_cell';
+
+				$costs_table .= $this->Application->ParseBlock($cost_cell_params);
+			}
+			$costs_table .= '</tr>';
+		}
+		return $costs_table;
+	}
+
+	function HiddenSelection($params)
+	{
+		// $object = $this->getPrefixSpecial();
+
+		$zones = $this->Application->GetVar('z');
+		$brackets = $this->Application->GetVar('br');
+
+		$ret = '';
+		foreach($zones as $id => $record)
+		{
+			$ret .= '<input type="hidden" name="z['.$id.'][ZoneID]" value="'.$id.'">'."\n";
+		}
+		foreach ($brackets as $id => $record)
+		{
+			$ret .= '<input type="hidden" name="br['.$id.'][BracketId]" value="'.$id.'">'."\n";
+		}
+		return $ret;
+	}
+
+	function Order_PrintShippingTypes($params)
+	{
+		$weight = $this->Application->Parser->GetParam('weight_metric');
+		$items = $this->Application->Parser->GetParam('items');
+		$amount = $this->Application->Parser->GetParam('amount');
+		$selected_id = $this->Application->Parser->GetParam('selected_id');
+		$package_id = $this->Application->Parser->GetParam('package_num');
+
+		// free promo shipping params if applicable, if not then the same as standard
+		$promo_items = $this->Application->Parser->GetParam('promo_items');
+		$promo_amount = $this->Application->Parser->GetParam('promo_amount');
+		$promo_weight = $this->Application->Parser->GetParam('promo_weight_metric');
+
+		$user_country_id = $this->Application->Parser->GetParam('user_country_id');
+		$user_state_id = $this->Application->Parser->GetParam('user_state_id');
+		$user_zip = $this->Application->Parser->GetParam('user_zip');
+		$user_city = $this->Application->Parser->GetParam('user_city');
+		$user_addr1 = $this->Application->Parser->GetParam('user_addr1');
+		$user_addr2 = $this->Application->Parser->GetParam('user_addr2');
+		$user_name = $this->Application->Parser->GetParam('user_name');
+
+		$limit_types = $this->Application->Parser->GetParam('limit_types');
+
+		$this->Application->recallObject('ShippingQuoteEngine'); // TODO: why call this here?
+
+		/** @var ShippingQuoteCollector $quote_engine_collector */
+		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+		$shipping_quote_params = Array (
+			'dest_country'	=>	$user_country_id,
+			'dest_state'	=>	$user_state_id,
+			'dest_postal'	=>	$user_zip,
+			'dest_city'		=>	$user_city,
+			'dest_addr1'	=>	$user_addr1,
+			'dest_addr2'	=>	$user_addr2,
+			'dest_name'		=>	$user_name,
+			'packages' 		=>	Array (
+				Array (
+					'package_key'	=>	'package1',
+					'weight'		=>	$weight,
+					'weight_unit'	=>	'KG',
+					'length'		=>	'',
+					'width'			=>	'',
+					'height'		=>	'',
+					'dim_unit'		=>	'IN',
+					'packaging'		=>	'BOX',
+					'contents'		=>	'OTR',
+					'insurance'		=>	'0'
+				),
+			),
+			'amount'		=>	$amount,
+			'items'			=>	$items,
+			'limit_types' 	=> 	$limit_types,
+			'promo_params'	=>	Array (
+				'items'		=>	$promo_items,
+				'amount'	=>	$promo_amount,
+				'weight'	=>	$promo_weight,
+			)
+		);
+
+		$shipping_types = $quote_engine_collector->GetShippingQuotes($shipping_quote_params);
+
+		$last_shippings = $this->Application->RecallVar('LastShippings');
+		if ( $last_shippings ) {
+			$last_shippings = unserialize($last_shippings);
+		}
+
+		/** @var OrdersItem $order_object */
+		$order_object = $this->Application->recallObject('ord');
+
+		$original_shipping = $order_object->GetDBField('ShippingInfo');
+		$original_shipping = unserialize($original_shipping);
+		$shipping_type_keys = array_keys($shipping_types);
+
+		if(	getArrayValue($original_shipping, $package_id, 'ShippingId') &&
+			( $this->Application->isAdminUser || in_array( $original_shipping[$package_id]['ShippingId'], $shipping_type_keys ) ) )
+		{
+			$original_shipping = $original_shipping[$package_id];
+			$key = $original_shipping['ShippingId'];
+
+			// When changing shipping type (via dropdown), then prefer current order's actual
+			// shipping info over one from Shipping Quote Engines.
+			if ( $this->Application->isAdminUser ) {
+				$shipping_types[$key] = $original_shipping;
+				$shipping_types[$key]['ShippingName'] = 'Original: ' . $original_shipping['ShippingName'];
+			}
+
+			$selected_id = $key;
+		}
+
+		$last_shippings[$package_id] = $shipping_types;
+
+		if ( $this->Application->isAdminUser && isset($key) && $key ) {
+			$orig_name = ltrim($last_shippings[$package_id][$key]['ShippingName'], 'Original: ');
+			$last_shippings[$package_id][$key]['ShippingName'] = $orig_name;
+		}
+		$this->Application->StoreVar('LastShippings', serialize($last_shippings));
+
+		$o = '';
+		$def_block_params = Array();
+		$def_block_params['name'] = $this->SelectParam($params, 'render_as,block');
+
+		if ( !count($shipping_types) ) {
+			$this->Application->SetVar('ItemShipmentsExists', 0);
+
+			return '';
+		}
+
+		/** @var LanguagesItem $lang */
+		$lang = $this->Application->recallObject('lang.current');
+
+		foreach ($shipping_types as $shipping_type) {
+			if ( isset($shipping_type['InsuranceFee']) ) {
+				$shipping_type['TotalCost'] += $shipping_type['InsuranceFee'];
+			}
+
+			$shipping_type['ShippingFree'] = ($shipping_type['TotalCost'] == 0) ? 1 : 0;
+
+			$iso = $this->GetISO($params['currency']);
+			$amount = $this->ConvertCurrency($shipping_type['TotalCost'], $iso);
+			$amount = $lang->formatNumber($amount, 2);
+			$shipping_type['TotalCost'] = $this->AddCurrencySymbol($amount, $iso);
+
+			$block_params = array_merge($def_block_params, $shipping_type);
+			$block_params['selected'] = $shipping_type['ShippingId'] == $selected_id ? 'selected' : '';
+
+			if ( isset($params['selected_only']) && $block_params['selected'] == '' ) {
+				continue;
+			}
+
+			$o .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $o;
+	}
+
+	function AvailableTypes($params)
+	{
+		/** @var ShippingQuoteCollector $quote_engine_collector */
+		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+		$types = $quote_engine_collector->GetAvailableShippingTypes();
+
+		$o;
+		foreach ($types as $a_type)
+		{
+			$block_params = $a_type;
+			$block_params['name']	= $params['render_as'];
+			$o .= $this->Application->ParseBlock($block_params);
+		}
+		return $o;
+	}
+
+	protected function ListGroups($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$o = '';
+		$selected = trim($object->GetDBField('PortalGroups'), ',');
+		$selected_arr = explode(',', $selected);
+
+		$sql = 'SELECT GroupId, Name
+				FROM ' . TABLE_PREFIX . 'UserGroups
+				ORDER BY Name';
+		$all_groups = $this->Conn->Query($sql, 'GroupId');
+
+		$mode = array_key_exists('mode', $params) ? $params['mode'] : false;
+
+		foreach ($all_groups as $a_group) {
+			$is_selected = in_array($a_group['GroupId'], $selected_arr);
+			$continue = $mode == 'selected' ? !$is_selected : $is_selected;
+
+			if ( $continue ) {
+				continue;
+			}
+
+			$block_params = $a_group;
+			$block_params['name'] = $params['render_as'];
+			$o .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $o;
+	}
+}

Property changes on: releases/5.2.2-B2/units/shipping/shipping_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping/shipping_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/shipping/shipping_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping/shipping_event_handler.php	(revision 16630)
@@ -0,0 +1,274 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ShippingEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnFlip'			=>	Array ('self' => 'add|edit'),
+			'OnApplyModifier'	=>	Array ('self' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Presets shipping cost object based on shipping fields
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(kEvent $event)
+	{
+		parent::OnAfterItemLoad($event);
+
+		if ( !$this->Application->isAdminUser ) {
+			return;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$format = '%01.' . $object->GetDBField('PrecisionAfterSep') . 'f'; // %01.2f
+		$zero_if_empty = $object->GetDBField('ZeroIfEmpty');
+
+		/** @var kDBItem $sc_object */
+		$sc_object = $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0));
+
+		// change default shipping cost values ("Costs" tab on shipping editing) based on field from "Shipping Type"
+		$flat_options = $sc_object->GetFieldOptions('Flat');
+		$flat_options['format'] = $format;
+		$flat_options['default'] = $zero_if_empty ? 0 : null;
+		$sc_object->SetFieldOptions('Flat', $flat_options);
+
+		$per_unit_options = $sc_object->GetFieldOptions('PerUnit');
+		$per_unit_options['format'] = $format;
+		$per_unit_options['default'] = $zero_if_empty ? 0 : null;
+		$sc_object->SetFieldOptions('PerUnit', $per_unit_options);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 * @return unknown
+	 */
+	function OnApplyModifier($event)
+	{
+		/** @var kDBItem $cost_object */
+		$cost_object = $this->Application->recallObject('sc');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$operation = $this->Application->GetVar('operation');
+
+		/** @var kFormatter $formatter */
+		$formatter = $this->Application->recallObject('kFormatter');
+
+		$modify_by = $formatter->TypeCast($this->Application->GetVar('modify_by'), array('type'=>'float'));
+		$cost_type = $object->GetDBField('CostType');
+
+		$brackets = $this->Application->GetVar('br');
+		$zones = $this->Application->GetVar('z');
+		$conditions = Array();
+
+		if( is_array($zones) ) {
+			$conditions['zones'] = 'ZoneID IN ('.implode( ',', array_keys($zones) ).')';
+		}
+
+		if( is_array($brackets) ) {
+			$conditions['brackets'] = 'BracketId IN ('.implode( ',', array_keys($brackets) ).')';
+		}
+
+		$conditions = implode(' OR ', $conditions);
+
+		if ( !$conditions ) {
+			$this->finalizePopup($event);
+			return ;
+		}
+
+		$sql = 'SELECT ShippingCostId FROM '.$cost_object->TableName.' WHERE '.$conditions;
+		$res = $this->Conn->GetCol($sql);
+
+		switch ( $cost_type ) {
+			case 1:
+				$affected_fields = Array (0 => 'Flat');
+				break;
+
+			case 2:
+				$affected_fields = Array (0 => 'PerUnit');
+				break;
+
+			default:
+				$affected_fields = Array (0 => 'PerUnit', 1 => 'Flat');
+		}
+
+		foreach ($affected_fields as $field) {
+			if ( $operation == '/' && $modify_by == 0 ) {
+				break;
+			}
+
+			$sql = 'UPDATE ' . $cost_object->TableName . '
+					SET ' . $field . '=' . $field . $operation . $modify_by . '
+					WHERE ShippingCostId IN (' . implode(',', $res) . ')
+					AND NOT(' . $field . ' IS NULL)
+					AND ' . $field . $operation . $modify_by . '>=0';
+			$this->Conn->Query($sql);
+		}
+
+		$this->finalizePopup($event);
+	}
+
+	function OnFlip($event)
+	{
+		$object = $event->getObject();
+		$aligment = $this->Application->GetLinkedVar('CostsTableAligment');
+		$new_align = $aligment ? 0 : 1;
+		$this->Application->SetVar('CostsTableAligment', $new_align);
+		$this->Application->LinkVar('CostsTableAligment');
+
+		$this->OnPreSave($event);
+
+		$event->status=kEvent::erSUCCESS;
+	}
+
+	/**
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		$this->OnAfterItemLoad($event);
+
+		parent::OnSave($event);
+	}
+
+	/**
+	 * Occurs after creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemCreate(kEvent $event)
+	{
+		parent::OnAfterItemCreate($event);
+
+		$event->CallSubEvent('OnAnyChange');
+	}
+
+	/**
+	 * Occurs after updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemUpdate(kEvent $event)
+	{
+		parent::OnAfterItemUpdate($event);
+
+		$event->CallSubEvent('OnAnyChange');
+	}
+
+	/**
+	 * Occurs after deleting item, id of deleted item
+	 * is stored as 'id' param of event
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemDelete(kEvent $event)
+	{
+		parent::OnAfterItemDelete($event);
+
+		$event->CallSubEvent('OnAnyChange');
+	}
+
+	function OnAnyChange($event)
+	{
+		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemCache
+				WHERE VarName LIKE "ShippingQuotes%"';
+		$this->Conn->Query($sql);
+	}
+
+	/**
+	 * Creates a new item in temp table and
+	 * stores item id in App vars and Session on success
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreSaveCreated(kEvent $event)
+	{
+		parent::OnPreSaveCreated($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array ('skip_autoload' => true) );
+
+		$object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ',');
+	}
+
+	function UpdateGroups($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		if ( $event->Name == 'OnPreSaveCreated' ) {
+			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
+			$selected_groups = $default_group;
+		}
+		else {
+			$selected_groups = $object->GetDBField('PortalGroups');
+		}
+
+		if ( $selected_groups && $selected_groups != '' ) {
+			$selected_groups = str_replace('|', ',', $selected_groups);
+			$selected_groups = ',' . trim($selected_groups, ',') . ',';
+			$object->SetDBField('PortalGroups', $selected_groups);
+		}
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		$this->UpdateGroups($event);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping/shipping_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.14.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping/shipping_config.php
===================================================================
--- releases/5.2.2-B2/units/shipping/shipping_config.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping/shipping_config.php	(revision 16630)
@@ -0,0 +1,208 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 's',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ShippingEventHandler', 'file' => 'shipping_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ShippingTagProcessor', 'file' => 'shipping_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => 'ord',
+			'AggregatedTagName' => 'PrintShippingTypes',
+			'LocalTagName' => 'Order_PrintShippingTypes',
+		),
+	),
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => 'sc',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnPropagate', 'OnClearAll' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnPreSave',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'ShippingID',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('s' => '!la_title_AddingShippingType!'),
+			'edit_status_labels' => Array ('s' => '!la_title_EditingShippingType!'),
+			'new_titlefield' => Array ('s' => '!la_title_NewShippingType!'),
+		),
+		'shipping_list' => Array (
+			'prefixes' => Array ('s_List'),
+			'format' => "!la_title_ShippingTypes!",
+		),
+		'shipping_type_edit' => Array (
+			'prefixes' => Array ('s'),
+			'format' => "#s_status# '#s_titlefield#' - !la_title_General!",
+		),
+		'zones' => Array (
+			'prefixes' => Array ('s'),
+			'format' => "#s_status# '#s_titlefield#' - !la_title_Zones!",
+		),
+		'zones_edit' => Array (
+			'prefixes' => Array ('z'),
+			'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
+			'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
+			'format' => "#z_status# '#z_titlefield#'",
+		),
+		'brackets' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Brackets!",),
+		'costs' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Costs!",),
+		'groups' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Groups!",),
+		'select_modifier' => Array ('prefixes' => Array ('s'), 'format' => "!la_title_ApplyModifier!",),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/shipping/shipping_edit', 'priority' => 1),
+			'zones' => Array ('title' => 'la_tab_ShippingZones', 't' => 'in-commerce/shipping/shipping_zones', 'priority' => 2),
+			'brackets' => Array ('title' => 'la_tab_Brackets', 't' => 'in-commerce/shipping/shipping_brackets', 'priority' => 3),
+			'costs' => Array ('title' => 'la_tab_Costs', 't' => 'in-commerce/shipping/shipping_costs', 'priority' => 4),
+			'groups' => Array ('title' => 'la_tab_UserGroups', 't' => 'in-commerce/shipping/shipping_type_groups', 'priority' => 5),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:shipping'),
+
+	'Sections' => Array (
+		'in-commerce:shipping_folder' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_shipping',
+			'use_parent_header' => 1,
+			'label' => 'la_tab_Shipping',
+			'permissions' => Array (),
+			'priority' => 4,
+			'type' => stTREE,
+		),
+
+		'in-commerce:shipping' => Array (
+			'parent' => 'in-commerce:shipping_folder',
+			'icon' => 'conf_shipping',
+			'label' => 'la_tab_CustomShippingTypes',
+			'url' => Array ('t' => 'in-commerce/shipping/shipping_custom_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'),
+			'priority' => 4.1,
+			'type' => stTAB,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'ShippingType',
+
+	'SubItems' => Array ('z', 'br'),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')),
+		'SpeedCode' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' => 25),
+		'LocationFrom' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				1 => 'Riga',
+				2 => 'Salaspils',
+				3 => 'Chicago',
+				4 => 'Dublin'
+			),
+			'not_null' => 1, 'default' => 1
+		),
+		'Type' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+			'options' => Array (1 => 'la_ByWeight', 2 => 'la_ByItem', 3 => 'la_ByAmount', 4 => 'la_Handling'),
+			'not_null' => 1, 'default' => 1),
+		'BaseFee' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1),
+		'CODFlatSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1),
+		'CODPercentSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled', 2 => 'la_SelectedOnly' ), 'use_phrases' => 1,
+			'default' => 1, 'not_null' => 1,
+		),
+		'CostType' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Flat', 2 => 'la_PerUnit', 3 => 'la_Combined' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ),
+		'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ),
+		'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => 1 ),
+		'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => 1 ),
+		'PortalGroups' => Array ('type' => 'string', 'default' => null),
+		'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0),
+		'IsFreePromoShipping' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'default' => 0, 'not_null' => 1,
+		),
+		'InsuranceFee' => Array ('type' => 'float', 'default' => null),
+		'InsuranceType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 2
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+				'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
+				'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+				'BaseFee' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 100, ),
+				'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+				'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ),
+//				'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter'),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping/shipping_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.16.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gateway_field_values/gateway_field_values_config.php
===================================================================
--- releases/5.2.2-B2/units/gateway_field_values/gateway_field_values_config.php	(revision 0)
+++ releases/5.2.2-B2/units/gateway_field_values/gateway_field_values_config.php	(revision 16630)
@@ -0,0 +1,51 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'gwfv',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => false,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'GWConfigValueId',
+	'TableName' => TABLE_PREFIX.'GatewayConfigValues',
+	'ForeignKey' => 'PaymentTypeId',
+	'ParentTableKey' => 'PaymentTypeId',
+	'ParentPrefix' => 'pt',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'Fields' => Array (
+		'GWConfigValueId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'GWConfigFieldId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'Value' => Array ('type' => 'string', 'max_len' => 255, 'default' => null, ),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gateway_field_values/gateway_field_values_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/taxes/taxes_config.php
===================================================================
--- releases/5.2.2-B2/units/taxes/taxes_config.php	(revision 0)
+++ releases/5.2.2-B2/units/taxes/taxes_config.php	(revision 16630)
@@ -0,0 +1,120 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'tax',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'TaxesEventHandler', 'file' => 'taxes_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'TaxesTagProcessor', 'file' => 'taxes_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'TaxZoneId',
+	'TitleField' => 'Name',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'),
+			'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'),
+		),
+		'taxes_list' => Array (
+			'prefixes' => Array ('tax_List'), 'format' => "!la_title_Taxes!",
+		),
+		'taxes_edit' => Array (
+			'prefixes' => Array ('tax'),
+			'new_titlefield' => Array ('tax' => '!la_title_NewTax!'),
+			'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!",
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:taxes'),
+
+	'Sections' => Array (
+		'in-commerce:taxes' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_taxes',
+			'label' => 'la_tab_Taxes',
+			'url' => Array ('t' => 'in-commerce/taxes/taxes_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete'),
+			'priority' => 6,
+			'type' => stTREE,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'TaxZones',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'SubItems' => Array ('taxdst'),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc', 'TaxValue' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')),
+		'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1),
+		'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0),
+		'ApplyToShipping' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'default' => 0, 'not_null' => 1,
+		),
+		'ApplyToProcessing' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'default' => 0, 'not_null' => 1,
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+				'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+				'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_range_filter', 'width' => 110, ),
+				'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+				'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+				'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/taxes/taxes_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/taxes/taxes_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/taxes/taxes_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/taxes/taxes_tag_processor.php	(revision 16630)
@@ -0,0 +1,273 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class TaxesTagProcessor extends kDBTagProcessor
+{
+
+	function ShowCountries($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+		$selected_country_id = (int)$this->Application->GetVar('CountrySelector');
+
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
+
+		switch ($params['show']) {
+			case 'current':
+				// selected countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.TaxZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'available':
+				// available countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.TaxZoneId IS NULL
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'all':
+				// always preselect 1st country, when user haven't selected any
+				if (!$selected_country_id) {
+					$sql = 'SELECT StdDestId
+							FROM ' . $destination_table . '
+							WHERE TaxZoneId = ' . $object->GetID();
+					$selected_country_id = $this->Conn->GetOne($sql);
+
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+				}
+
+				// all countries
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+						ORDER BY ' . $name_field;
+				break;
+
+			case 'has_states':
+				/** @var kCountryStatesHelper $cs_helper */
+				$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+				$has_states = $cs_helper->getCountriesWithStates();
+
+				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
+					list ($selected_country_id, ) = each($has_states);
+					$this->Application->SetVar('CountrySelector', $selected_country_id);
+				}
+
+				// preselect country from 1st found state
+				if (!$selected_country_id) {
+					$sql = 'SELECT cs.StateCountryId
+							FROM ' . $table_name . ' cs
+							LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+							WHERE (cs.Type = ' . DESTINATION_TYPE_STATE . ') AND (zd.TaxZoneId = ' . $object->GetID() . ')';
+					$selected_country_id = $this->Conn->GetOne($sql);
+
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+					else {
+						list ($selected_country_id, ) = each($has_states);
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+				}
+
+				// gets only countries with states
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' AND ' . $id_field . ' IN (' . implode(',', array_keys($has_states)) . ')
+						ORDER BY ' . $name_field;
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$ret = '';
+		$countries = $this->Conn->GetCol($sql, $id_field);
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach ($countries as $country_id => $country_name) {
+			$block_params['id'] = $country_id;
+			$block_params['destination_title'] = $country_name;
+			$block_params['selected'] = $selected_country_id == $country_id ? ' selected="selected"' : '';
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	function ShowStates($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
+
+		$country_id = $this->Application->GetVar('CountrySelector');
+
+		switch ($params['show']) {
+			case 'current':
+				// selected states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . ' AND
+							cs.StateCountryId = ' . $country_id . ' AND
+							zd.TaxZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'available':
+				// available states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . '
+							AND zd.TaxZoneId IS NULL
+							AND cs.StateCountryId = ' . $country_id . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'all':
+				// all possible states for selected country
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_STATE . ' AND StateCountryId = ' . $country_id . '
+						ORDER BY ' . $name_field;
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$ret = '';
+		$states = $this->Conn->GetCol($sql, $id_field);
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach($states as $state_id => $state_name) {
+			$block_params['id'] = $state_id;
+			$block_params['destination_title'] = $state_name;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	function ShowZips($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+
+		$country_id = (int)$this->Application->GetVar('CountrySelector');
+
+		$current_sql = 'SELECT DestValue
+						FROM ' . $destination_table . '
+						WHERE
+							COALESCE(DestValue, "") <> "" AND
+							TaxZoneId = ' . $object->GetID() . '
+						ORDER BY DestValue';
+
+		switch ($params['show']) {
+			case 'current':
+				$sql = $current_sql;
+				break;
+
+			case 'available':
+				$selected_zips = $this->Conn->GetCol($current_sql);
+				$selected_zips = $this->Conn->qstrArray($selected_zips);
+
+				$sql = 'SELECT DISTINCT DestValue
+						FROM ' . $this->Application->getUnitOption('taxdst', 'TableName') . '
+						WHERE
+							COALESCE(DestValue, "") <> "" AND
+							TaxZoneId <> ' . $object->GetID() . ' AND
+							' . ($selected_zips ? 'DestValue NOT IN (' . implode(',', $selected_zips) . ') AND' : '') . '
+							StdDestId = ' . $country_id . '
+							ORDER BY DestValue';
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$zips = $this->Conn->GetCol($sql);
+
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach($zips as $zip) {
+			$block_params['id'] = '0|' . $zip;
+			$block_params['destination_title'] = $zip;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Returns table for shipping zone destinations
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function getDestinationsTable($params)
+	{
+		static $table_name = '';
+
+		if (!$table_name) {
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$table_name = $this->Application->getUnitOption('taxdst', 'TableName');
+
+			if ($object->IsTempTable()) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
+		}
+
+		return $table_name;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/taxes/taxes_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/taxes/taxes_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/taxes/taxes_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/taxes/taxes_event_handler.php	(revision 16630)
@@ -0,0 +1,253 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class TaxesEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			'OnTypeChange'		=>	Array('self' => 'add|edit'),
+			'OnCountryChange'	=>	Array('self' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();	// ensure auto-adding of approve/decine and so on events
+
+		$zones_events = Array (
+			'OnAddLocation'		=>	'DestinationAction',
+			'OnRemoveLocation'	=>	'DestinationAction',
+			'OnLoadZoneForm'	=>	'DestinationAction',
+			/*'OnCountryChange'	=>	'DestinationAction',*/
+			'OnNew'				=>	'DestinationAction'
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		/** @var kDBItem $zone_object */
+		$zone_object = $event->getObject();
+
+		if ( $type == 'after' ) {
+			/** @var kDBItem $dst_object */
+			$dst_object = $this->Application->recallObject('taxdst');
+
+			if ( $event->Name == 'OnUpdate' ) {
+				$sql = 'DELETE FROM ' . $dst_object->TableName . '
+						WHERE TaxZoneId = ' . $zone_object->GetID();
+				$this->Conn->Query($sql);
+			}
+			else {
+				$temp = $this->Application->GetVar('taxdst', Array ());
+
+				foreach ($temp as $key => $value) {
+					$temp[$key]['TaxZoneId'] = $zone_object->GetID();
+				}
+
+				$this->Application->SetVar('taxdst', $temp);
+			}
+
+			$this->Application->HandleEvent(new kEvent('taxdst:OnCreate'));
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnTypeChange($event)
+	{
+		$this->Application->DeleteVar('taxdst');
+		$event->CallSubEvent('OnPreSave');
+		$event->redirect = false;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function DestinationAction($event)
+	{
+		$event->redirect = false;
+
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		if($items_info)
+		{
+			foreach($items_info as $item_id => $field_values)
+			{
+				// this is to receive $item_id
+			}
+		}
+
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$object->Load($item_id);
+
+		$object->SetFieldsFromHash($field_values);
+		$object->SetDBField('TaxZoneID', $item_id);
+
+		$destination = $this->Application->recallObject('taxdst');
+		$tax_object = $this->Application->recallObject('tax');
+
+		switch($event->Name)
+		{
+			case 'OnAddLocation':
+
+				$temp = $this->Application->GetVar('taxdst');
+				$zip = $this->Application->GetVar('zip_input') ? $this->Application->GetVar('zip_input') : $this->Application->GetVar('zip_dropdown');
+				$exist=0;
+
+				switch ($object->GetDBField('Type'))
+				{
+					case 1:
+						$location_id = $this->Application->GetVar('country');
+						break;
+					case 2:
+						$location_id = $this->Application->GetVar('state');
+						break;
+					default:
+						$location_id = $this->Application->GetVar('StatesCountry');
+						foreach($temp as $temp_id => $temp_val){
+							if ($temp_val['DestValue']==$zip){
+								$exist=1;
+								break;
+							}
+						}
+				}
+
+				if ($exist == 0){
+					$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$destination->IDField.') FROM '.$destination->TableName);
+
+					if($new_id > 0) $new_id = 0;
+					do
+					{
+						$new_id--;
+					} while ($this->check_array($this->Application->GetVar('taxdst'), 'TaxZoneDestId', $new_id));
+
+
+
+
+					if( ($location_id && !$this->check_array($temp, 'StdDestId', $location_id)) ||
+							($zip && !$this->check_array($temp, 'DestValue', $zip)) )
+					{
+
+						if($tax_object->GetDBField('Type') == 3 && $zip ==''){
+							continue;
+						}
+
+						$temp[$new_id]['TaxZoneDestId'] = $new_id;
+						$temp[$new_id]['StdDestId'] = $location_id;
+						$temp[$new_id]['DestValue'] = $zip ? $zip : '';
+
+						$this->Application->SetVar('taxdst', $temp);
+					}
+				}
+				break;
+
+			case 'OnRemoveLocation':
+
+				$temp = $this->Application->GetVar('taxdst');
+				$selected_destinations = explode(',', $this->Application->GetVar('selected_destinations'));
+				foreach ($selected_destinations as $dest)
+				{
+					unset( $temp[$dest] );
+					if (strlen($dest)>0){
+						$sql = 'DELETE FROM '.$destination->TableName.' WHERE TaxZoneDestId ='.$dest;
+						$this->Conn->Query($sql);
+					}
+				}
+				$this->Application->SetVar('taxdst', $temp);
+
+				break;
+
+			case 'OnLoadZoneForm':
+
+				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE TaxZoneId='.$item_id;
+				$res = $this->Conn->Query($sql);
+				$temp = Array();
+				foreach ($res as $dest_record)
+				{
+					$temp[$dest_record['TaxZoneDestId']]['TaxZoneDestId'] = $dest_record['TaxZoneDestId'];
+					$temp[$dest_record['TaxZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
+					$temp[$dest_record['TaxZoneDestId']]['DestValue'] = $dest_record['DestValue'];
+				}
+				$this->Application->SetVar('taxdst', $temp);
+				//$object = $event->getObject();
+				//$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
+
+				break;
+
+			case 'OnNew':
+
+				//$object = $event->getObject();
+				//$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
+				break;
+
+			case 'OnCountryChange':
+
+				$this->Application->DeleteVar('taxdst');
+
+				break;
+
+			default:
+		}
+
+		$event->CallSubEvent("OnPreSave");
+	}
+
+	function OnCountryChange($event)
+	{
+		/** @var kDBItem $destinations */
+		$destinations = $this->Application->recallObject('taxdst');
+
+		$queryDel="DELETE FROM ".$destinations->TableName." WHERE TaxZoneId=".(int)$this->Application->GetVar('tax_id');
+		$this->Conn->Query($queryDel);
+
+		$this->Application->DeleteVar('taxdst');
+		$event->CallSubEvent('OnPreSave');
+		$event->redirect = false;
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/taxes/taxes_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupons/coupons_config.php
===================================================================
--- releases/5.2.2-B2/units/coupons/coupons_config.php	(revision 0)
+++ releases/5.2.2-B2/units/coupons/coupons_config.php	(revision 16630)
@@ -0,0 +1,182 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'coup',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'CouponsEventHandler', 'file' => 'coupons_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'CouponsTagProcessor', 'file' => 'coupons_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'CouponId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'ProductsCoupons',
+	'SubItems' => Array ('coupi'),
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('coup' => '!la_title_Adding_Coupon!'),
+			'edit_status_labels' => Array ('coup' => '!la_title_Editing_Coupon!'),
+			'new_titlefield' => Array ('coup' => '!la_title_New_Coupon!'),
+		),
+
+		'coupons_list' => Array (
+			'prefixes' => Array ('coup_List'), 'format' => "!la_title_Coupons!",
+		),
+
+		'coupons_edit' => Array (
+			'prefixes' => Array ('coup'),
+			'format' => "#coup_status# '#coup_titlefield#' - !la_title_General!",
+		),
+
+		'coupons_items' => Array (
+			'prefixes' => Array ('coup', 'coupi_List'),
+			'format' => "#coup_status# '#coup_titlefield#' - !la_title_CouponItems!",
+		),
+
+		'coupons_clone' => Array (
+			'prefixes' => Array ('coup'), 'format' => "!la_CloneCoupon!",
+		),
+
+		'coupon_selector' => Array ('format' => '!la_title_CouponSelector!'),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/discounts/coupon_edit', 'priority' => 1),
+			'items' => Array ('title' => 'la_tab_CouponsItems', 't' => 'in-commerce/discounts/coupon_items', 'priority' => 2),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:coupons'),
+
+	'Sections' => Array (
+		'in-commerce:coupons' => Array (
+			'parent' => 'in-commerce:discounts_folder',
+			'icon' => 'discounts_coupons',
+			'label' => 'la_tab_Coupons',
+			'url' => Array ('t' => 'in-commerce/discounts/coupons_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'),
+			'priority' => 3.2, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'CouponId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Status' => Array (
+				'type' => 'int', 'formatter' => 'kOptionsFormatter',
+				'options' => Array ( 1 => 'la_Enabled', 2 => 'la_Used', 0 => 'la_Disabled' ),
+				'use_phrases' => 1, 'not_null' => 1, 'default' => 1
+		),
+		'Name' => Array ( 'type' =>'string', 'required' => 1, 'default' => null, 'max_len' => 255),
+		'Code' => Array (
+				'type' => 'string', 'required' => 1, 'default' => null,
+				'max_len' => 255, 'unique' => Array ('Code'),
+		),
+		'Expiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null,),
+		'GroupId' => Array ('type' => 'int', 'default' => null, ),
+		'Type' => Array (
+				'type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+				'options' => Array ( 1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping'*/),
+				'not_null' => 1, 'default' => 1,
+		 ),
+		'Amount' => Array ('type' => 'double', 'default' => null),
+		'LastUsedBy' => Array (
+			'type' => 'int',
+			'formatter' => 'kLEFTFormatter',
+			'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
+			'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
+			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s',
+			'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD,
+			'required' => 0, 'default' => null,
+		),
+		'LastUsedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'NumberOfUses' => Array ('type' => 'int', 'default' => 1),
+	),
+
+	'VirtualFields' => Array (
+		'CouponCount' => Array ('type' => 'int', 'min_value_inc' => 1, 'default' => 1),
+		'DefaultExpiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				2 => 'icon16_pending.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'CouponId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'Code' => Array ('title' => 'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+				'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'Amount' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+				'LastUsedBy' => Array ('filter_block' => 'grid_like_filter', 'width' => 140, ),
+				'LastUsedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'NumberOfUses' => Array ('filter_block' => 'grid_range_filter', 'width' => 130, ),
+			),
+		),
+		'Radio' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				2 => 'icon16_pending.png',
+				'module' => 'core',
+			),
+			'Selector' => 'radio',
+			'Fields' => Array (
+				'CouponId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ('filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'Code' => Array ('title' => 'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+				'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'Amount' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+				'LastUsedBy' => Array ('filter_block' => 'grid_like_filter', 'width' => 140, ),
+				'LastUsedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'NumberOfUses' => Array ('filter_block' => 'grid_range_filter', 'width' => 130, ),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/coupons/coupons_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupons/coupons_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/coupons/coupons_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/coupons/coupons_tag_processor.php	(revision 16630)
@@ -0,0 +1,18 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class CouponsTagProcessor extends kDBTagProcessor {
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/coupons/coupons_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupons/coupons_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/coupons/coupons_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/coupons/coupons_event_handler.php	(revision 16630)
@@ -0,0 +1,235 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CouponsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnItemBuild' => Array ('self' => true),
+			'OnApplyClone' => Array ('self' => 'add'),
+			'OnPrepareClone' => Array ('self' => 'view'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Prepares coupon cloning
+	 *
+	 * @param kEvent $event
+	 */
+	function OnPrepareClone($event)
+	{
+		$this->StoreSelectedIDs($event);
+
+		$event->CallSubEvent('OnNew');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->setCloningRequired($object);
+		$clone_count = $this->Application->RecallVar('CoupLastCloneCount');
+
+		if ( is_numeric($clone_count) && $clone_count > 0 ) {
+			$object->SetDBField('CouponCount', $clone_count);
+		}
+
+		$expire_days = $this->Application->ConfigValue('Comm_DefaultCouponDuration');
+		$default_expiration = strtotime('+' . $expire_days . ' days');
+
+		$object->SetDBField('DefaultExpiration_date', $default_expiration);
+		$object->SetDBField('DefaultExpiration_time', $default_expiration);
+	}
+
+	/**
+	 * Occurs before an item has been cloned
+	 * Id of newly created item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeClone(kEvent $event)
+	{
+		parent::OnBeforeClone($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->SetNewCode($object);
+
+		$object->SetDBField('LastUsedBy', NULL);
+		$object->SetDBField('LastUsedOn', NULL);
+		$object->SetDBField('NumberOfUses', NULL);
+
+		$expiration = $this->Application->GetVar('clone_coupon_expiration');
+		$object->SetDBField('Expiration_date', $expiration);
+		$object->SetDBField('Expiration_time', $expiration);
+	}
+
+	function OnApplyClone(kEvent $event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array ('skip_autoload' => true) );
+
+		$this->setCloningRequired($object);
+
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		list($id, $field_values) = each($items_info);
+		$object->setID($id);
+		$object->SetFieldsFromHash($field_values);
+		$event->setEventParam('form_data', $field_values);
+
+		if ( !$object->Validate() ) {
+			$event->status = kEvent::erFAIL;
+			return ;
+		}
+
+		/** @var kTempTablesHandler $temp */
+		$temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+
+		$original_coupon_ids = $this->getSelectedIDs($event, true);
+		$clone_count = $object->GetDBField('CouponCount');
+		$this->Application->StoreVar('CoupLastCloneCount', $clone_count);
+		$this->Application->SetVar('clone_coupon_expiration', $object->GetDBField('DefaultExpiration'));
+
+		for ($i = 0; $i < $clone_count; $i++) {
+			$temp->CloneItems($event->Prefix, $event->Special, $original_coupon_ids);
+		}
+
+		$event->SetRedirectParam('opener', 'u');
+	}
+
+	/**
+	 * Sets fields required during coupon cloning
+	 *
+	 * @param kDBItem $object
+	 * @return void
+	 * @access protected
+	 */
+	protected function setCloningRequired(&$object)
+	{
+		$this->RemoveRequiredFields($object);
+		$object->setRequired('CouponCount');
+		$object->setRequired('DefaultExpiration');
+	}
+
+	function SetNewCode(&$item)
+	{
+		do{
+			$new_code = $this->RandomCouponCode();
+			$exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'ProductsCoupons WHERE Code='.$this->Conn->qstr($new_code));
+			if ($exists){
+				$new_code = false;
+			}
+		} while (!$new_code);
+
+		$item->SetDBField('Code', $new_code);
+	}
+
+	function RandomCouponCode()
+	{
+		$rand_code = '';
+
+		for ($i = 0; $i < 10; $i++) {
+			$is_letter = rand(0, 1);
+			$rand_code .= ($is_letter ? chr(rand(65, 90)) : rand(0, 9));
+		}
+
+		return $rand_code;
+	}
+
+	/**
+	 * Prepare temp tables for creating new item
+	 * but does not create it. Actual create is
+	 * done in OnPreSaveCreated
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreCreate(kEvent $event)
+	{
+		parent::OnPreCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$exp_date = adodb_mktime();
+		$default_duration = $this->Application->ConfigValue('Comm_DefaultCouponDuration');
+
+		if ( $default_duration && $default_duration > 0 ) {
+			$exp_date += (int)$default_duration * 86400;
+		}
+
+		$object->SetDBField('Expiration_date', $exp_date);
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before item is changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->SetDBField('Amount', abs($object->GetDBField('Amount')));
+	}
+}

Property changes on: releases/5.2.2-B2/units/coupons/coupons_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.14
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/discount_items/discount_items_config.php
===================================================================
--- releases/5.2.2-B2/units/discount_items/discount_items_config.php	(revision 0)
+++ releases/5.2.2-B2/units/discount_items/discount_items_config.php	(revision 16630)
@@ -0,0 +1,130 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'di',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'DiscountItemsEventHandler', 'file' => 'discount_items_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'DiscountItemsTagProcessor', 'file' => 'discount_items_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'p',
+			'HookToSpecial' => '-item',
+			'HookToEvent' => Array ('OnAfterItemDelete'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnDeleteDiscountedItem',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'DiscountItemId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'ProductsDiscountItems',
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ProductId' => 'p.ProductId',
+			'ItemName' => 'IF(p.Name IS NULL,c.Name,p.l1_Name)',
+			'SKU' => 'p.SKU',
+			'Weight' => 'p.Weight',
+			'CreatedOn' => 'p.CreatedOn',
+			'BackOrderDate' => 'p.BackOrderDate',
+			'Status' => 'p.Status',
+			'CategoryId' => 'c.CategoryId',
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Products p ON %1$s.ItemResourceId = p.ResourceId
+				LEFT JOIN '.TABLE_PREFIX.'Categories c ON %1$s.ItemResourceId = c.ResourceId',
+	),
+
+	/*'BelongsTo' => Array (
+		Array ('prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'),
+	),*/
+
+	'ForeignKey' => 'DiscountId',
+	'ParentTableKey' => 'DiscountId',
+	'ParentPrefix' => 'd',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('ItemName' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'DiscountItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'DiscountId' => Array ('type' => 'int', 'default' => null, ),
+		'ItemResourceId' => Array ('type' => 'int', 'default' => null, ),
+		'ItemType' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Product', 2 => 'la_Category', 0 => 'la_WholeOrder' ), 'default' => 1, ),
+	),
+
+	'VirtualFields' => Array (
+		'ProductId' => Array ('type' => 'int', 'default' => 0),
+		'ItemName' => Array ('type' => 'string', 'default' => ''),
+		'SKU' => Array ('type' => 'string', 'default' => ''),
+		'Weight' => Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL),
+		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'BackOrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'default' => 2,
+		),
+		'CategoryId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array ('default' => 'icon16_entire_order.gif'),
+			'Fields' => Array (
+				'ItemType' => Array ( 'title' => 'la_col_ItemType', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_empty_filter'),
+			),
+		),
+		'DiscountItems' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+			),
+			'Fields' => Array (
+				'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
+				'ItemName' => Array ( 'filter_block' => 'grid_like_filter'),
+				'ItemType' => Array ( 'title' => 'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/discount_items/discount_items_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/discount_items/discount_items_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/discount_items/discount_items_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/discount_items/discount_items_tag_processor.php	(revision 16630)
@@ -0,0 +1,48 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class DiscountItemsTagProcessor extends kDBTagProcessor  {
+
+	function IsEntireOrder($params)
+	{
+		$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+		if ($this->Application->IsTempMode($this->Prefix)) {
+			$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+		}
+
+		$sql = 'SELECT COUNT(*)
+				FROM ' . $table_name . '
+				WHERE (ItemType = 0) AND (DiscountId = ' . $this->Application->GetVar('d_id') . ')';
+		return $this->Conn->GetOne($sql);
+	}
+
+	function ItemIcon($params)
+	{
+		/** @var kDBList $object */
+		$object = $this->getObject($params);
+
+		if ($object->GetDBField('ItemType') == 2) {
+			$cat_object = $this->Application->recallObject('c');
+			$cat_object->Load( $object->GetDBField('CategoryId') );
+			$cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
+
+			return $cat_tag_processor->ItemIcon();
+		}
+
+		return parent::ItemIcon($params);
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/discount_items/discount_items_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5.8.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/discount_items/discount_items_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/discount_items/discount_items_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/discount_items/discount_items_event_handler.php	(revision 16630)
@@ -0,0 +1,161 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class DiscountItemsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			'OnEntireOrder' => Array ('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Adds products from selected categories and their sub-categories and directly selected products to discount items with duplicate checking
+	 *
+	 * @param kEvent $event
+	 */
+	function OnProcessSelected($event)
+	{
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$selected_ids = $this->Application->GetVar('selected_ids');
+
+		if ($selected_ids['c'] == $this->Application->GetVar('m_cat_id')) {
+			// no categories were selected, so selector returned current in catalog. This is not needed here
+			$selected_ids['c'] = '';
+		}
+
+		$table_data = $object->getLinkedInfo();
+
+		// in selectors we could select category & item together
+		$prefixes = Array('c', 'p');
+
+		foreach ($prefixes as $prefix) {
+			$item_ids = $selected_ids[$prefix] ? explode(',', $selected_ids[$prefix]) : Array();
+			if (!$item_ids) continue;
+
+			if ($prefix == 'c') {
+				// select all products from selected categories and their subcategories
+				$sql = 'SELECT DISTINCT p.ResourceId
+						FROM '.TABLE_PREFIX.'Categories c
+						LEFT JOIN '.TABLE_PREFIX.'CategoryItems ci ON c.CategoryId = ci.CategoryId
+						LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ResourceId = ci.ItemResourceId
+						WHERE (p.ProductId IS NOT NULL) AND (c.ParentPath LIKE "%|'.implode('|%" OR c.ParentPath LIKE "%|', $item_ids).'|%")';
+				$resource_ids = $this->Conn->GetCol($sql);
+			}
+			else {
+				// select selected prodcts
+				$sql = 'SELECT ResourceId
+						FROM '.$this->Application->getUnitOption($prefix, 'TableName').'
+						WHERE '.$this->Application->getUnitOption($prefix, 'IDField').' IN ('.implode(',', $item_ids).')';
+				$resource_ids = $this->Conn->GetCol($sql);
+			}
+
+			if (!$resource_ids) continue;
+
+			$sql = 'SELECT ItemResourceId
+					FROM '.$object->TableName.'
+					WHERE ('.$table_data['ForeignKey'].' = '.$table_data['ParentId'].') AND (ItemResourceId IN ('.implode(',', $resource_ids).'))';
+
+			// 1. don't insert items, that are already in
+			$skip_resource_ids = $this->Conn->GetCol($sql);
+			$resource_ids = array_diff($resource_ids, $skip_resource_ids); // process only not already in db resourceids for current discount
+
+			// 2. insert ids, that left
+			foreach ($resource_ids as $resource_id) {
+				$object->SetDBField($table_data['ForeignKey'], $table_data['ParentId']);
+				$object->SetDBField('ItemResourceId', $resource_id);
+				$object->SetDBField('ItemType', 1);
+				$object->Create();
+			}
+		}
+		$this->finalizePopup($event);
+	}
+
+	/**
+	 * Allows to set discount on entire order
+	 *
+	 * @param kEvent $event
+	 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
+	 * @access public
+	 */
+	function OnEntireOrder($event)
+	{
+		$object = $event->getObject();
+		$sql = 'DELETE FROM '.$object->TableName.' WHERE DiscountId='.$this->Application->GetVar('d_id');
+		$this->Conn->Query($sql);
+
+		$object->SetDBField('DiscountId', $this->Application->GetVar('d_id'));
+		$object->SetDBField('ItemResourceId', -1);
+		$object->SetDBField('ItemType', 0);
+
+		if ( $object->Create() ) {
+			$this->customProcessing($event,'after');
+			$event->status = kEvent::erSUCCESS;
+			$event->SetRedirectParam('opener', 's');
+		}
+		else {
+			$event->status = kEvent::erFAIL;
+			$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent','OnCreate');
+			$object->setID(0);
+		}
+	}
+
+	/**
+	 * Deletes discount items where hooked item (product) is used
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDeleteDiscountedItem($event)
+	{
+		$main_object = $event->MasterEvent->getObject();
+		$resource_id = $main_object->GetDBField('ResourceId');
+
+		$table = $this->Application->getUnitOption($event->Prefix,'TableName');
+		$sql = 'DELETE FROM '.$table.' WHERE ItemResourceId = '.$resource_id;
+		$this->Conn->Query($sql);
+	}
+
+	/**
+	 * Makes ItemName calculated field from primary language
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+
+		$language_id = $this->Application->GetVar('m_lang');
+		$primary_language_id = $this->Application->GetDefaultLanguageId();
+
+		$calculated_fields['']['ItemName'] = 'COALESCE(p.l' . $language_id . '_Name, p.l' . $primary_language_id . '_Name)';
+		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/discount_items/discount_items_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/shipping_costs/shipping_costs_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_costs/shipping_costs_event_handler.php	(revision 16630)
@@ -0,0 +1,301 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ShippingCostsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			'OnPropagate'	=>	Array('subitem' => 'add|edit'),
+			'OnClearAll'	=>	Array('subitem' => 'add|edit'),
+			'OnSaveCreated'	=>	Array('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Creates new kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCreate(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		$zones_object = $this->Application->recallObject('z');
+
+		$sql = 'SELECT ZoneID
+				FROM ' . $zones_object->TableName . '
+				WHERE ShippingTypeID = ' . $this->Application->GetVar('s_id');
+		$res = $this->Conn->GetCol($sql);
+
+		$sql = 'DELETE FROM ' . $object->TableName . '
+				WHERE ZoneID IN (' . implode(',', $res) . ')';
+		$this->Conn->Query($sql);
+
+		// creates multiple db records from single request (OnCreate event only creates 1 record)
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+		if ( !$items_info ) {
+			return;
+		}
+
+		foreach ($items_info as $field_values) {
+			$object->setID(0);
+			$object->SetFieldsFromHash($field_values);
+			$event->setEventParam('form_data', $field_values);
+			$this->customProcessing($event, 'before');
+
+			if ( $object->Create() ) {
+				$this->customProcessing($event, 'after');
+				$event->status = kEvent::erSUCCESS;
+			}
+			else {
+				$event->status = kEvent::erFAIL;
+				$event->redirect = false;
+				$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+				$object->setID(0);
+			}
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnPropagate($event)
+	{
+	//	$this->OnCreate($event);
+
+		$object = $event->getObject();
+
+		$shipping_object = $this->Application->recallObject('s');
+
+		if( $this->Application->GetVar('br_propagate_id') )
+		{
+			$propagate_id = $this->Application->GetVar('br_propagate_id');
+			$idfield = 'BracketId';
+		}
+		else
+		{
+			$propagate_id = $this->Application->GetVar('z_propagate_id');
+			$idfield = 'ZoneID';
+		}
+
+		$cost_type = $shipping_object->GetDBField('CostType');
+		switch($cost_type)
+		{
+			case 1:
+				$affected_fields = Array(0 => 'Flat');
+				break;
+			case 2:
+				$affected_fields = Array(0 => 'PerUnit');
+				break;
+			default:
+				$affected_fields = Array(0 => 'PerUnit', 1 => 'Flat');
+				break;
+		}
+
+		$sql = 'SELECT ShippingCostId,'.implode(',', $affected_fields).'
+				FROM '.$object->TableName.'
+				WHERE '.$idfield.'='.$propagate_id;
+		$res = $this->Conn->Query($sql);
+
+		if(is_array($res))
+		{
+			$res = array_reverse($res);
+			foreach($affected_fields as $field)
+			{
+				$first_elem = getArrayValue($res, 0);
+				if( (double)$first_elem[$field] )
+				{
+					$iterating_value = $first_elem[$field];
+					$second_elem = getArrayValue($res, 1);
+					if( is_array($second_elem) && (double)$second_elem[$field] )
+					{
+						$increment = $second_elem[$field] - $first_elem[$field];
+					}
+					else
+					{
+						$increment = 0;
+					}
+
+					foreach($res as $record)
+					{
+						$object->Load($record['ShippingCostId']);
+
+						$new_value = ($iterating_value >= 0) ? $iterating_value : null;
+						$object->SetDBField($field, $new_value);
+
+						$object->Update();
+						$iterating_value += $increment;
+					}
+				}
+			}
+		}
+
+		/*$shipping_event = new kEvent('s:OnPreSave');
+		$shipping_event->status = kEvent::erFATAL;
+		$this->Application->HandleEvent($shipping_event);*/
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnClearAll($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		/** @var kDBItem $zones_object */
+		$zones_object = $this->Application->recallObject('z');
+
+		$sql = 'SELECT ZoneID
+				FROM ' . $zones_object->TableName . '
+				WHERE ShippingTypeID = ' . $this->Application->GetVar('s_id');
+		$res = $this->Conn->GetCol($sql);
+
+		$sql = 'DELETE FROM ' . $object->TableName . '
+				WHERE ZoneID IN (' . implode(',', $res) . ')';
+		$this->Conn->Query($sql);
+
+		$event->setRedirectParams(Array ('opener' => 's', 'pass_events' => false));
+		$event->status = kEvent::erSUCCESS;
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		if ( $type == 'before' && $this->Application->GetVar('sc') ) {
+			/** @var kDBItem $shipping_obj */
+			$shipping_obj = $this->Application->recallObject('s');
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$zero_if_empty = $shipping_obj->GetDBField('ZeroIfEmpty');
+
+			if ( $object->GetDBField('Flat') == '' ) {
+				$flat = $zero_if_empty ? 0 : null;
+				$object->SetDBField('Flat', $flat);
+			}
+			if ( $object->GetDBField('PerUnit') == '' ) {
+				$per_unit = $zero_if_empty ? 0 : null;
+				$object->SetDBField('PerUnit', $per_unit);
+			}
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSaveCreated($event)
+	{
+		$event->CallSubEvent('OnCreate');
+		$event->redirect = false;
+		$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all'));
+	}
+
+	/**
+	 * Occurs after an item has been copied to temp
+	 * Id of copied item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterCopyToTemp(kEvent $event)
+	{
+		parent::OnAfterCopyToTemp($event);
+
+		$id = $event->getEventParam('id');
+
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
+
+		$object->SwitchToTemp();
+		$object->Load($id);
+
+		/** @var kDBItem $shipping_obj */
+		$shipping_obj = $this->Application->recallObject('s');
+
+		/** @var LanguagesItem $lang_object */
+		$lang_object = $this->Application->recallObject('lang.current');
+
+		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
+		if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) {
+			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') * kUtil::POUND_TO_KG);
+			$object->Update(null, null, true);
+		}
+	}
+
+	/**
+	 * Occurs before an item is copied to live table (after all foreign keys have been updated)
+	 * Id of item being copied is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeCopyToLive(kEvent $event)
+	{
+		parent::OnBeforeCopyToLive($event);
+
+		$id = $event->getEventParam('id');
+
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
+
+		$object->SwitchToTemp();
+		$object->Load($id);
+
+		/** @var kDBItem $shipping_obj */
+		$shipping_obj = $this->Application->recallObject('s');
+
+		/** @var LanguagesItem $lang_object */
+		$lang_object = $this->Application->recallObject('lang.current');
+
+		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
+		if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) {
+			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') / kUtil::POUND_TO_KG);
+			$object->Update(null, null, true);
+		}
+	}
+}

Property changes on: releases/5.2.2-B2/units/shipping_costs/shipping_costs_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/shipping_costs/shipping_costs_config.php
===================================================================
--- releases/5.2.2-B2/units/shipping_costs/shipping_costs_config.php	(revision 0)
+++ releases/5.2.2-B2/units/shipping_costs/shipping_costs_config.php	(revision 16630)
@@ -0,0 +1,65 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'sc',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ShippingCostsEventHandler', 'file' => 'shipping_costs_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => true,
+			'HookToPrefix' => 's',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnPreSaveAndGoToTab', 'OnPreSaveAndGo', 'OnPreSave', 'OnFlip', 'OnApplyModifier' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnCreate',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'ShippingCostId',
+	'TableName' => TABLE_PREFIX.'ShippingCosts',
+	'ForeignKey' => Array ('z' => 'ZoneID', 'br' => 'BracketId'),
+	'ParentTableKey' => Array ('z' => 'ZoneID', 'br' => 'BracketId'),
+	'ParentPrefix' => 'z',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		''=> '	SELECT *
+				FROM %s'
+	),
+
+	'Fields' => Array (
+		'ShippingCostId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ZoneID' => Array ('type' => 'int', 'not_null' => true, 'default' => 0),
+		'BracketId' => Array ('type' => 'int', 'not_null' => true, 'default' => 0),
+		'Flat' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
+		'PerUnit' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/shipping_costs/shipping_costs_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/zones/zones_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/zones/zones_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/zones/zones_event_handler.php	(revision 16630)
@@ -0,0 +1,276 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ZonesEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			'OnTypeChange'		=>	Array('subitem' => 'add|edit'),
+			'OnCountryChange'	=>	Array('subitem' => 'add|edit'),
+			'OnLoadZoneForm'	=>	Array('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
+
+		$zones_events = Array(
+			'OnAddLocation'		=>	'DestinationAction',
+			'OnRemoveLocation'	=>	'DestinationAction',
+			'OnLoadZoneForm'	=>	'DestinationAction',
+			/*'OnCountryChange'	=>	'DestinationAction',*/
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		/** @var kDBItem $zone_object */
+		$zone_object = $event->getObject();
+
+		switch ($type) {
+			case 'before':
+				if ( $event->Name == 'OnCreate' ) {
+					$zone_object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
+				}
+				break;
+
+			case 'after':
+				/** @var kDBItem $dst_object */
+				$dst_object = $this->Application->recallObject('dst');
+
+				if ( $event->Name == 'OnUpdate' ) {
+					$sql = 'DELETE FROM ' . $dst_object->TableName . '
+							WHERE ShippingZoneId = ' . $zone_object->GetID();
+					$this->Conn->Query($sql);
+				}
+				else {
+					$temp = $this->Application->GetVar('dst', Array ());
+					foreach ($temp as $key => $value) {
+						$temp[$key]['ShippingZoneId'] = $zone_object->GetID();
+					}
+					$this->Application->SetVar('dst', $temp);
+				}
+
+				$this->Application->HandleEvent(new kEvent('dst:OnCreate'));
+				break;
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnTypeChange($event)
+	{
+		$this->Application->DeleteVar('dst');
+
+		$event->CallSubEvent($this->Application->GetVar('z_OriginalSaveEvent'));
+		$event->redirect = false;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function DestinationAction($event)
+	{
+		$event->redirect = false;
+
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		if($items_info)
+		{
+			foreach($items_info as $item_id => $field_values)
+			{
+				// this is to receive $item_id
+			}
+		}
+
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$object->Load($item_id);
+
+		$object->SetFieldsFromHash($field_values);
+		$object->SetDBField('ZoneID', $item_id);
+
+		$destination = $this->Application->recallObject('dst');
+
+		switch($event->Name)
+		{
+			case 'OnAddLocation':
+				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$destination->IDField.') FROM '.$destination->TableName);
+				if($new_id > 0) $new_id = 0;
+				do
+				{
+					$new_id--;
+				} while ($this->check_array($this->Application->GetVar('dst'), 'ZoneDestId', $new_id));
+
+				switch ($object->GetDBField('Type'))
+				{
+					case 1:
+						$location_id = $this->Application->GetVar('country');
+						break;
+					case 2:
+						$location_id = $this->Application->GetVar('state');
+						break;
+					default:
+						$location_id = '';
+				}
+
+				$temp = $this->Application->GetVar('dst');
+				$zip = $this->Application->GetVar('zip_input') ? $this->Application->GetVar('zip_input') : $this->Application->GetVar('zip_dropdown');
+
+				if( ($location_id && !$this->check_array($temp, 'StdDestId', $location_id)) ||
+						($zip && !$this->check_array($temp, 'DestValue', $zip)) )
+				{
+					$temp[$new_id]['ZoneDestId'] = $new_id;
+					$temp[$new_id]['StdDestId'] = $location_id;
+					$temp[$new_id]['DestValue'] = $zip ? $zip : '';
+
+					$this->Application->SetVar('dst', $temp);
+				}
+				break;
+
+			case 'OnRemoveLocation':
+
+				$temp = $this->Application->GetVar('dst');
+				$selected_destinations = explode(',', $this->Application->GetVar('selected_destinations'));
+				foreach ($selected_destinations as $dest)
+				{
+					unset( $temp[$dest] );
+				}
+				$this->Application->SetVar('dst', $temp);
+
+				break;
+
+			case 'OnLoadZoneForm':
+
+				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE ShippingZoneId='.$item_id;
+				$res = $this->Conn->Query($sql);
+				$temp = Array();
+				foreach ($res as $dest_record)
+				{
+					$temp[$dest_record['ZoneDestId']]['ZoneDestId'] = $dest_record['ZoneDestId'];
+					$temp[$dest_record['ZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
+					$temp[$dest_record['ZoneDestId']]['DestValue'] = $dest_record['DestValue'];
+				}
+				$this->Application->SetVar('dst', $temp);
+				$object = $event->getObject();
+				$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
+				$this->Application->StoreVar('zone_mode'.$this->Application->GetVar('m_wid'), 'edit');
+
+				break;
+
+			/*case 'OnNew':
+				$object = $event->getObject();
+				$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
+				break;*/
+
+			case 'OnCountryChange':
+
+				$this->Application->DeleteVar('dst');
+
+				break;
+
+			default:
+		}
+	}
+
+	function OnCountryChange($event)
+	{
+		/** @var kDBItem $destinations */
+		$destinations = $this->Application->recallObject('dst');
+
+		$queryDel="DELETE FROM ".$destinations->TableName." WHERE ShippingZoneId=".$this->Application->GetVar($event->Prefix.'_id');
+		$this->Conn->Query($queryDel);
+
+		$this->Application->DeleteVar('dst');
+
+		$event->CallSubEvent($this->Application->GetVar('z_OriginalSaveEvent'));
+		$event->redirect = false;
+	}
+
+	/**
+	 * Cancels kDBItem Editing/Creation
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCancel(kEvent $event)
+	{
+		parent::OnCancel($event);
+
+		/** @var kDBItem $dst_object */
+		$dst_object = $this->Application->recallObject('dst');
+
+		$sql = 'DELETE FROM ' . $dst_object->TableName . '
+				WHERE ShippingZoneId = 0';
+		$this->Conn->Query($sql);
+
+		// if cancelling after create
+		if ( $this->Application->RecallVar('zone_mode' . $this->Application->GetVar('m_wid')) == 'create' ) {
+			/** @var kDBItem $zone */
+			$zone = $event->getObject();
+
+			$zone->Delete();
+		}
+	}
+
+	/**
+	 * Prepares new kDBItem object
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnNew(kEvent $event)
+	{
+		parent::OnNew($event);
+
+		$this->Application->StoreVar('zone_mode' . $this->Application->GetVar('m_wid'), 'create');
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/zones/zones_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/zones/zones_config.php
===================================================================
--- releases/5.2.2-B2/units/zones/zones_config.php	(revision 0)
+++ releases/5.2.2-B2/units/zones/zones_config.php	(revision 16630)
@@ -0,0 +1,105 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'z',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ZonesEventHandler', 'file' => 'zones_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ZonesTagProcessor', 'file' => 'zones_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'ZoneID',
+	'TitleField' => 'Name',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
+			'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
+		),
+		'zones_edit' => Array (	'prefixes' => Array ('z'), 'format' => "#z_status# - '#z_titlefield#'"),
+	),
+
+	'TableName' => TABLE_PREFIX . 'ShippingZones',
+	'ForeignKey' => 'ShippingTypeID', //Name of the field in this table used as ForeignKey
+	'ParentTableKey' => 'ShippingID', //Name of the field in parent table linked with ForeignKey
+	'ParentPrefix' => 's', //Prefix of parent item
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'SubItems' => Array ('dst', 'sc'),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'ZoneID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
+		'Name' => Array (
+			'type' => 'string', 'max_len' => 100,
+			'required' => 1, 'default' => '', 'not_null' => 1,
+			'error_msgs' => Array ('required' => 'Please fill in'),
+		),
+		'Type' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+			'options' => Array (
+				1 => 'la_ByCountry',
+				2 => 'la_ByState',
+				3 => 'la_ByZIP'
+			),
+			'not_null' => 1, 'default' => 1,
+		),
+		'CODallowed' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_NotAllowed', 1 => 'la_Allowed',), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 1,
+		),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'ZoneID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+				'Name' => Array ( 'title' => 'column:la_fld_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'CODallowed' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 120, )
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/zones/zones_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/zones/zones_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/zones/zones_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/zones/zones_tag_processor.php	(revision 16630)
@@ -0,0 +1,272 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ZonesTagProcessor extends kDBTagProcessor
+{
+	function ShowCountries($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+		$selected_country_id = (int)$this->Application->GetVar('CountrySelector');
+
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
+
+		switch ($params['show']) {
+			case 'current':
+				// selected countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.ShippingZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'available':
+				// available countries in current zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE cs.Type = ' . DESTINATION_TYPE_COUNTRY . ' AND zd.ShippingZoneId IS NULL
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'all':
+				// always preselect 1st country, when user haven't selected any
+				if (!$selected_country_id) {
+					$sql = 'SELECT StdDestId
+							FROM ' . $destination_table . '
+							WHERE ShippingZoneId = ' . $object->GetID();
+					$selected_country_id = $this->Conn->GetOne($sql);
+
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+				}
+
+				// all countries
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+						ORDER BY ' . $name_field;
+				break;
+
+			case 'has_states':
+				/** @var kCountryStatesHelper $cs_helper */
+				$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+				$has_states = $cs_helper->getCountriesWithStates();
+
+				if ($selected_country_id && !array_key_exists($selected_country_id, $has_states)) {
+					list ($selected_country_id, ) = each($has_states);
+					$this->Application->SetVar('CountrySelector', $selected_country_id);
+				}
+
+				// preselect country from 1st found state
+				if (!$selected_country_id) {
+					$sql = 'SELECT cs.StateCountryId
+							FROM ' . $table_name . ' cs
+							LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+							WHERE (cs.Type = ' . DESTINATION_TYPE_STATE . ') AND (zd.ShippingZoneId = ' . $object->GetID() . ')';
+					$selected_country_id = $this->Conn->GetOne($sql);
+
+					if ($selected_country_id) {
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+					else {
+						list ($selected_country_id, ) = each($has_states);
+						$this->Application->SetVar('CountrySelector', $selected_country_id);
+					}
+				}
+
+				// gets only countries with states
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' AND ' . $id_field . ' IN (' . implode(',', array_keys($has_states)) . ')
+						ORDER BY ' . $name_field;
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$ret = '';
+		$countries = $this->Conn->GetCol($sql, $id_field);
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach ($countries as $country_id => $country_name) {
+			$block_params['id'] = $country_id;
+			$block_params['destination_title'] = $country_name;
+			$block_params['selected'] = $selected_country_id == $country_id ? ' selected="selected"' : '';
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	function ShowStates($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+
+		$name_field = 'l' . $this->Application->GetVar('m_lang') . '_Name';
+		$id_field = $this->Application->getUnitOption('country-state', 'IDField');
+		$table_name = $this->Application->getUnitOption('country-state', 'TableName');
+
+		$country_id = $this->Application->GetVar('CountrySelector');
+
+		switch ($params['show']) {
+			case 'current':
+				// selected states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . ' AND
+							cs.StateCountryId = ' . $country_id . ' AND
+							zd.ShippingZoneId = ' . $object->GetID() . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'available':
+				// available states for current country and zone
+				$sql = 'SELECT cs.' . $name_field . ', cs.' . $id_field . '
+						FROM ' . $table_name . ' cs
+						LEFT JOIN ' . $destination_table . ' zd ON zd.StdDestId = cs.' . $id_field . '
+						WHERE
+							cs.Type = ' . DESTINATION_TYPE_STATE . '
+							AND zd.ShippingZoneId IS NULL
+							AND cs.StateCountryId = ' . $country_id . '
+						ORDER BY cs.' . $name_field;
+				break;
+
+			case 'all':
+				// all possible states for selected country
+				$sql = 'SELECT ' . $name_field . ', ' . $id_field . '
+						FROM ' . $table_name . '
+						WHERE Type = ' . DESTINATION_TYPE_STATE . ' AND StateCountryId = ' . $country_id . '
+						ORDER BY ' . $name_field;
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$ret = '';
+		$states = $this->Conn->GetCol($sql, $id_field);
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach($states as $state_id => $state_name) {
+			$block_params['id'] = $state_id;
+			$block_params['destination_title'] = $state_name;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	function ShowZips($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$destination_table = $this->getDestinationsTable($params);
+
+		$country_id = (int)$this->Application->GetVar('CountrySelector');
+
+		$current_sql = 'SELECT DestValue
+						FROM ' . $destination_table . '
+						WHERE
+							COALESCE(DestValue, "") <> "" AND
+							ShippingZoneID = ' . $object->GetID() . '
+						ORDER BY DestValue';
+
+		switch ($params['show']) {
+			case 'current':
+				$sql = $current_sql;
+				break;
+
+			case 'available':
+				$selected_zips = $this->Conn->GetCol($current_sql);
+				$selected_zips = $this->Conn->qstrArray($selected_zips);
+
+				$sql = 'SELECT DISTINCT DestValue
+						FROM ' . $this->Application->getUnitOption('dst', 'TableName') . '
+						WHERE
+							COALESCE(DestValue, "") <> "" AND
+							ShippingZoneID <> ' . $object->GetID() . ' AND
+							' . ($selected_zips ? 'DestValue NOT IN (' . implode(',', $selected_zips) . ') AND' : '') . '
+							StdDestId = ' . $country_id . '
+							ORDER BY DestValue';
+				break;
+
+			default:
+				throw new Exception('Unknown "show" parameter value "' . $params['show'] . '" used');
+				break;
+		}
+
+		$zips = $this->Conn->GetCol($sql);
+
+		$ret = '';
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $params['block'];
+
+		foreach($zips as $zip) {
+			$block_params['id'] = '0|' . $zip;
+			$block_params['destination_title'] = $zip;
+
+			$ret .= $this->Application->ParseBlock($block_params);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Returns table for shipping zone destinations
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function getDestinationsTable($params)
+	{
+		static $table_name = '';
+
+		if (!$table_name) {
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$table_name = $this->Application->getUnitOption('dst', 'TableName');
+
+			if ($object->IsTempTable()) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
+		}
+
+		return $table_name;
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/zones/zones_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/orders_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/orders/orders_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/orders_event_handler.php	(revision 16630)
@@ -0,0 +1,4116 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class OrdersEventHandler extends kDBEventHandler
+{
+
+	/**
+	 * Checks user permission to execute given $event
+	 *
+	 * @param kEvent $event
+	 * @return bool
+	 * @access public
+	 */
+	public function CheckPermission(kEvent $event)
+	{
+		if ( !$this->Application->isAdminUser ) {
+			if ( $event->Name == 'OnCreate' ) {
+				// user can't initiate custom order creation directly
+				return false;
+			}
+
+			$user_id = $this->Application->RecallVar('user_id');
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+			if ( $items_info ) {
+				// when POST is present, then check when is beeing submitted
+				$order_session_id = $this->Application->RecallVar($event->getPrefixSpecial(true) . '_id');
+
+				/** @var OrdersItem $order_dummy */
+				$order_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+
+				foreach ($items_info as $id => $field_values) {
+					if ( $order_session_id != $id ) {
+						// user is trying update not his order, even order from other guest
+						return false;
+					}
+
+					$order_dummy->Load($id);
+
+					// session_id matches order_id from submit
+					if ( $order_dummy->GetDBField('PortalUserId') != $user_id ) {
+						// user performs event on other user order
+						return false;
+					}
+
+					$status_field = $order_dummy->getStatusField();
+
+					if ( isset($field_values[$status_field]) && $order_dummy->GetDBField($status_field) != $field_values[$status_field] ) {
+						// user can't change status by himself
+						return false;
+					}
+
+					if ( $order_dummy->GetDBField($status_field) != ORDER_STATUS_INCOMPLETE ) {
+						// user can't edit orders being processed
+						return false;
+					}
+				}
+			}
+		}
+
+		if ( $event->Name == 'OnQuietPreSave' ) {
+			$section = $event->getSection();
+
+			if ( $this->isNewItemCreate($event) ) {
+				return $this->Application->CheckPermission($section . '.add', 1);
+			}
+			else {
+				return $this->Application->CheckPermission($section . '.add', 1) || $this->Application->CheckPermission($section . '.edit', 1);
+			}
+		}
+
+		return parent::CheckPermission($event);
+	}
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			// admin
+			'OnRecalculateItems'	=>	Array('self' => 'add|edit'),
+			'OnResetToUser'			=>	Array('self' => 'add|edit'),
+			'OnResetToBilling'		=>	Array('self' => 'add|edit'),
+			'OnResetToShipping'		=>	Array('self' => 'add|edit'),
+			'OnMassOrderApprove'	=>	Array('self' => 'advanced:approve'),
+			'OnMassOrderDeny'		=>	Array('self' => 'advanced:deny'),
+			'OnMassOrderArchive'	=>	Array('self' => 'advanced:archive'),
+			'OnMassPlaceOrder'		=>	Array('self' => 'advanced:place'),
+			'OnMassOrderProcess'	=>	Array('self' => 'advanced:process'),
+			'OnMassOrderShip'		=>	Array('self' => 'advanced:ship'),
+			'OnResetToPending'		=>	Array('self' => 'advanced:reset_to_pending'),
+			'OnLoadSelected'		=>	Array('self' => 'view'),	// print in this case
+			'OnGoToOrder'			=>	Array('self' => 'view'),
+
+			// front-end
+			'OnViewCart'			=>	Array('self' => true),
+			'OnAddToCart'			=>	Array('self' => true),
+			'OnRemoveFromCart'		=>	Array('self' => true),
+			'OnUpdateCart'			=>	Array('self' => true),
+			'OnUpdateCartJSON'		=>	Array('self' => true),
+			'OnUpdateItemOptions'	=>	Array('self' => true),
+			'OnCleanupCart'			=>	Array('self' => true),
+			'OnContinueShopping'	=>	Array('self' => true),
+			'OnCheckout'			=>	Array('self' => true),
+			'OnSelectAddress'		=>	Array('self' => true),
+			'OnProceedToBilling'	=>	Array('self' => true),
+			'OnProceedToPreview'	=>	Array('self' => true),
+			'OnProceedToPreviewAjax' => array('self' => true),
+			'OnCompleteOrder'		=>	Array('self' => true),
+			'OnUpdate' => array('self' => true),
+			'OnUpdateAjax'			=>	Array('self' => true),
+
+			'OnRemoveCoupon'		=>	Array('self' => true),
+			'OnRemoveGiftCertificate'		=>	Array('self' => true),
+
+			'OnCancelRecurring'		=>	Array('self' => true),
+			'OnAddVirtualProductToCart'		=>	Array('self' => true),
+			'OnItemBuild'		=>	Array('self' => true),
+			'OnDownloadLabel' 	=>  Array('self' => true, 'subitem' => true),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();
+
+		$common_events = Array (
+			'OnResetToUser'		=>	'OnResetAddress',
+			'OnResetToBilling'	=>	'OnResetAddress',
+			'OnResetToShipping'	=>	'OnResetAddress',
+
+			'OnMassOrderProcess'	=>	'MassInventoryAction',
+			'OnMassOrderApprove'	=>	'MassInventoryAction',
+			'OnMassOrderDeny'		=>	'MassInventoryAction',
+			'OnMassOrderArchive'	=>	'MassInventoryAction',
+			'OnMassOrderShip'		=>	'MassInventoryAction',
+
+			'OnOrderProcess'	=>	'InventoryAction',
+			'OnOrderApprove'	=>	'InventoryAction',
+			'OnOrderDeny'		=>	'InventoryAction',
+			'OnOrderArchive'	=>	'InventoryAction',
+			'OnOrderShip'		=>	'InventoryAction',
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $common_events);
+	}
+
+	/* ======================== FRONT ONLY ======================== */
+
+	function OnQuietPreSave($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->IgnoreValidation = true;
+		$event->CallSubEvent('OnPreSave');
+		$object->IgnoreValidation = false;
+	}
+
+	/**
+	 * Sets new address to order
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSelectAddress($event)
+	{
+		if ($this->Application->isAdminUser) {
+			return ;
+		}
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$shipping_address_id = $this->Application->GetVar('shipping_address_id');
+		$billing_address_id = $this->Application->GetVar('billing_address_id');
+
+		if ($shipping_address_id || $billing_address_id) {
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			/** @var AddressesItem $address */
+			$address = $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true));
+
+			/** @var AddressesList $addr_list */
+			$addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
+
+			$addr_list->Query();
+		}
+
+		if ($shipping_address_id > 0) {
+			$addr_list->CopyAddress($shipping_address_id, 'Shipping');
+			$address->Load($shipping_address_id);
+			$address->MarkAddress('Shipping');
+
+			$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
+			$object->setRequired('ShippingState', false);
+		}
+		elseif ($shipping_address_id == -1) {
+			$object->ResetAddress('Shipping');
+		}
+
+		if ($billing_address_id > 0) {
+			$addr_list->CopyAddress($billing_address_id, 'Billing');
+			$address->Load($billing_address_id);
+			$address->MarkAddress('Billing');
+
+			$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
+			$object->setRequired('BillingState', false);
+		}
+		elseif ($billing_address_id == -1) {
+			$object->ResetAddress('Billing');
+		}
+
+		$event->redirect = false;
+
+		$object->IgnoreValidation = true;
+		$this->RecalculateTax($event);
+		$object->Update();
+	}
+
+	/**
+	 * Updates order with registred user id
+	 *
+	 * @param kEvent $event
+	 */
+	function OnUserCreate($event)
+	{
+		if( !($event->MasterEvent->status == kEvent::erSUCCESS) ) return false;
+
+		$ses_id = $this->Application->RecallVar('front_order_id');
+		if($ses_id)
+		{
+			$this->updateUserID($ses_id, $event);
+			$this->Application->RemoveVar('front_order_id');
+		}
+	}
+
+	/**
+	 * Updates shopping cart with logged-in user details
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnUserLogin($event)
+	{
+		if ( ($event->MasterEvent->status != kEvent::erSUCCESS) || kUtil::constOn('IS_INSTALL') ) {
+			// login failed OR login during installation
+			return;
+		}
+
+		$ses_id = $this->Application->RecallVar('ord_id');
+
+		if ( $ses_id ) {
+			$this->updateUserID($ses_id, $event);
+		}
+
+		$user_id = $this->Application->RecallVar('user_id');
+		$affiliate_id = $this->isAffiliate($user_id);
+
+		if ( $affiliate_id ) {
+			$this->Application->setVisitField('AffiliateId', $affiliate_id);
+		}
+
+		$event->CallSubEvent('OnRecalculateItems');
+	}
+
+	/**
+	 * Puts ID of just logged-in user into current order
+	 *
+	 * @param int $order_id
+	 * @param kEvent $event
+	 * @return void
+	 */
+	function updateUserID($order_id, $event)
+	{
+		/** @var UsersItem $user */
+		$user = $this->Application->recallObject('u.current');
+
+		$affiliate_id = $this->isAffiliate( $user->GetID() );
+
+		$fields_hash = Array (
+			'PortalUserId' => $user->GetID(),
+			'BillingEmail' => $user->GetDBField('Email'),
+		);
+
+		if ( $affiliate_id ) {
+			$fields_hash['AffiliateId'] = $affiliate_id;
+		}
+
+		/** @var OrdersItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.-item', null, array('skip_autoload' => true));
+		$object->Load($order_id);
+
+		if ( $object->isLoaded() ) {
+			$object->SetDBFieldsFromHash($fields_hash);
+			$object->Update();
+		}
+	}
+
+	function isAffiliate($user_id)
+	{
+		/** @var kDBItem $affiliate_user */
+		$affiliate_user = $this->Application->recallObject('affil.-item', null, Array('skip_autoload' => true) );
+
+		$affiliate_user->Load($user_id, 'PortalUserId');
+
+		return $affiliate_user->isLoaded() ? $affiliate_user->GetDBField('AffiliateId') : 0;
+	}
+
+	/**
+	 * Charge order
+	 *
+	 * @param OrdersItem $order
+	 * @return Array
+	 */
+	function ChargeOrder(&$order)
+	{
+		$gw_data = $order->getGatewayData();
+
+		/** @var kGWBase $gateway_object */
+		$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+		$payment_result = $gateway_object->DirectPayment($order->GetFieldValues(), $gw_data['gw_params']);
+		$sql = 'UPDATE %s SET GWResult1 = %s WHERE %s = %s';
+		$sql = sprintf($sql, $order->TableName, $this->Conn->qstr($gateway_object->getGWResponce()), $order->IDField, $order->GetID() );
+		$this->Conn->Query($sql);
+		$order->SetDBField('GWResult1', $gateway_object->getGWResponce() );
+
+		return array('result'=>$payment_result, 'data'=>$gateway_object->parsed_responce, 'gw_data' => $gw_data, 'error_msg'=>$gateway_object->getErrorMsg());
+	}
+
+	/**
+	 * Returns parameters, used to send order-related e-mails
+	 *
+	 * @param OrdersItem $order
+	 * @return array
+	 */
+	function OrderEmailParams(&$order)
+	{
+		$billing_email = $order->GetDBField('BillingEmail');
+
+		$sql = 'SELECT Email
+				FROM ' . $this->Application->getUnitOption('u', 'TableName') . '
+				WHERE PortalUserId = ' . $order->GetDBField('PortalUserId');
+		$user_email = $this->Conn->GetOne($sql);
+
+		$ret = Array (
+			'_user_email' => $user_email, // for use when shipping vs user is required in InventoryAction
+			'to_name' => $order->GetDBField('BillingTo'),
+			'to_email' => $billing_email ? $billing_email : $user_email,
+		);
+
+		return $ret;
+	}
+
+	function PrepareCoupons($event, &$order)
+	{
+		/** @var kDBList $order_items */
+		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+
+		$order_items->linkToParent($order->Special);
+		$order_items->Query();
+		$order_items->GoFirst();
+
+		$assigned_coupons = array();
+		$coup_handler = $this->Application->recallObject('coup_EventHandler');
+		foreach($order_items->Records as $product_item)
+		{
+			if ($product_item['ItemData']) {
+				$item_data = unserialize($product_item['ItemData']);
+				if (isset($item_data['AssignedCoupon']) && $item_data['AssignedCoupon']) {
+					$coupon_id = $item_data['AssignedCoupon'];
+					// clone coupon, get new coupon ID
+					/** @var kDBItem $coupon */
+					$coupon = $this->Application->recallObject('coup',null,array('skip_autload' => true));
+
+					$coupon->Load($coupon_id);
+					if (!$coupon->isLoaded()) continue;
+
+					$coup_handler->SetNewCode($coupon);
+					$coupon->NameCopy();
+					$coupon->SetDBField('Name', $coupon->GetDBField('Name').' (Order #'.$order->GetField('OrderNumber').')');
+					$coupon->Create();
+
+					// add coupon code to array
+					array_push($assigned_coupons, $coupon->GetDBField('Code'));
+				}
+			}
+		}
+
+		/** @var OrdersItem $order */
+		if ($assigned_coupons) {
+			$comments = $order->GetDBField('AdminComment');
+			if ($comments) $comments .= "\r\n";
+			$comments .= "Issued coupon(s): ". join(',', $assigned_coupons);
+			$order->SetDBField('AdminComment', $comments);
+			$order->Update();
+		}
+
+		if ($assigned_coupons) $this->Application->SetVar('order_coupons', join(',', $assigned_coupons));
+	}
+
+	/**
+	 * Completes order if possible
+	 *
+	 * @param kEvent $event
+	 * @return bool
+	 */
+	function OnCompleteOrder($event)
+	{
+		$this->LockTables($event);
+		$reoccurring_order = substr($event->Special, 0, 9) == 'recurring';
+
+		if ( !$reoccurring_order && !$this->CheckQuantites($event) ) {
+			// don't check quantities (that causes recalculate) for reoccurring orders
+			return;
+		}
+
+		$this->ReserveItems($event);
+
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		$charge_result = $this->ChargeOrder($order);
+
+		if (!$charge_result['result']) {
+			$this->FreeItems($event);
+			$this->Application->StoreVar('gw_error', $charge_result['error_msg']);
+
+			//$this->Application->StoreVar('gw_error', getArrayValue($charge_result, 'data', 'responce_reason_text') );
+			$event->redirect = $this->Application->GetVar('failure_template');
+			$event->SetRedirectParam('m_cat_id', 0);
+			if ($event->Special == 'recurring') { // if we set failed status for other than recurring special the redirect will not occur
+				$event->status = kEvent::erFAIL;
+			}
+			return false;
+		}
+
+		// call CompleteOrder events for items in order BEFORE SplitOrder (because ApproveEvents are called there)
+		/** @var kDBList $order_items */
+		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+
+		$order_items->linkToParent($order->Special);
+		$order_items->Query(true);
+		$order_items->GoFirst();
+
+		foreach($order_items->Records as $product_item)
+		{
+			if (!$product_item['ProductId']) continue; // product may have been deleted
+			$this->raiseProductEvent('CompleteOrder', $product_item['ProductId'], $product_item);
+		}
+
+		$shipping_control = getArrayValue($charge_result, 'gw_data', 'gw_params', 'shipping_control');
+		if ($event->Special != 'recurring') {
+			if ($shipping_control && $shipping_control != SHIPPING_CONTROL_PREAUTH ) {
+				// we have to do it here, because the coupons are used in the e-mails
+				$this->PrepareCoupons($event, $order);
+			}
+
+			$this->Application->emailUser('ORDER.SUBMIT', null, $this->OrderEmailParams($order));
+			$this->Application->emailAdmin('ORDER.SUBMIT');
+		}
+
+		if ($shipping_control === false || $shipping_control == SHIPPING_CONTROL_PREAUTH ) {
+			$order->SetDBField('Status', ORDER_STATUS_PENDING);
+			$order->Update();
+		}
+		else {
+			$this->SplitOrder($event, $order);
+		}
+
+		if (!$this->Application->isAdminUser) {
+			// for tracking code
+			$this->Application->StoreVar('last_order_amount', $order->GetDBField('TotalAmount'));
+			$this->Application->StoreVar('last_order_number', $order->GetDBField('OrderNumber'));
+			$this->Application->StoreVar('last_order_customer', $order->GetDBField('BillingTo'));
+			$this->Application->StoreVar('last_order_user', $order->GetDBField('Username'));
+
+			$event->redirect = $this->Application->GetVar('success_template');
+			$event->SetRedirectParam('m_cat_id', 0);
+		}
+		else
+		{
+//			$event->CallSubEvent('OnSave');
+		}
+
+		$order_id = $order->GetId();
+		$order_idfield = $this->Application->getUnitOption('ord','IDField');
+		$order_table = $this->Application->getUnitOption('ord','TableName');
+		$original_amount = $order->GetDBField('SubTotal') + $order->GetDBField('ShippingCost') + $order->GetDBField('VAT') + $order->GetDBField('ProcessingFee') + $order->GetDBField('InsuranceFee') - $order->GetDBField('GiftCertificateDiscount');
+		$sql = 'UPDATE '.$order_table.'
+				SET OriginalAmount = '.$original_amount.'
+				WHERE '.$order_idfield.' = '.$order_id;
+		$this->Conn->Query($sql);
+
+		// Remember order ID for use on "Thank You" page.
+		$this->Application->StoreVar('front_order_id', $order_id);
+
+		// Remove globals, set from "_createNewCart" method.
+		$this->Application->DeleteVar('ord_id');
+		$this->Application->RemoveVar('ord_id');
+
+		// Prevent accidental access to non-Incomplete order.
+		$this->Application->removeObject($event->getPrefixSpecial());
+		$this->Application->Session->SetCookie('shop_cart_cookie', '', strtotime('-1 month'));
+	}
+
+	/**
+	 * Set billing address same as shipping
+	 *
+	 * @param kEvent $event
+	 */
+	function setBillingAddress($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		if ( $object->HasTangibleItems() ) {
+			if ( $this->Application->GetVar('same_address') ) {
+				// copy shipping address to billing
+				$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+				list($id, $field_values) = each($items_info);
+
+				$address_fields = Array (
+					'To', 'Company', 'Phone', 'Fax', 'Email',
+					'Address1', 'Address2', 'City', 'State',
+					'Zip', 'Country'
+				);
+
+				foreach ($address_fields as $address_field) {
+					$items_info[$id]['Billing' . $address_field] = $object->GetDBField('Shipping' . $address_field);
+				}
+
+				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
+			}
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnProceedToPreview($event)
+	{
+		$this->setBillingAddress($event);
+
+		$event->CallSubEvent('OnUpdate');
+		$event->redirect = $this->Application->GetVar('preview_template');
+	}
+
+
+	function OnViewCart($event)
+	{
+		$this->StoreContinueShoppingLink();
+		$event->redirect = $this->Application->GetVar('viewcart_template');
+	}
+
+	function OnContinueShopping($event)
+	{
+		/** @var OrderHelper $order_helper */
+		$order_helper = $this->Application->recallObject('OrderHelper');
+
+		$template = $this->Application->GetVar('continue_shopping_template');
+
+		$event->redirect = $order_helper->getContinueShoppingTemplate($template);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnCheckout($event)
+	{
+		$this->OnUpdateCart($event);
+		if ( !$event->getEventParam('RecalculateChangedCart') ) {
+			/** @var OrdersItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->HasTangibleItems() ) {
+				$object->SetDBField('ShippingTo', '');
+				$object->SetDBField('ShippingCompany', '');
+				$object->SetDBField('ShippingPhone', '');
+				$object->SetDBField('ShippingFax', '');
+				$object->SetDBField('ShippingEmail', '');
+				$object->SetDBField('ShippingAddress1', '');
+				$object->SetDBField('ShippingAddress2', '');
+				$object->SetDBField('ShippingCity', '');
+				$object->SetDBField('ShippingState', '');
+				$object->SetDBField('ShippingZip', '');
+				$object->SetDBField('ShippingCountry', '');
+				$object->SetDBField('ShippingType', 0);
+				$object->SetDBField('ShippingCost', 0);
+				$object->SetDBField('ShippingCustomerAccount', '');
+				$object->SetDBField('ShippingTracking', '');
+				$object->SetDBField('ShippingDate', 0);
+				$object->SetDBField('ShippingOption', 0);
+				$object->SetDBField('ShippingInfo', '');
+				$object->Update();
+			}
+
+			$event->redirect = $this->Application->GetVar('next_step_template');
+
+			$order_id = $this->Application->GetVar('order_id');
+
+			if ( $order_id !== false ) {
+				$event->SetRedirectParam('ord_id', $order_id);
+			}
+		}
+	}
+
+	/**
+	 * Restores order from cookie
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnRestoreOrder(kEvent $event)
+	{
+		if ( $this->Application->isAdmin || $this->Application->RecallVar('ord_id') ) {
+			// admin OR there is an active order -> don't restore from cookie
+			return;
+		}
+
+		$shop_cart_cookie = $this->Application->GetVarDirect('shop_cart_cookie', 'Cookie');
+
+		if ( !$shop_cart_cookie ) {
+			return;
+		}
+
+		$user_id = $this->Application->RecallVar('user_id');
+
+		$sql = 'SELECT OrderId
+				FROM ' . TABLE_PREFIX . 'Orders
+				WHERE (OrderId = ' . (int)$shop_cart_cookie . ') AND (Status = ' . ORDER_STATUS_INCOMPLETE . ') AND (PortalUserId = ' . $user_id . ')';
+		$order_id = $this->Conn->GetOne($sql);
+
+		if ( $order_id ) {
+			$this->Application->StoreVar('ord_id', $order_id);
+		}
+	}
+
+	/**
+	 * Redirect user to Billing checkout step
+	 *
+	 * @param kEvent $event
+	 */
+	function OnProceedToBilling($event)
+	{
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+		if ( $items_info ) {
+			list($id, $field_values) = each($items_info);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$payment_type_id = $object->GetDBField('PaymentType');
+
+			if ( !$payment_type_id ) {
+				$default_type = $this->_getDefaultPaymentType();
+
+				if ( $default_type ) {
+					$field_values['PaymentType'] = $default_type;
+					$items_info[$id] = $field_values;
+					$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
+				}
+			}
+		}
+
+		$event->CallSubEvent('OnUpdate');
+		$event->redirect = $this->Application->GetVar('next_step_template');
+	}
+
+	/**
+	 * Removes reoccurring mark from the order
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 */
+	protected function OnCancelRecurring($event)
+	{
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		$order->SetDBField('IsRecurringBilling', 0);
+		$order->Update();
+
+		if ( $this->Application->GetVar('cancelrecurring_ok_template') ) {
+			$event->redirect = $this->Application->GetVar('cancelrecurring_ok_template');
+		}
+	}
+
+	/**
+	 * Occurs after updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemUpdate(kEvent $event)
+	{
+		parent::OnAfterItemUpdate($event);
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$cvv2 = $object->GetDBField('PaymentCVV2');
+
+		if ( $cvv2 !== false ) {
+			$this->Application->StoreVar('CVV2Code', $cvv2);
+		}
+	}
+
+
+	/**
+	 * Updates kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnUpdate(kEvent $event)
+	{
+		$this->setBillingAddress($event);
+
+		parent::OnUpdate($event);
+
+		if ($this->Application->isAdminUser) {
+			return ;
+		}
+		else {
+			$event->SetRedirectParam('opener', 's');
+		}
+
+		if ($event->status == kEvent::erSUCCESS) {
+			$this->createMissingAddresses($event);
+		}
+		else {
+			// strange: recalculate total amount on error
+			/** @var OrdersItem $object */
+			$object = $event->getObject();
+
+			$object->SetDBField('TotalAmount', $object->getTotalAmount());
+		}
+	}
+
+	/**
+	 * Creates new address
+	 *
+	 * @param kEvent $event
+	 */
+	function createMissingAddresses($event)
+	{
+		if ( !$this->Application->LoggedIn() ) {
+			return ;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		/** @var kDBList $addr_list */
+		$addr_list = $this->Application->recallObject('addr', 'addr_List', Array ('per_page' => -1, 'skip_counting' => true));
+
+		$addr_list->Query();
+
+		/** @var AddressesItem $address_dummy */
+		$address_dummy = $this->Application->recallObject('addr.-item', null, Array ('skip_autoload' => true));
+
+		$address_prefixes = Array ('Billing', 'Shipping');
+		$address_fields = Array (
+			'To', 'Company', 'Phone', 'Fax', 'Email', 'Address1',
+			'Address2', 'City', 'State', 'Zip', 'Country'
+		);
+
+		foreach ($address_prefixes as $address_prefix) {
+			$address_id = $this->Application->GetVar(strtolower($address_prefix) . '_address_id');
+
+			if ( !$this->Application->GetVar('check_' . strtolower($address_prefix) . '_address') ) {
+				// form type doesn't match check type, e.g. shipping check on billing form
+				continue;
+			}
+
+			if ( $address_id > 0 ) {
+				$address_dummy->Load($address_id);
+			}
+			else {
+				$address_dummy->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
+			}
+
+			foreach ($address_fields as $address_field) {
+				$address_dummy->SetDBField($address_field, $object->GetDBField($address_prefix . $address_field));
+			}
+
+			$address_dummy->MarkAddress($address_prefix, false);
+
+			$ret = ($address_id > 0) ? $address_dummy->Update() : $address_dummy->Create();
+		}
+	}
+
+	/**
+	 * Updates shopping cart content
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnUpdateCart($event)
+	{
+		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
+
+		$event->CallSubEvent('OnRecalculateItems');
+	}
+
+	/**
+	 * Updates cart and returns various info in JSON format
+	 *
+	 * @param kEvent $event
+	 */
+	function OnUpdateCartJSON($event)
+	{
+		if ( $this->Application->GetVar('ajax') != 'yes' ) {
+			return;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		// 1. delete given order item by id
+		$delete_id = $this->Application->GetVar('delete_id');
+
+		if ( $delete_id !== false ) {
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'OrderItems
+					WHERE OrderId = ' . $object->GetID() . ' AND OrderItemId = ' . (int)$delete_id;
+			$this->Conn->Query($sql);
+		}
+
+		// 2. remove coupon
+		$remove = $this->Application->GetVar('remove');
+
+		if ( $remove == 'coupon' ) {
+			$this->RemoveCoupon($object);
+			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED);
+		}
+		elseif ( $remove == 'gift_certificate' ) {
+			$this->RemoveGiftCertificate($object);
+			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED);
+		}
+
+		// 3. update product quantities and recalculate all discounts
+		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
+		$event->CallSubEvent('OnRecalculateItems');
+
+		// 4. remove "orditems" object of kDBItem class, since getOrderInfo uses kDBList object under same prefix
+		$this->Application->removeObject('orditems');
+
+		/** @var OrderHelper $order_helper */
+		$order_helper = $this->Application->recallObject('OrderHelper');
+
+		$event->status = kEvent::erSTOP;
+		$currency = $this->Application->GetVar('currency', 'selected');
+
+		echo json_encode( $order_helper->getOrderInfo($object, $currency) );
+	}
+
+	/**
+	 * Adds item to cart
+	 *
+	 * @param kEvent $event
+	 */
+	function OnAddToCart($event)
+	{
+		$this->StoreContinueShoppingLink();
+
+		$qty = $this->Application->GetVar('qty');
+		$options = $this->Application->GetVar('options');
+
+		// multiple or options add
+		$items = Array();
+		if (is_array($qty)) {
+			foreach ($qty as $item_id => $combinations)
+			{
+				if (is_array($combinations)) {
+					foreach ($combinations as $comb_id => $comb_qty) {
+						if ($comb_qty == 0) continue;
+						$items[] = array('item_id' => $item_id, 'qty' => $comb_qty, 'comb' => $comb_id);
+					}
+				}
+				else {
+					$items[] = array('item_id' => $item_id, 'qty' => $combinations);
+				}
+			}
+		}
+
+		if (!$items) {
+			if (!$qty || is_array($qty)) $qty = 1;
+			$item_id = $this->Application->GetVar('p_id');
+			if (!$item_id) return ;
+			$items = array(array('item_id' => $item_id, 'qty' => $qty));
+		}
+
+		// remember item data passed to event when called
+		$default_item_data = $event->getEventParam('ItemData');
+		$default_item_data = $default_item_data ? unserialize($default_item_data) : Array();
+
+		foreach ($items as $an_item) {
+			$item_id = $an_item['item_id'];
+			$qty = $an_item['qty'];
+			$comb = getArrayValue($an_item, 'comb');
+
+			$item_data = $default_item_data;
+
+			/** @var ProductsItem $product */
+			$product = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+
+			$product->Load($item_id);
+
+			$event->setEventParam('ItemData', null);
+
+			if ($product->GetDBField('AssignedCoupon')) {
+				$item_data['AssignedCoupon'] = $product->GetDBField('AssignedCoupon');
+			}
+
+			// 1. store options information OR
+			if ($comb) {
+				$combination = $this->Conn->GetOne('SELECT Combination FROM '.TABLE_PREFIX.'ProductOptionCombinations WHERE CombinationId = '.$comb);
+				$item_data['Options'] = unserialize($combination);
+			}
+			elseif (is_array($options)) {
+				$item_data['Options'] = $options[$item_id];
+			}
+
+			// 2. store subscription information OR
+			if( $product->GetDBField('Type') == 2 )	// subscriptions
+			{
+				$item_data = $this->BuildSubscriptionItemData($item_id, $item_data);
+			}
+
+			// 3. store package information
+			if( $product->GetDBField('Type') == 5 )	// package
+			{
+				$package_content_ids = $product->GetPackageContentIds();
+
+				/** @var ProductsItem $product_package_item */
+				$product_package_item = $this->Application->recallObject('p.-packageitem');
+
+				$package_item_data = array();
+
+				foreach ($package_content_ids as $package_item_id){
+					$product_package_item->Load($package_item_id);
+					$package_item_data[$package_item_id] = array();
+					if( $product_package_item->GetDBField('Type') == 2 )	// subscriptions
+					{
+						$package_item_data[$package_item_id] = $this->BuildSubscriptionItemData($package_item_id, $item_data);
+					}
+				}
+
+				$item_data['PackageContent'] = $product->GetPackageContentIds();
+				$item_data['PackageItemsItemData'] = $package_item_data;
+			}
+
+			$event->setEventParam('ItemData', serialize($item_data));
+			// 1 for PacakgeNum when in admin - temporary solution to overcome splitting into separate sub-orders
+			// of orders with items added through admin when approving them
+			$this->AddItemToOrder($event, $item_id, $qty, $this->Application->isAdminUser ? 1 : null);
+		}
+		if ($event->status == kEvent::erSUCCESS && !$event->redirect) {
+			$event->SetRedirectParam('pass', 'm');
+			$event->SetRedirectParam('pass_category', 0); //otherwise mod-rewrite shop-cart URL will include category
+			$event->redirect = true;
+		}
+		else {
+			if ($this->Application->isAdminUser) {
+				$event->SetRedirectParam('opener', 'u');
+			}
+		}
+	}
+
+	/**
+	 * Returns table prefix from event (temp or live)
+	 *
+	 * @param kEvent $event
+	 * @return string
+	 * @todo Needed? Should be refactored (by Alex)
+	 */
+	function TablePrefix(kEvent $event)
+	{
+		return $this->UseTempTables($event) ? $this->Application->GetTempTablePrefix('prefix:' . $event->Prefix) . TABLE_PREFIX : TABLE_PREFIX;
+	}
+
+	/**
+	 * Check if required options are selected & selected option combination is in stock
+	 *
+	 * @param kEvent $event
+	 * @param Array $options
+	 * @param int $product_id
+	 * @param int $qty
+	 * @param int $selection_mode
+	 * @return bool
+	 */
+	function CheckOptions($event, &$options, $product_id, $qty, $selection_mode)
+	{
+		// 1. check for required options
+		$selection_filter = $selection_mode == 1 ? ' AND OptionType IN (1,3,6) ' : '';
+		$req_options = $this->Conn->GetCol('SELECT ProductOptionId FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$product_id.' AND Required = 1 '.$selection_filter);
+		$result = true;
+		foreach ($req_options as $opt_id) {
+			if (!getArrayValue($options, $opt_id)) {
+				$this->Application->SetVar('opt_error', 1); //let the template know we have an error
+				$result = false;
+			}
+		}
+
+		// 2. check for option combinations in stock
+		$comb_salt = $this->OptionsSalt($options, true);
+		if ($comb_salt) {
+			// such option combination is defined explicitly
+			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+			$sql = 'SELECT Availability
+					FROM '.$poc_table.'
+					WHERE CombinationCRC = '.$comb_salt;
+			$comb_availble = $this->Conn->GetOne($sql);
+
+			// 2.1. check if Availability flag is set, then
+			if ($comb_availble == 1) {
+				// 2.2. check for quantity in stock
+				$table = Array();
+				$table['poc'] = $this->Application->getUnitOption('poc', 'TableName');
+				$table['p'] = $this->Application->getUnitOption('p', 'TableName');
+				$table['oi'] = $this->TablePrefix($event).'OrderItems';
+
+				$object = $event->getObject();
+				$ord_id = $object->GetID();
+
+				// 2.3. check if some amount of same combination & product are not already in shopping cart
+				$sql = 'SELECT '.
+								$table['p'].'.InventoryStatus,'.
+								$table['p'].'.BackOrder,
+								IF('.$table['p'].'.InventoryStatus = 2, '.$table['poc'].'.QtyInStock, '.$table['p'].'.QtyInStock) AS QtyInStock,
+								IF('.$table['oi'].'.OrderItemId IS NULL, 0, '.$table['oi'].'.Quantity) AS Quantity
+						FROM '.$table['p'].'
+						LEFT JOIN '.$table['poc'].' ON
+								'.$table['p'].'.ProductId = '.$table['poc'].'.ProductId
+						LEFT JOIN '.$table['oi'].' ON
+								('.$table['oi'].'.OrderId = '.$ord_id.') AND
+								('.$table['oi'].'.OptionsSalt = '.$comb_salt.') AND
+								('.$table['oi'].'.ProductId = '.$product_id.') AND
+								('.$table['oi'].'.BackOrderFlag = 0)
+						WHERE '.$table['poc'].'.CombinationCRC = '.$comb_salt;
+				$product_info = $this->Conn->GetRow($sql);
+
+				if ($product_info['InventoryStatus']) {
+					$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
+					if (!$backordering || $product_info['BackOrder'] == 0) {
+						// backordering is not enabled generally or for this product directly, then check quantities in stock
+						if ($qty + $product_info['Quantity'] > $product_info['QtyInStock']) {
+							$this->Application->SetVar('opt_error', 2);
+							$result = false;
+						}
+					}
+				}
+			}
+			elseif ($comb_availble !== false) {
+				$this->Application->SetVar('opt_error', 2);
+				$result = false;
+			}
+		}
+
+		if ($result) {
+			$event->status = kEvent::erSUCCESS;
+			$shop_cart_template = $this->Application->GetVar('shop_cart_template');
+			$event->redirect = $this->Application->isAdminUser || !$shop_cart_template ? true : $shop_cart_template;
+		}
+		else {
+			$event->status = kEvent::erFAIL;
+		}
+		return $result;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnUpdateItemOptions($event)
+	{
+		$opt_data = $this->Application->GetVar('options');
+		$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
+
+		if (!$options) {
+			$qty_data = $this->Application->GetVar('qty');
+			$comb_id = key(getArrayValue($qty_data, $this->Application->GetVar('p_id')));
+			$options = unserialize($this->Conn->GetOne('SELECT Combination FROM '.TABLE_PREFIX.'ProductOptionCombinations WHERE CombinationId = '.$comb_id));
+		}
+
+		if (!$options) return;
+
+		/** @var kDBItem $ord_item */
+		$ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
+
+		$ord_item->Load($this->Application->GetVar('orditems_id'));
+
+		// assuming that quantity cannot be changed during order item editing
+		if (!$this->CheckOptions($event, $options, $ord_item->GetDBField('ProductId'), 0, $ord_item->GetDBField('OptionsSelectionMode'))) return;
+
+		$item_data = unserialize($ord_item->GetDBField('ItemData'));
+		$item_data['Options'] = $options;
+		$ord_item->SetDBField('ItemData', serialize($item_data));
+		$ord_item->SetDBField('OptionsSalt', $this->OptionsSalt($options));
+		$ord_item->Update();
+		$event->CallSubEvent('OnRecalculateItems');
+		if ($event->status == kEvent::erSUCCESS && $this->Application->isAdminUser) {
+			$event->SetRedirectParam('opener', 'u');
+		}
+	}
+
+	function BuildSubscriptionItemData($item_id, $item_data)
+	{
+		$products_table = $this->Application->getUnitOption('p', 'TableName');
+		$products_idfield = $this->Application->getUnitOption('p', 'IDField');
+		$sql = 'SELECT AccessGroupId FROM %s WHERE %s = %s';
+		$item_data['PortalGroupId'] = $this->Conn->GetOne( sprintf($sql, $products_table, $products_idfield, $item_id) );
+
+		$pricing_table = $this->Application->getUnitOption('pr', 'TableName');
+		$pricing_idfield = $this->Application->getUnitOption('pr', 'IDField');
+
+		/* TODO check on implementation
+		$sql = 'SELECT AccessDuration, AccessUnit, DurationType, AccessExpiration FROM %s WHERE %s = %s';
+		*/
+
+		$sql = 'SELECT * FROM %s WHERE %s = %s';
+		$pricing_id = $this->GetPricingId($item_id, $item_data);
+		$item_data['PricingId'] = $pricing_id;
+
+		$pricing_info = $this->Conn->GetRow( sprintf($sql, $pricing_table, $pricing_idfield, $pricing_id ) );
+		$unit_secs = Array(1 => 1, 2 => 60, 3 => 3600, 4 => 86400, 5 => 604800, 6 => 2592000, 7 => 31536000);
+
+		/* TODO check on implementation (code from customization healtheconomics.org)
+		$item_data['DurationType'] = $pricing_info['DurationType'];
+		$item_data['AccessExpiration'] = $pricing_info['AccessExpiration'];
+		*/
+
+		$item_data['Duration'] = $pricing_info['AccessDuration'] * $unit_secs[ $pricing_info['AccessUnit'] ];
+
+		return $item_data;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnApplyCoupon($event)
+	{
+		$code = $this->Application->GetVar('coupon_code');
+
+		if ($code == '') {
+			return ;
+		}
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		/** @var kDBItem $coupon */
+		$coupon = $this->Application->recallObject('coup', null, Array ('skip_autoload' => true));
+
+		$coupon->Load($code, 'Code');
+
+		if ( !$coupon->isLoaded() ) {
+			$event->status = kEvent::erFAIL;
+			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_CODE_INVALID);
+			$event->redirect = false; // check!!!
+
+			return ;
+		}
+
+		$expire_date = $coupon->GetDBField('Expiration');
+		$number_of_use = $coupon->GetDBField('NumberOfUses');
+		if ( $coupon->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) ||
+			(isset($number_of_use) && $number_of_use <= 0))
+		{
+			$event->status = kEvent::erFAIL;
+			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_CODE_EXPIRED);
+			$event->redirect = false;
+
+			return ;
+		}
+
+		$last_used = adodb_mktime();
+		$coupon->SetDBField('LastUsedBy', $this->Application->RecallVar('user_id'));
+		$coupon->SetDBField('LastUsedOn_date', $last_used);
+		$coupon->SetDBField('LastUsedOn_time', $last_used);
+
+
+		if ( isset($number_of_use) ) {
+			$coupon->SetDBField('NumberOfUses', $number_of_use - 1);
+
+			if ($number_of_use == 1) {
+				$coupon->SetDBField('Status', 2);
+			}
+		}
+
+		$coupon->Update();
+
+		$this->Application->setUnitOption('ord', 'AutoLoad', true);
+
+		/** @var OrdersItem $order */
+		$order = $this->Application->recallObject('ord');
+
+		$order->SetDBField('CouponId', $coupon->GetDBField('CouponId'));
+		$order->SetDBField('CouponName', $coupon->GetDBField('Name')); // calculated field
+
+		$order->Update();
+
+		$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_APPLIED);
+//		OnApplyCoupon is called as hook for OnUpdateCart/OnCheckout, which calls OnRecalcualate themself
+	}
+
+	/**
+	 * Removes coupon from order
+	 *
+	 * @param kEvent $event
+	 * @deprecated
+	 */
+	function OnRemoveCoupon($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$this->RemoveCoupon($object);
+		$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED);
+
+		$event->CallSubEvent('OnRecalculateItems');
+	}
+
+	/**
+	 * Removes coupon from a given order
+	 *
+	 * @param OrdersItem $object
+	 */
+	function RemoveCoupon(&$object)
+	{
+		/** @var kDBItem $coupon */
+		$coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
+
+		$coupon->Load( $object->GetDBField('CouponId') );
+
+		if ( $coupon->isLoaded() ) {
+			$coupon->SetDBField('NumberOfUses', $coupon->GetDBField('NumberOfUses') + 1);
+			$coupon->SetDBField('Status', STATUS_ACTIVE);
+			$coupon->Update();
+		}
+
+		$object->SetDBField('CouponId', 0);
+		$object->SetDBField('CouponName', ''); // calculated field
+		$object->SetDBField('CouponDiscount', 0);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnAddVirtualProductToCart($event)
+	{
+		$l_info = $this->Application->GetVar('l');
+		if($l_info)
+		{
+			foreach($l_info as $link_id => $link_info) {}
+			$item_data['LinkId'] = $link_id;
+			$item_data['ListingTypeId'] = $link_info['ListingTypeId'];
+		}
+		else
+		{
+			$link_id = $this->Application->GetVar('l_id');
+			$sql = 'SELECT ResourceId FROM '.$this->Application->getUnitOption('l', 'TableName').'
+					WHERE LinkId = '.$link_id;
+			$sql = 'SELECT ListingTypeId FROM '.$this->Application->getUnitOption('ls', 'TableName').'
+					WHERE ItemResourceId = '.$this->Conn->GetOne($sql);
+			$item_data['LinkId'] = $link_id;
+			$item_data['ListingTypeId'] = $this->Conn->GetOne($sql);
+		}
+
+		$sql = 'SELECT VirtualProductId FROM '.$this->Application->getUnitOption('lst', 'TableName').'
+				WHERE ListingTypeId = '.$item_data['ListingTypeId'];
+		$item_id = $this->Conn->GetOne($sql);
+
+		$event->setEventParam('ItemData', serialize($item_data));
+		$this->AddItemToOrder($event, $item_id);
+
+		$shop_cart_template = $this->Application->GetVar('shop_cart_template');
+
+		if ( $shop_cart_template ) {
+			$event->redirect = $shop_cart_template;
+		}
+
+		// don't pass unused info to shopping cart, brokes old mod-rewrites
+		$event->SetRedirectParam('pass', 'm'); // not to pass link id
+		$event->SetRedirectParam('m_cat_id', 0); // not to pass link id
+	}
+
+	function OnRemoveFromCart($event)
+	{
+		$ord_item_id = $this->Application->GetVar('orditems_id');
+		$ord_id = $this->getPassedID($event);
+		$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'OrderItems WHERE OrderId = '.$ord_id.' AND OrderItemId = '.$ord_item_id);
+		$this->OnRecalculateItems($event);
+	}
+
+	function OnCleanupCart($event)
+	{
+		$object = $event->getObject();
+
+		$sql = 'DELETE FROM '.TABLE_PREFIX.'OrderItems
+				WHERE OrderId = '.$this->getPassedID($event);
+		$this->Conn->Query($sql);
+
+		$this->RemoveCoupon($object);
+		$this->RemoveGiftCertificate($object);
+
+		$this->OnRecalculateItems($event);
+	}
+
+	/**
+	 * Returns order id from session or last used
+	 *
+	 * @param kEvent $event
+	 * @return int
+	 * @access public
+	 */
+	public function getPassedID(kEvent $event)
+	{
+		$event->setEventParam('raise_warnings', 0);
+		$passed = parent::getPassedID($event);
+
+		if ( $this->Application->isAdminUser ) {
+			// work as usual in admin
+			return $passed;
+		}
+
+		if ( $event->Special == 'last' ) {
+			// return last order id (for using on thank you page)
+			$order_id = $this->Application->RecallVar('front_order_id');
+
+			return $order_id > 0 ? $order_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
+		}
+
+		$ses_id = $this->Application->RecallVar($event->getPrefixSpecial(true) . '_id');
+
+		if ( $passed && ($passed != $ses_id) ) {
+			// order id given in url doesn't match our current order id
+			$sql = 'SELECT PortalUserId
+					FROM ' . TABLE_PREFIX . 'Orders
+					WHERE OrderId = ' . $passed;
+			$user_id = $this->Conn->GetOne($sql);
+
+			if ( $user_id == $this->Application->RecallVar('user_id') ) {
+				// current user is owner of order with given id -> allow him to view order details
+				return $passed;
+			}
+			else {
+				// current user is not owner of given order -> hacking attempt
+				$this->Application->SetVar($event->getPrefixSpecial() . '_id', 0);
+				return 0;
+			}
+		}
+
+		// not passed or equals to ses_id
+		return $ses_id > 0 ? $ses_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
+	}
+
+	/**
+	 * Load item if id is available
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function LoadItem(kEvent $event)
+	{
+		$id = $this->getPassedID($event);
+
+		if ( $id == FAKE_ORDER_ID ) {
+			// if we already know, that there is no such order,
+			// then don't run database query, that will confirm that
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$object->Clear($id);
+			return;
+		}
+
+		parent::LoadItem($event);
+	}
+
+	/**
+	 * Creates new shopping cart
+	 *
+	 * @param kEvent $event
+	 */
+	function _createNewCart($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array('skip_autoload' => true) );
+
+		$this->setNextOrderNumber($event);
+		$object->SetDBField('Status', ORDER_STATUS_INCOMPLETE);
+		$object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') );
+
+		// get user
+		if ( $this->Application->LoggedIn() ) {
+			/** @var UsersItem $user */
+			$user = $this->Application->recallObject('u.current');
+
+			$user_id = $user->GetID();
+			$object->SetDBField('BillingEmail', $user->GetDBField('Email'));
+		}
+		else {
+			$user_id = USER_GUEST;
+		}
+
+		$object->SetDBField('PortalUserId', $user_id);
+
+		// get affiliate
+		$affiliate_id = $this->isAffiliate($user_id);
+		if ( $affiliate_id ) {
+			$object->SetDBField('AffiliateId', $affiliate_id);
+		}
+		else {
+			$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
+
+			if ( $affiliate_storage_method == 1 ) {
+				$object->SetDBField('AffiliateId', (int)$this->Application->RecallVar('affiliate_id'));
+			}
+			else {
+				$object->SetDBField('AffiliateId', (int)$this->Application->GetVar('affiliate_id'));
+			}
+		}
+
+		// get payment type
+		$default_type = $this->_getDefaultPaymentType();
+
+		if ( $default_type ) {
+			$object->SetDBField('PaymentType', $default_type);
+		}
+
+		// vat setting
+		$object->SetDBField('VATIncluded', $this->Application->ConfigValue('OrderVATIncluded'));
+
+		$created = $object->Create();
+
+		if ( $created ) {
+			$id = $object->GetID();
+
+			$this->Application->SetVar($event->getPrefixSpecial(true) . '_id', $id);
+			$this->Application->StoreVar($event->getPrefixSpecial(true) . '_id', $id);
+			$this->Application->Session->SetCookie('shop_cart_cookie', $id, strtotime('+1 month'));
+
+			return $id;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Returns default payment type for order
+	 *
+	 * @return int
+	 */
+	function _getDefaultPaymentType()
+	{
+		$default_type = $this->Application->siteDomainField('PrimaryPaymentTypeId');
+
+		if (!$default_type) {
+			$sql = 'SELECT PaymentTypeId
+					FROM ' . TABLE_PREFIX . 'PaymentTypes
+					WHERE IsPrimary = 1';
+			$default_type = $this->Conn->GetOne($sql);
+		}
+
+		return $default_type;
+	}
+
+	function StoreContinueShoppingLink()
+	{
+		$this->Application->StoreVar('continue_shopping', 'external:'.PROTOCOL.SERVER_NAME.$this->Application->RecallVar('last_url'));
+	}
+
+	/**
+	 * Sets required fields for order, based on current checkout step
+	 * !!! Do not use switch here, since all cases may be on the same form simultaneously
+	 *
+	 * @param kEvent $event
+	 */
+	function SetStepRequiredFields($event)
+	{
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+		if ($items_info) {
+			// updated address available from SUBMIT -> use it
+			list($id, $field_values) = each($items_info);
+		}
+		else {
+			// no updated address -> use current address
+			$field_values = Array (
+				'ShippingCountry' => $order->GetDBField('ShippingCountry'),
+				'BillingCountry' => $order->GetDBField('BillingCountry'),
+				'PaymentType' => $order->GetDBField('PaymentType'),
+			);
+		}
+
+		// shipping address required fields
+		if ($this->Application->GetVar('check_shipping_address')) {
+			$has_tangibles = $order->HasTangibleItems();
+			$req_fields = array('ShippingTo', 'ShippingAddress1', 'ShippingCity', 'ShippingZip', 'ShippingCountry', /*'ShippingPhone',*/ 'BillingEmail');
+			$order->setRequired($req_fields, $has_tangibles);
+			$order->setRequired('ShippingState', $cs_helper->CountryHasStates( $field_values['ShippingCountry'] ));
+		}
+
+		// billing address required fields
+		if ($this->Application->GetVar('check_billing_address')) {
+			$req_fields = array('BillingTo', 'BillingAddress1', 'BillingCity', 'BillingZip', 'BillingCountry', 'BillingPhone', 'BillingEmail');
+			$order->setRequired($req_fields);
+			$order->setRequired('BillingState', $cs_helper->CountryHasStates( $field_values['BillingCountry'] ));
+		}
+
+		$check_cc = $this->Application->GetVar('check_credit_card');
+
+		if ( $check_cc && ($field_values['PaymentType'] == $order->GetDBField('PaymentType')) ) {
+			// cc check required AND payment type was not changed during SUBMIT
+			if ( $this->Application->isAdminUser ) {
+				$req_fields = Array (/*'PaymentCardType',*/ 'PaymentAccount', /*'PaymentNameOnCard',*/ 'PaymentCCExpDate');
+			}
+			else {
+				$req_fields = Array (/*'PaymentCardType',*/ 'PaymentAccount', /*'PaymentNameOnCard',*/ 'PaymentCCExpDate', 'PaymentCVV2');
+			}
+
+			$order->setRequired($req_fields);
+		}
+	}
+
+	/**
+	 * Set's order's user_id to user from session or Guest otherwise
+	 *
+	 * @param kEvent $event
+	 */
+	function CheckUser($event)
+	{
+		if ( $this->Application->isAdminUser || defined('GW_NOTIFY') || defined('CRON') ) {
+			// 1. don't check, when Administrator is editing the order.
+			// 2. don't check while processing payment gateways, because they can do cross-domain ssl redirects.
+			// 3. don't check from CRON, because it's like Admin updates orders on other user behalf.
+			return;
+		}
+
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		$ses_user = $this->Application->RecallVar('user_id');
+
+		if ( $order->GetDBField('PortalUserId') != $ses_user ) {
+			if ( $ses_user == 0 ) {
+				$ses_user = USER_GUEST;
+			}
+
+			$order->SetDBField('PortalUserId', $ses_user);
+			// since CheckUser is called in OnBeforeItemUpdate, we don't need to call udpate here, just set the field
+		}
+	}
+
+	/* ======================== ADMIN ONLY ======================== */
+
+	/**
+	 * Prepare temp tables for creating new item
+	 * but does not create it. Actual create is
+	 * done in OnPreSaveCreated
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreCreate(kEvent $event)
+	{
+		parent::OnPreCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->setNextOrderNumber($event);
+
+		$object->SetDBField('OrderIP', $this->Application->getClientIp());
+
+		$order_type = $this->getTypeBySpecial( $this->Application->GetVar('order_type') );
+		$object->SetDBField('Status', $order_type);
+	}
+
+	/**
+	 * When cloning orders set new order number to them
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeClone(kEvent $event)
+	{
+		parent::OnBeforeClone($event);
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		if ( substr($event->Special, 0, 9) == 'recurring' ) {
+			$object->SetDBField('SubNumber', $object->getNextSubNumber());
+		}
+		else {
+			$this->setNextOrderNumber($event);
+		}
+
+		$reset_fields = array(
+			'OnHold', 'OrderDate', 'ShippingCost', 'ShippingTracking', 'ShippingDate', 'ReturnTotal',
+			'OriginalAmount', 'ShippingInfo', 'GWResult1', 'GWResult2', 'AffiliateCommission',
+			'ProcessingFee', 'InsuranceFee',
+		);
+
+		foreach ( $reset_fields as $reset_field ) {
+			$field_options = $object->GetFieldOptions($reset_field);
+			$object->SetDBField($reset_field, $field_options['default']);
+		}
+
+		$object->SetDBField('OrderIP', $this->Application->getClientIp());
+		$object->UpdateFormattersSubFields();
+	}
+
+	function OnReserveItems($event)
+	{
+		/** @var kDBList $order_items */
+		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+
+		$order_items->linkToParent('-inv');
+		// force re-query, since we are updateing through orditem ITEM, not the list, and
+		// OnReserveItems may be called 2 times when fullfilling backorders through product edit - first time
+		// from FullFillBackorders and second time from OnOrderProcess
+		$order_items->Query(true);
+		$order_items->GoFirst();
+
+		// query all combinations used in this order
+
+
+		/** @var kCatDBItem $product_object */
+		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+
+		$product_object->SwitchToLive();
+
+		/** @var kDBItem $order_item */
+		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+
+		/** @var kDBItem $combination_item */
+		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+
+		$combinations = $this->queryCombinations($order_items);
+
+		$event->status = kEvent::erSUCCESS;
+		while (!$order_items->EOL()) {
+			$rec = $order_items->getCurrentRecord();
+			$product_object->Load( $rec['ProductId'] );
+			if (!$product_object->GetDBField('InventoryStatus')) {
+				$order_items->GoNext();
+				continue;
+			}
+
+			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
+
+			$lack = $rec['Quantity'] - $rec['QuantityReserved'];
+
+			if ( $lack > 0 ) {
+				// Reserve lack or what is available (in case if we need to reserve anything, by Alex).
+				$to_reserve = min(
+					$lack,
+					$inv_object->GetDBField('QtyInStock') - $product_object->GetDBField('QtyInStockMin')
+				);
+
+				// If we can't reserve the full lack.
+				if ( $to_reserve < $lack ) {
+					$event->status = kEvent::erFAIL;
+				}
+
+				// Reserve in order.
+				$order_item->SetDBFieldsFromHash($rec);
+				$order_item->SetDBField('QuantityReserved', $rec['QuantityReserved'] + $to_reserve);
+				$new_lack = $order_item->GetDBField('Quantity') - $order_item->GetDBField('QuantityReserved');
+				$order_item->SetDBField('BackOrderFlag', abs($new_lack) <= 0.0001 ? 0 : 1);
+				$order_item->SetId($rec['OrderItemId']);
+				$order_item->Update();
+
+				// Update product - increase reserved, decrease in stock.
+				$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') + $to_reserve);
+				$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') - $to_reserve);
+				$inv_object->SetDBField('QtyBackOrdered', $inv_object->GetDBField('QtyBackOrdered') - $to_reserve);
+				$inv_object->Update();
+
+				if ( $product_object->GetDBField('InventoryStatus') == 2 ) {
+					// Inventory by options, then restore changed combination
+					// values back to common $combinations array !!!
+					$combinations[$rec['ProductId'] . '_' . $rec['OptionsSalt']] = $inv_object->GetFieldValues();
+				}
+			}
+			$order_items->GoNext();
+		}
+		return true;
+	}
+
+	function OnOrderPrint($event)
+	{
+		$event->SetRedirectParam('opener', 's');
+	}
+
+	/**
+	 * Processes order each tab info resetting to other tab info / to user info
+	 *
+	 * @param kEvent $event
+	 * @access public
+	 */
+	function OnResetAddress($event)
+	{
+		$to_tab = $this->Application->GetVar('to_tab');
+		$from_tab = substr($event->Name, strlen('OnResetTo'));
+
+		// load values from db
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		// update values from submit
+		$field_values = $this->getSubmittedFields($event);
+		$object->SetFieldsFromHash($field_values);
+		$event->setEventParam('form_data', $field_values);
+
+		$this->DoResetAddress($object, $from_tab, $to_tab);
+
+		$object->Update();
+		$event->redirect = false;
+	}
+
+	/**
+	 * Processes item selection from popup item selector
+	 *
+	 * @todo Is this called ? (by Alex)
+	 * @param kEvent $event
+	 */
+	function OnProcessSelected($event)
+	{
+		$selected_ids = $this->Application->GetVar('selected_ids');
+		$product_ids = $selected_ids['p'];
+
+		if ($product_ids) {
+			$product_ids = explode(',', $product_ids);
+
+			// !!! LOOK OUT - Adding items to Order in admin is handled in order_ITEMS_event_handler !!!
+			foreach ($product_ids as $product_id) {
+				$this->AddItemToOrder($event, $product_id);
+			}
+		}
+
+		$event->SetRedirectParam('opener', 'u');
+	}
+
+	function OnMassPlaceOrder($event)
+	{
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$ids = $this->StoreSelectedIDs($event);
+
+		if($ids)
+		{
+			foreach($ids as $id)
+			{
+				$object->Load($id);
+				$this->DoPlaceOrder($event);
+			}
+		}
+		$event->status = kEvent::erSUCCESS;
+
+	}
+
+
+
+	/**
+	 * Universal
+	 * Checks if QtyInStock is enough to fullfill backorder (Qty - QtyReserved in order)
+	 *
+	 * @param int $ord_id
+	 * @return bool
+	 */
+	function ReadyToProcess($ord_id)
+	{
+		$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+		$query = '	SELECT SUM(IF( IF('.TABLE_PREFIX.'Products.InventoryStatus = 2, '.$poc_table.'.QtyInStock, '.TABLE_PREFIX.'Products.QtyInStock) - '.TABLE_PREFIX.'Products.QtyInStockMin >= ('.TABLE_PREFIX.'OrderItems.Quantity - '.TABLE_PREFIX.'OrderItems.QuantityReserved), 0, 1))
+							FROM '.TABLE_PREFIX.'OrderItems
+					LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = '.TABLE_PREFIX.'OrderItems.ProductId
+					LEFT JOIN '.$poc_table.' ON ('.$poc_table.'.CombinationCRC = '.TABLE_PREFIX.'OrderItems.OptionsSalt) AND ('.$poc_table.'.ProductId = '.TABLE_PREFIX.'OrderItems.ProductId)
+							WHERE OrderId = '.$ord_id.'
+							GROUP BY OrderId';
+
+		// IF (IF(InventoryStatus = 2, poc.QtyInStock, p.QtyInStock) - QtyInStockMin >= (Quantity - QuantityReserved), 0, 1
+		return ($this->Conn->GetOne($query) == 0);
+	}
+
+	/**
+	 * Return all option combinations used in order
+	 *
+	 * @param kDBList $order_items
+	 * @return Array
+	 */
+	function queryCombinations(&$order_items)
+	{
+		// 1. collect combination crc used in order
+		$combinations = Array();
+		while (!$order_items->EOL()) {
+			$row = $order_items->getCurrentRecord();
+			if ($row['OptionsSalt'] == 0) {
+				$order_items->GoNext();
+				continue;
+			}
+			$combinations[] = '(poc.ProductId = '.$row['ProductId'].') AND (poc.CombinationCRC = '.$row['OptionsSalt'].')';
+			$order_items->GoNext();
+		}
+		$order_items->GoFirst();
+		$combinations = array_unique($combinations); // if same combination+product found as backorder & normal order item
+
+		if ($combinations) {
+			// 2. query data about combinations
+			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+			$sql = 'SELECT CONCAT(poc.ProductId, "_", poc.CombinationCRC) AS CombinationKey, poc.*
+					FROM '.$poc_table.' poc
+					WHERE ('.implode(') OR (', $combinations).')';
+
+			return $this->Conn->Query($sql, 'CombinationKey');
+		}
+
+		return Array();
+	}
+
+	/**
+	 * Returns object to perform inventory actions on
+	 *
+	 * @param ProductsItem $product current product object in order
+	 * @param kDBItem $combination combination dummy object
+	 * @param Array $combination_data pre-queried combination data
+	 * @return kDBItem
+	 */
+	function &getInventoryObject(&$product, &$combination, $combination_data)
+	{
+		if ($product->GetDBField('InventoryStatus') == 2) {
+			// inventory by option combinations
+			$combination->SetDBFieldsFromHash($combination_data);
+			$combination->setID($combination_data['CombinationId']);
+			$change_item =& $combination;
+		}
+		else {
+			// inventory by product ifself
+			$change_item =& $product;
+		}
+
+		return $change_item;
+	}
+
+	/**
+	 * Approve order ("Pending" tab)
+	 *
+	 * @param kDBList $order_items
+	 * @return int new status of order if any
+	 */
+	function approveOrder(&$order_items)
+	{
+		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+
+		$combinations = $this->queryCombinations($order_items);
+
+		while (!$order_items->EOL()) {
+			$rec = $order_items->getCurrentRecord();
+
+			$order_item->SetDBFieldsFromHash($rec);
+			$order_item->SetId($rec['OrderItemId']);
+			$order_item->SetDBField('QuantityReserved', 0);
+			$order_item->Update();
+
+			$product_object->Load( $rec['ProductId'] );
+			if (!$product_object->GetDBField('InventoryStatus')) {
+				// if no inventory info is collected, then skip this order item
+				$order_items->GoNext();
+				continue;
+			}
+
+			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
+
+			// decrease QtyReserved by amount of product used in order
+			$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') - $rec['Quantity']);
+			$inv_object->Update();
+
+			if ($product_object->GetDBField('InventoryStatus') == 2) {
+				// inventory by options, then restore changed combination values back to common $combinations array !!!
+				$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
+			}
+
+			$order_items->GoNext();
+		}
+		return true;
+	}
+
+	/**
+	 * Restores reserved items in the order
+	 *
+	 * @param kDBList $order_items
+	 * @return bool
+	 */
+	function restoreOrder(&$order_items)
+	{
+		/** @var kCatDBItem $product_object */
+		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+
+		$product_object->SwitchToLive();
+
+		/** @var kDBItem $order_item */
+		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+
+		/** @var kDBItem $combination_item */
+		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+
+		$combinations = $this->queryCombinations($order_items);
+
+		while( !$order_items->EOL() )
+		{
+			$rec = $order_items->getCurrentRecord();
+
+			$product_object->Load( $rec['ProductId'] );
+			if (!$product_object->GetDBField('InventoryStatus')) {
+				// if no inventory info is collected, then skip this order item
+				$order_items->GoNext();
+				continue;
+			}
+
+			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
+
+			// cancelling backorderd qty if any
+			$lack = $rec['Quantity'] - $rec['QuantityReserved'];
+			if ($lack > 0 && $rec['BackOrderFlag'] > 0) { // lack should have been recorded as QtyBackOrdered
+				$inv_object->SetDBField('QtyBackOrdered', $inv_object->GetDBField('QtyBackOrdered') - $lack);
+			}
+
+			// canceling reservation in stock
+			$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') - $rec['QuantityReserved']);
+			// putting remaining freed qty back to stock
+			$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') + $rec['QuantityReserved']);
+			$inv_object->Update();
+
+			/** @var ProductsEventHandler $product_h */
+			$product_h = $this->Application->recallObject('p_EventHandler');
+
+			if ($product_object->GetDBField('InventoryStatus') == 2) {
+				// inventory by options, then restore changed combination values back to common $combinations array !!!
+				$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
+
+				// using freed qty to fulfill possible backorders
+				$product_h->FullfillBackOrders($product_object, $inv_object->GetID());
+			}
+			else {
+				// using freed qty to fulfill possible backorders
+				$product_h->FullfillBackOrders($product_object, 0);
+			}
+
+			$order_item->SetDBFieldsFromHash($rec);
+			$order_item->SetId($rec['OrderItemId']);
+			$order_item->SetDBField('QuantityReserved', 0);
+			$order_item->Update();
+
+			$order_items->GoNext();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Approve order + special processing
+	 *
+	 * @param kEvent $event
+	 */
+	function MassInventoryAction($event)
+	{
+		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		// process order products
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.-inv', null, Array ('skip_autoload' => true));
+
+		$ids = $this->StoreSelectedIDs($event);
+
+		if ( $ids ) {
+			foreach ($ids as $id) {
+				$object->Load($id);
+				$this->InventoryAction($event);
+			}
+		}
+	}
+
+	function InventoryAction($event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		$event_status_map = Array(
+			'OnMassOrderApprove'	=> ORDER_STATUS_TOSHIP,
+			'OnOrderApprove' 		=> ORDER_STATUS_TOSHIP,
+			'OnMassOrderDeny'		=> ORDER_STATUS_DENIED,
+			'OnOrderDeny'			=> ORDER_STATUS_DENIED,
+			'OnMassOrderArchive'	=> ORDER_STATUS_ARCHIVED,
+			'OnOrderArchive'		=> ORDER_STATUS_ARCHIVED,
+			'OnMassOrderShip' 		=> ORDER_STATUS_PROCESSED,
+			'OnOrderShip' 			=> ORDER_STATUS_PROCESSED,
+			'OnMassOrderProcess' 	=> ORDER_STATUS_TOSHIP,
+			'OnOrderProcess' 		=> ORDER_STATUS_TOSHIP,
+		);
+
+		/** @var kDBList $order_items */
+		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+
+		$order_items->linkToParent('-inv');
+		$order_items->Query();
+		$order_items->GoFirst();
+
+		/** @var OrdersItem $object */
+		$object = $this->Application->recallObject($event->Prefix.'.-inv');
+
+		if ($object->GetDBField('OnHold')) {
+			// any actions have no effect while on hold
+			return ;
+		}
+
+		// save original order status
+		$original_order_status = $object->GetDBField('Status');
+
+		// preparing new status, but not setting it yet
+		$object->SetDBField('Status', $event_status_map[$event->Name]);
+
+		$set_new_status = false;
+		$event->status = kEvent::erSUCCESS;
+
+		$email_params = $this->OrderEmailParams($object);
+
+		switch ($event->Name) {
+			case 'OnMassOrderApprove':
+			case 'OnOrderApprove':
+				$set_new_status = false; //on successful approve order will be split and new orders will have new statuses
+
+				if ($object->GetDBField('ChargeOnNextApprove')) {
+					$charge_info = $this->ChargeOrder($object);
+					if (!$charge_info['result']) {
+						break;
+					}
+
+					// removing ChargeOnNextApprove
+					$object->SetDBField('ChargeOnNextApprove', 0);
+					$sql = 'UPDATE '.$object->TableName.' SET ChargeOnNextApprove = 0 WHERE '.$object->IDField.' = '.$object->GetID();
+					$this->Conn->Query($sql);
+				}
+
+				// charge user for order in case if we user 2step charging (e.g. AUTH_ONLY + PRIOR_AUTH_CAPTURE)
+				$gw_data = $object->getGatewayData();
+
+				/** @var kGWBase $gateway_object */
+				$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+				$charge_result = $gateway_object->Charge($object->GetFieldValues(), $gw_data['gw_params']);
+				$sql = 'UPDATE %s SET GWResult2 = %s WHERE %s = %s';
+				$sql = sprintf($sql, $object->TableName, $this->Conn->qstr($gateway_object->getGWResponce()), $object->IDField, $object->GetID() );
+				$this->Conn->Query($sql);
+				$object->SetDBField('GWResult2', $gateway_object->getGWResponce() );
+
+				if ($charge_result) {
+					/** @var ProductsItem $product_object */
+					$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+
+					foreach ($order_items->Records as $product_item) {
+						if (!$product_item['ProductId']) {
+							 // product may have been deleted
+							continue;
+						}
+						$product_object->Load($product_item['ProductId']);
+						$hits = floor( $product_object->GetDBField('Hits') ) + 1;
+						$sql = 'SELECT MAX(Hits) FROM '.$this->Application->getUnitOption('p', 'TableName').'
+								WHERE FLOOR(Hits) = '.$hits;
+						$hits = ( $res = $this->Conn->GetOne($sql) ) ? $res + 0.000001 : $hits;
+						$product_object->SetDBField('Hits', $hits);
+						$product_object->Update();
+
+						/*$sql = 'UPDATE '.$this->Application->getUnitOption('p', 'TableName').'
+								SET Hits = Hits + '.$product_item['Quantity'].'
+								WHERE ProductId = '.$product_item['ProductId'];
+						$this->Conn->Query($sql);*/
+					}
+
+					$this->PrepareCoupons($event, $object);
+					$this->SplitOrder($event, $object);
+
+					if ( $object->GetDBField('IsRecurringBilling') != 1 ) {
+						$this->Application->emailUser('ORDER.APPROVE', null, $email_params);
+
+						// Mask credit card with XXXX
+						if ( $this->Application->ConfigValue('Comm_MaskProcessedCreditCards') ) {
+							$this->maskCreditCard($object, 'PaymentAccount');
+							$set_new_status = 1;
+						}
+					}
+				}
+
+				break;
+
+			case 'OnMassOrderDeny':
+			case 'OnOrderDeny':
+				foreach ($order_items->Records as $product_item) {
+					if (!$product_item['ProductId']) {
+						 // product may have been deleted
+						continue;
+					}
+					$this->raiseProductEvent('Deny', $product_item['ProductId'], $product_item);
+				}
+
+				if ( ($original_order_status != ORDER_STATUS_INCOMPLETE) && ($event->Name == 'OnMassOrderDeny' || $event->Name == 'OnOrderDeny') ) {
+					$this->Application->emailUser('ORDER.DENY', null, $email_params);
+
+					// inform payment gateway that order was declined
+					$gw_data = $object->getGatewayData();
+
+					if ( $gw_data ) {
+						/** @var kGWBase $gateway_object */
+						$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+						$gateway_object->OrderDeclined($object->GetFieldValues(), $gw_data['gw_params']);
+					}
+				}
+
+				// !!! LOOK HERE !!!
+				// !!!! no break !!!! here on purpose!!!
+			case 'OnMassOrderArchive':
+			case 'OnOrderArchive':
+				// it's critical to update status BEFORE processing items because
+				// FullfillBackorders could be called during processing and in case
+				// of order denial/archive fullfill could reserve the qtys back for current backorder
+				$object->Update();
+				$this->restoreOrder($order_items);
+				$set_new_status = false; // already set
+				break;
+
+			case 'OnMassOrderShip':
+			case 'OnOrderShip':
+				$ret = Array ();
+				$shipping_info = $object->GetDBField('ShippingInfo');
+
+				if ($shipping_info) {
+					/** @var ShippingQuoteCollector $quote_engine_collector */
+					$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+					$shipping_info = unserialize($shipping_info);
+					$sqe_class_name = $quote_engine_collector->GetClassByType($shipping_info, 1);
+				}
+
+				// try to create usps order
+				if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false)) {
+					/** @var ShippingQuoteEngine $shipping_quote_engine */
+					$shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
+
+					$ret = $shipping_quote_engine->MakeOrder($object);
+				}
+
+				if ( !array_key_exists('error_number', $ret) ) {
+					$set_new_status = $this->approveOrder($order_items);
+
+//					$set_new_status = $this->shipOrder($order_items);
+					$object->SetDBField('ShippingDate', adodb_mktime());
+					$object->UpdateFormattersSubFields();
+
+					$shipping_email = $object->GetDBField('ShippingEmail');
+					$email_params['to_email'] = $shipping_email ? $shipping_email : $email_params['_user_email'];
+					$this->Application->emailUser('ORDER.SHIP', null, $email_params);
+
+					// inform payment gateway that order was shipped
+					$gw_data = $object->getGatewayData();
+
+					/** @var kGWBase $gateway_object */
+					$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+					$gateway_object->OrderShipped($object->GetFieldValues(), $gw_data['gw_params']);
+				}
+				else {
+					$sqe_errors = $this->Application->RecallVar('sqe_errors');
+					$sqe_errors = $sqe_errors ? unserialize($sqe_errors) : Array ();
+					$sqe_errors[ $object->GetField('OrderNumber') ] = $ret['error_description'];
+
+					$this->Application->StoreVar('sqe_errors', serialize($sqe_errors));
+				}
+				break;
+
+			case 'OnMassOrderProcess':
+			case 'OnOrderProcess':
+				if ( $this->ReadyToProcess($object->GetID()) ) {
+					$event->CallSubEvent('OnReserveItems');
+
+					if ( $event->status == kEvent::erSUCCESS ) {
+						$set_new_status = true;
+					}
+
+					$this->Application->emailUser('BACKORDER.PROCESS', null, $email_params);
+				}
+				else {
+					$event->status = kEvent::erFAIL;
+				}
+				break;
+		}
+
+		if ( $set_new_status ) {
+			$object->Update();
+		}
+	}
+
+	/**
+	 * Hides last 4 digits from credit card number
+	 *
+	 * @param OrdersItem $object
+	 * @param string $field
+	 */
+	function maskCreditCard(&$object, $field)
+	{
+		$value = $object->GetDBField($field);
+		$value = preg_replace('/'.substr($value, -4).'$/', str_repeat('X', 4), $value);
+		$object->SetDBField($field, $value);
+	}
+
+	/**
+	 * Set next available order number.
+	 *
+	 * @param kEvent $event Event.
+	 *
+	 * @return void
+	 */
+	protected function setNextOrderNumber(kEvent $event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$next_order_number = $this->getNextOrderNumber();
+
+		$object->SetDBField('Number', $next_order_number);
+		$object->SetDBField('SubNumber', 0);
+
+		// set virtual field too
+		$number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_P');
+		$sub_number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_S');
+		$order_number = sprintf('%0' . $number_format . 'd', $next_order_number) . '-' . str_repeat('0', $sub_number_format);
+
+		$object->SetDBField('OrderNumber', $order_number);
+	}
+
+	/**
+	 * Returns order number to be used next.
+	 *
+	 * @return integer
+	 */
+	protected function getNextOrderNumber()
+	{
+		$config_table = $this->Application->getUnitOption('conf', 'TableName');
+		$this->Conn->Query('LOCK TABLES ' . $config_table . ' WRITE');
+
+		$sql = 'UPDATE ' . $config_table . '
+				SET VariableValue = VariableValue + 1
+				WHERE VariableName = "Comm_Next_Order_Number"';
+		$this->Conn->Query($sql);
+
+		$sql = 'SELECT VariableValue
+				FROM ' . $config_table . '
+				WHERE VariableName = "Comm_Next_Order_Number"';
+		$next_order_number = $this->Conn->GetOne($sql);
+
+		$this->Conn->Query('UNLOCK TABLES');
+		$this->Application->SetConfigValue('Comm_Next_Order_Number', $next_order_number);
+
+		return $next_order_number - 1;
+	}
+
+	/**
+	 * [HOOK] Ensures, that "Next Order Number" system setting is within allowed limits.
+	 *
+	 * @param kEvent $event Event.
+	 *
+	 * @return void
+	 */
+	protected function OnBeforeNextOrderNumberChange(kEvent $event)
+	{
+		/** @var kDBItem $system_setting */
+		$system_setting = $event->MasterEvent->getObject();
+
+		$old_value = $system_setting->GetOriginalField('VariableValue');
+		$new_value = $system_setting->GetDBField('VariableValue');
+
+		if ( $system_setting->GetDBField('VariableName') != 'Comm_Next_Order_Number' || $new_value == $old_value ) {
+			return;
+		}
+
+		$sql = 'SELECT MAX(Number)
+				FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName');
+		$next_order_number = (int)$this->Conn->GetOne($sql) + 1;
+
+		if ( $new_value < $next_order_number ) {
+			$system_setting->SetError('VariableValue', 'value_out_of_range', null, array(
+				'min_value' => $next_order_number,
+				'max_value' => '&infin;',
+			));
+		}
+	}
+
+	/**
+	 * Set's new order address based on another address from order (e.g. billing from shipping)
+	 *
+	 * @param unknown_type $object
+	 * @param unknown_type $from
+	 * @param unknown_type $to
+	 */
+	function DoResetAddress(&$object, $from, $to)
+	{
+		$fields = Array('To','Company','Phone','Fax','Email','Address1','Address2','City','State','Zip','Country');
+
+		if ($from == 'User') {
+			// skip these fields when coping from user, because they are not present in user profile
+			$tmp_fields = array_flip($fields);
+//			unset($tmp_fields['Company'], $tmp_fields['Fax'], $tmp_fields['Address2']);
+			$fields = array_flip($tmp_fields);
+		}
+
+		// apply modification
+		foreach ($fields as $field_name) {
+			$object->SetDBField($to.$field_name, $object->GetDBField($from.$field_name));
+		}
+	}
+
+	/**
+	 * Set's status incomplete to all cloned orders
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterClone(kEvent $event)
+	{
+		parent::OnAfterClone($event);
+
+		$id = $event->getEventParam('id');
+		$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+
+		// set cloned order status to Incomplete
+		$sql = 'UPDATE ' . $table . '
+				SET Status = 0
+				WHERE ' . $id_field . ' = ' . $id;
+		$this->Conn->Query($sql);
+	}
+
+
+	/* ======================== COMMON CODE ======================== */
+
+	/**
+	 * Split one timestamp field into 2 virtual fields
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(kEvent $event)
+	{
+		parent::OnAfterItemLoad($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		// get user fields
+		$user_id = $object->GetDBField('PortalUserId');
+
+		if ( $user_id ) {
+			$sql = 'SELECT *, CONCAT(FirstName,\' \',LastName) AS UserTo
+					FROM ' . TABLE_PREFIX . 'Users
+					WHERE PortalUserId = ' . $user_id;
+			$user_info = $this->Conn->GetRow($sql);
+
+			$fields = Array(
+				'UserTo'=>'UserTo','UserPhone'=>'Phone','UserFax'=>'Fax','UserEmail'=>'Email',
+				'UserAddress1'=>'Street','UserAddress2'=>'Street2','UserCity'=>'City','UserState'=>'State',
+				'UserZip'=>'Zip','UserCountry'=>'Country','UserCompany'=>'Company'
+			);
+
+			foreach ($fields as $object_field => $user_field) {
+				$object->SetDBField($object_field, $user_info[$user_field]);
+			}
+		}
+
+		$object->SetDBField('PaymentCVV2', $this->Application->RecallVar('CVV2Code'));
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
+		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
+
+		$this->SetStepRequiredFields($event);
+
+		// needed in OnAfterItemUpdate
+		$this->Application->SetVar('OriginalShippingOption', $object->GetDBField('ShippingOption'));
+	}
+
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
+		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
+	}
+
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$old_payment_type = $object->GetOriginalField('PaymentType');
+		$new_payment_type = $object->GetDBField('PaymentType');
+
+		if ( $new_payment_type != $old_payment_type ) {
+			// payment type changed -> check that it's allowed
+			$available_payment_types = $this->Application->siteDomainField('PaymentTypes');
+
+			if ( $available_payment_types ) {
+				if ( strpos($available_payment_types, '|' . $new_payment_type . '|') === false ) {
+					// payment type isn't allowed in site domain
+					$object->SetDBField('PaymentType', $old_payment_type);
+				}
+			}
+		}
+
+		/** @var kCountryStatesHelper $cs_helper */
+		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
+		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
+
+		if ( $object->HasTangibleItems() ) {
+			$cs_helper->CheckStateField($event, 'ShippingState', 'ShippingCountry', false);
+		}
+
+		$cs_helper->CheckStateField($event, 'BillingState', 'BillingCountry', false);
+
+		if ( $object->GetDBField('Status') > ORDER_STATUS_PENDING ) {
+			return ;
+		}
+
+		$this->CheckUser($event);
+
+		if ( !$object->GetDBField('OrderIP') ) {
+			$object->SetDBField('OrderIP', $this->Application->getClientIp());
+		}
+
+		$shipping_option = $this->Application->GetVar('OriginalShippingOption');
+		$new_shipping_option = $object->GetDBField('ShippingOption');
+
+		if ( $shipping_option != $new_shipping_option ) {
+			$this->UpdateShippingOption($event);
+		}
+		else {
+			$this->UpdateShippingTypes($event);
+		}
+		$this->RecalculateProcessingFee($event);
+		$this->UpdateShippingTotal($event);
+		$this->RecalculateGift($event);
+
+		// guess fields from "One Step Checkout" form
+		if ( $object->GetDBField('PaymentAccount') ) {
+			/** @var OrderHelper $order_helper */
+			$order_helper = $this->Application->recallObject('OrderHelper');
+
+			$object->SetDBField(
+				'PaymentCardType',
+				$order_helper->getCreditCardType($object->GetDBField('PaymentAccount'))
+			);
+		}
+		else {
+			$object->SetDBField('PaymentCardType', '');
+		}
+
+		if ( !$object->GetDBField('PaymentNameOnCard') ) {
+			$object->SetDBField('PaymentNameOnCard', $object->GetDBField('BillingTo'));
+		}
+
+		if ( is_object($event->MasterEvent) && $event->MasterEvent->Name == 'OnUpdateAjax' && $this->Application->GetVar('create_account') && $object->Validate() ) {
+			$this->createAccountFromOrder($event);
+		}
+	}
+
+	/**
+	 * Creates user account
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function createAccountFromOrder($event)
+	{
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		/** @var OrderHelper $order_helper */
+		$order_helper = $this->Application->recallObject('OrderHelper');
+
+		$user_fields = $order_helper->getUserFields($order);
+		$user_fields['Password'] = $order->GetDBField('UserPassword_plain');
+		$user_fields['VerifyPassword'] = $order->GetDBField('VerifyUserPassword_plain');
+
+		if ( $order->GetDBField('PortalUserId') == USER_GUEST ) {
+			// will also auto-login user when created
+			$this->Application->SetVar('u_register', Array (USER_GUEST => $user_fields));
+			$this->Application->HandleEvent(new kEvent('u.register:OnCreate'));
+		}
+		else {
+			/** @var UsersItem $user */
+			$user = $this->Application->recallObject('u.current');
+
+			$user->SetFieldsFromHash($user_fields);
+			if ( !$user->Update() ) {
+				$order->SetError('BillingEmail', $user->GetErrorPseudo('Email'));
+			}
+		}
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		$types = $event->getEventParam('types');
+		if ( $types == 'myorders' || $types == 'myrecentorders' ) {
+			$user_id = $this->Application->RecallVar('user_id');
+			$object->addFilter('myitems_user1', '%1$s.PortalUserId = ' . $user_id);
+			$object->addFilter('myitems_user2', '%1$s.PortalUserId > 0');
+			$object->addFilter('Status', '%1$s.Status != 0');
+		}
+		else if ($event->Special == 'returns') {
+//			$object->addFilter('returns_filter',TABLE_PREFIX.'Orders.Status = '.ORDER_STATUS_PROCESSED.' AND (
+//				SELECT SUM(ReturnType)
+//				FROM '.TABLE_PREFIX.'OrderItems oi
+//				WHERE oi.OrderId = '.TABLE_PREFIX.'Orders.OrderId
+//			) > 0');
+			$object->addFilter('returns_filter', TABLE_PREFIX . 'Orders.Status = ' . ORDER_STATUS_PROCESSED . ' AND ' . TABLE_PREFIX . 'Orders.ReturnTotal > 0');
+		}
+		else if ( $event->Special == 'user' ) {
+			$user_id = $this->Application->GetVar('u_id');
+			$object->addFilter('user_filter', '%1$s.PortalUserId = ' . $user_id);
+		}
+		else {
+			$special = $event->Special ? $event->Special : $this->Application->GetVar('order_type');
+			if ( $special != 'search' ) {
+				// don't filter out orders by special in case of search tab
+				$object->addFilter('status_filter', '%1$s.Status=' . $this->getTypeBySpecial($special));
+			}
+
+			if ( $event->getEventParam('selected_only') ) {
+				$ids = $this->StoreSelectedIDs($event);
+				$object->addFilter('selected_filter', '%1$s.OrderId IN (' . implode(',', $ids) . ')');
+			}
+		}
+	}
+
+	function getTypeBySpecial($special)
+	{
+		$special2type = Array('incomplete'=>0,'pending'=>1,'backorders'=>2,'toship'=>3,'processed'=>4,'denied'=>5,'archived'=>6);
+		return $special2type[$special];
+	}
+
+	function getSpecialByType($type)
+	{
+		$type2special = Array(0=>'incomplete',1=>'pending',2=>'backorders',3=>'toship',4=>'processed',5=>'denied',6=>'archived');
+		return $type2special[$type];
+	}
+
+	function LockTables($event)
+	{
+		$read = Array();
+		$write_lock = '';
+		$read_lock = '';
+		$write = Array('Orders','OrderItems','Products');
+		foreach ($write as $tbl) {
+			$write_lock .= TABLE_PREFIX.$tbl.' WRITE,';
+		}
+		foreach ($read as $tbl) {
+			$read_lock .= TABLE_PREFIX.$tbl.' READ,';
+		}
+		$write_lock = rtrim($write_lock, ',');
+		$read_lock = rtrim($read_lock, ',');
+		$lock = trim($read_lock.','.$write_lock, ',');
+		//$this->Conn->Query('LOCK TABLES '.$lock);
+	}
+
+	/**
+	 * Checks shopping cart products quantities
+	 *
+	 * @param kEvent $event
+	 * @return bool
+	 */
+	function CheckQuantites($event)
+	{
+		if ( $this->OnRecalculateItems($event) ) { // if something has changed in the order
+			if ( $this->Application->isAdminUser ) {
+				if ( $this->UseTempTables($event) ) {
+					$event->redirect = 'in-commerce/orders/orders_edit_items';
+				}
+			}
+			else {
+				$event->redirect = $this->Application->GetVar('viewcart_template');
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	function DoPlaceOrder($event)
+	{
+		$order = $event->getObject();
+
+		$table_prefix = $this->TablePrefix($event);
+
+		$this->LockTables($event);
+
+		if (!$this->CheckQuantites($event)) return false;
+
+		//everything is fine - we could reserve items
+		$this->ReserveItems($event);
+		$this->SplitOrder($event, $order);
+		return true;
+	}
+
+	function &queryOrderItems($event, $table_prefix)
+	{
+		$order = $event->getObject();
+		$ord_id = $order->GetId();
+
+		// TABLE_PREFIX and $table_prefix are NOT the same !!!
+		$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+		$query = '	SELECT
+							 BackOrderFlag, '.
+							 $table_prefix.'OrderItems.OrderItemId, '.
+							 $table_prefix.'OrderItems.Quantity, '.
+							 $table_prefix.'OrderItems.QuantityReserved,
+							 IF('.TABLE_PREFIX.'Products.InventoryStatus = 2, '.$poc_table.'.QtyInStock, '.TABLE_PREFIX.'Products.QtyInStock) AS QtyInStock, '.
+							 TABLE_PREFIX.'Products.QtyInStockMin, '.
+							 $table_prefix.'OrderItems.ProductId, '.
+							 TABLE_PREFIX.'Products.InventoryStatus,'.
+							 $table_prefix.'OrderItems.OptionsSalt AS CombinationCRC
+					FROM '.$table_prefix.'OrderItems
+					LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = '.$table_prefix.'OrderItems.ProductId
+					LEFT JOIN '.$poc_table.' ON ('.$poc_table.'.CombinationCRC = '.$table_prefix.'OrderItems.OptionsSalt) AND ('.$poc_table.'.ProductId = '.$table_prefix.'OrderItems.ProductId)
+					WHERE OrderId = '.$ord_id.' AND '.TABLE_PREFIX.'Products.Type = 1
+					ORDER BY BackOrderFlag ASC';
+
+		$items = $this->Conn->Query($query);
+		return $items;
+	}
+
+	function ReserveItems($event)
+	{
+		$table_prefix = $this->TablePrefix($event);
+		$items =& $this->queryOrderItems($event, $table_prefix);
+
+		foreach ($items as $an_item) {
+			if (!$an_item['InventoryStatus']) {
+				$to_reserve = $an_item['Quantity'] - $an_item['QuantityReserved'];
+			}
+			else {
+				if ($an_item['BackOrderFlag'] > 0) { // we don't need to reserve if it's backordered item
+					$to_reserve = 0;
+				}
+				else {
+					$to_reserve = min($an_item['Quantity']-$an_item['QuantityReserved'], $an_item['QtyInStock']-$an_item['QtyInStockMin']); //it should be equal, but just in case
+				}
+
+				$to_backorder = $an_item['BackOrderFlag'] > 0 ? $an_item['Quantity']-$an_item['QuantityReserved'] : 0;
+			}
+
+			if ($to_backorder < 0) $to_backorder = 0; //just in case
+			$query = '	UPDATE '.$table_prefix.'OrderItems
+						SET QuantityReserved = IF(QuantityReserved IS NULL, '.$to_reserve.', QuantityReserved + '.$to_reserve.')
+						WHERE OrderItemId = '.$an_item['OrderItemId'];
+			$this->Conn->Query($query);
+
+			if (!$an_item['InventoryStatus']) continue;
+
+			$update_clause = '	QtyInStock = QtyInStock - '.$to_reserve.',
+							  	QtyReserved = QtyReserved + '.$to_reserve.',
+								QtyBackOrdered = QtyBackOrdered + '.$to_backorder;
+
+			if ($an_item['InventoryStatus'] == 1) {
+				// inventory by product, then update it's quantities
+				$query = '	UPDATE '.TABLE_PREFIX.'Products
+							SET '.$update_clause.'
+								WHERE ProductId = '.$an_item['ProductId'];
+			}
+			else {
+				// inventory = 2 -> by product option combinations
+				$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
+				$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+				$query = '	UPDATE '.$poc_table.'
+							SET '.$update_clause.'
+							WHERE (ProductId = '.$an_item['ProductId'].') AND (CombinationCRC = '.$an_item['CombinationCRC'].')';
+			}
+			$this->Conn->Query($query);
+		}
+	}
+
+	function FreeItems($event)
+	{
+		$table_prefix = $this->TablePrefix($event);
+		$items =& $this->queryOrderItems($event, $table_prefix);
+
+		foreach ($items as $an_item) {
+				$to_free = $an_item['QuantityReserved'];
+
+				if ($an_item['InventoryStatus']) {
+				if ($an_item['BackOrderFlag'] > 0) { // we don't need to free if it's backordered item
+					$to_free = 0;
+				}
+
+				// what's not reserved goes to backorder in stock for orderitems marked with BackOrderFlag
+				$to_backorder_free = $an_item['BackOrderFlag'] > 0 ? $an_item['Quantity'] - $an_item['QuantityReserved'] : 0;
+				if ($to_backorder_free < 0) $to_backorder_free = 0; //just in case
+
+				$update_clause = '	QtyInStock = QtyInStock + '.$to_free.',
+								  	QtyReserved = QtyReserved - '.$to_free.',
+							  		QtyBackOrdered = QtyBackOrdered - '.$to_backorder_free;
+
+				if ($an_item['InventoryStatus'] == 1) {
+					// inventory by product
+					$query = '	UPDATE '.TABLE_PREFIX.'Products
+								SET '.$update_clause.'
+									WHERE ProductId = '.$an_item['ProductId'];
+				}
+				else {
+					// inventory by option combinations
+					$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
+					$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+					$query = '	UPDATE '.$poc_table.'
+								SET '.$update_clause.'
+								WHERE (ProductId = '.$an_item['ProductId'].') AND (CombinationCRC = '.$an_item['CombinationCRC'].')';
+				}
+
+					$this->Conn->Query($query);
+				}
+
+			$query = '	UPDATE '.$table_prefix.'OrderItems
+						SET QuantityReserved = IF(QuantityReserved IS NULL, 0, QuantityReserved - '.$to_free.')
+									WHERE OrderItemId = '.$an_item['OrderItemId'];
+				$this->Conn->Query($query);
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 * @param OrdersItem $object
+	 */
+	function SplitOrder($event, &$object)
+	{
+		$affiliate_event = new kEvent('affil:OnOrderApprove');
+		$affiliate_event->setEventParam('Order_PrefixSpecial', $object->getPrefixSpecial() );
+		$this->Application->HandleEvent($affiliate_event);
+
+		$table_prefix = $this->TablePrefix($event);
+		$order =& $object;
+		$ord_id = $order->GetId();
+
+		$shipping_option = $order->GetDBField('ShippingOption');
+		$backorder_select = $shipping_option == 0 ? '0' : '%s.BackOrderFlag';
+
+
+		// setting PackageNum to 0 for Non-tangible items, for tangibles first package num is always 1
+		$query = '	SELECT oi.OrderItemId
+					FROM ' . $table_prefix . 'OrderItems oi
+					LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ProductId = oi.ProductId
+					WHERE p.Type > 1 AND oi.OrderId = ' . $ord_id;
+		$non_tangibles = $this->Conn->GetCol($query);
+
+		if ($non_tangibles) {
+			$query = '	UPDATE ' . $table_prefix . 'OrderItems
+						SET PackageNum = 0
+						WHERE OrderItemId IN (' . implode(',', $non_tangibles) . ')';
+			$this->Conn->Query($query);
+		}
+
+		// grouping_data:
+		// 0 => Product Type
+		// 1 => if NOT tangibale and NOT downloadable - OrderItemId,
+		//			2 => ProductId
+		// 3 => Shipping PackageNum
+		$query = 'SELECT
+					' . sprintf($backorder_select, $table_prefix . 'OrderItems') . ' AS BackOrderFlagCalc,
+					PackageNum,
+					ProductName,
+					ShippingTypeId,
+					CONCAT('.TABLE_PREFIX.'Products.Type,
+						"_",
+						IF ('.TABLE_PREFIX.'Products.Type NOT IN ('.PRODUCT_TYPE_DOWNLOADABLE.','.PRODUCT_TYPE_TANGIBLE.'),
+							CONCAT(OrderItemId, "_", '.TABLE_PREFIX.'Products.ProductId),
+							""),
+						"_",
+						PackageNum
+						) AS Grouping,
+					SUM(Quantity) AS TotalItems,
+					SUM('.$table_prefix.'OrderItems.Weight*Quantity) AS TotalWeight,
+					SUM(Price * Quantity) AS TotalAmount,
+					SUM(QuantityReserved) AS TotalReserved,
+					'.TABLE_PREFIX.'Products.Type AS ProductType
+				FROM '.$table_prefix.'OrderItems
+				LEFT JOIN '.TABLE_PREFIX.'Products
+					ON '.TABLE_PREFIX.'Products.ProductId = '.$table_prefix.'OrderItems.ProductId
+				WHERE OrderId = '.$ord_id.'
+				GROUP BY BackOrderFlagCalc, Grouping
+				ORDER BY BackOrderFlagCalc ASC, PackageNum ASC, ProductType ASC';
+
+		$sub_orders = $this->Conn->Query($query);
+
+		$processed_sub_orders = Array();
+
+		// in case of recurring billing this will not be 0 as usual
+		//$first_sub_number = ($event->Special == 'recurring') ? $object->getNextSubNumber() - 1 : 0;
+		$first_sub_number = $object->GetDBField('SubNumber');
+
+		$next_sub_number = $first_sub_number;
+		$group = 1;
+
+		$order_has_gift = $order->GetDBField('GiftCertificateDiscount') > 0 ? 1 : 0;
+
+		$skip_types = Array (PRODUCT_TYPE_TANGIBLE, PRODUCT_TYPE_DOWNLOADABLE);
+		foreach ($sub_orders as $sub_order_data) {
+			/** @var OrdersItem $sub_order */
+			$sub_order = $this->Application->recallObject('ord.-sub'.$next_sub_number, 'ord');
+
+			if ( $this->UseTempTables($event) && $next_sub_number == 0 ) {
+				$sub_order =& $order;
+			}
+			else {
+				foreach ( $order->GetFieldValues() as $field => $value ) {
+					$sub_order->SetOriginalField($field, $value);
+				}
+			}
+
+			$sub_order->SetDBFieldsFromHash($order->GetFieldValues());
+			$sub_order->SetDBField('SubNumber', $next_sub_number);
+			$sub_order->SetDBField('SubTotal', $sub_order_data['TotalAmount']);
+
+			$grouping_data = explode('_', $sub_order_data['Grouping']);
+			$named_grouping_data['Type'] = $grouping_data[0];
+
+			if (!in_array($named_grouping_data['Type'], $skip_types)) {
+				$named_grouping_data['OrderItemId'] = $grouping_data[1];
+				$named_grouping_data['ProductId'] = $grouping_data[2];
+				$named_grouping_data['PackageNum'] = $grouping_data[3];
+			}
+			else {
+				$named_grouping_data['PackageNum'] = $grouping_data[2];
+			}
+
+			if ($named_grouping_data['Type'] == PRODUCT_TYPE_TANGIBLE) {
+				$sub_order->SetDBField('ShippingCost', getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum'], 'TotalCost') );
+				$sub_order->SetDBField('InsuranceFee', getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum'], 'InsuranceFee') );
+				$sub_order->SetDBField('ShippingInfo', serialize(Array(1 => getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum']))));
+			}
+			else {
+				$sub_order->SetDBField('ShippingCost', 0);
+				$sub_order->SetDBField('InsuranceFee', 0);
+				$sub_order->SetDBField('ShippingInfo', ''); //otherwise orders w/o shipping wills still have shipping info!
+			}
+
+			$amount_percent = $sub_order->getTotalAmount() * 100 / $order->getTotalAmount();
+			// proportional affiliate commission splitting
+			if ($order->GetDBField('AffiliateCommission') > 0) {
+				$sub_order->SetDBField('AffiliateCommission', $order->GetDBField('AffiliateCommission') * $amount_percent / 100 );
+			}
+
+			$amount_percent = ($sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost')) * 100 / ($order->GetDBField('SubTotal') + $order->GetDBField('ShippingCost'));
+			if ($order->GetDBField('ProcessingFee') > 0) {
+				$sub_order->SetDBField('ProcessingFee', round($order->GetDBField('ProcessingFee') * $amount_percent / 100, 2));
+			}
+
+			$sub_order->RecalculateTax();
+
+			$original_amount = $sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost') + $sub_order->GetDBField('VAT') + $sub_order->GetDBField('ProcessingFee') + $sub_order->GetDBField('InsuranceFee') - $sub_order->GetDBField('GiftCertificateDiscount');
+			$sub_order->SetDBField('OriginalAmount', $original_amount);
+
+			if ($named_grouping_data['Type'] == 1 && ($sub_order_data['BackOrderFlagCalc'] > 0
+					||
+					($sub_order_data['TotalItems'] != $sub_order_data['TotalReserved'])) ) {
+				$sub_order->SetDBField('Status', ORDER_STATUS_BACKORDERS);
+
+				if ($event->Special != 'recurring') { // just in case if admin uses tangible backordered products in recurring orders
+					$this->Application->emailUser('BACKORDER.ADD', null, $this->OrderEmailParams($sub_order));
+		    		$this->Application->emailAdmin('BACKORDER.ADD');
+				}
+			}
+			else {
+				switch ($named_grouping_data['Type']) {
+					case PRODUCT_TYPE_DOWNLOADABLE:
+						$sql = 'SELECT oi.*
+								FROM '.TABLE_PREFIX.'OrderItems oi
+								LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
+								WHERE (OrderId = %s) AND (p.Type = '.PRODUCT_TYPE_DOWNLOADABLE.')';
+						$downl_products = $this->Conn->Query( sprintf($sql, $ord_id) );
+						$product_ids = Array();
+						foreach ($downl_products as $downl_product) {
+							$this->raiseProductEvent('Approve', $downl_product['ProductId'], $downl_product, $next_sub_number);
+							$product_ids[] = $downl_product['ProductId'];
+						}
+						break;
+
+					case PRODUCT_TYPE_TANGIBLE:
+						$sql = 'SELECT ' . sprintf($backorder_select, 'oi') . ' AS BackOrderFlagCalc, oi.*
+								FROM ' . TABLE_PREFIX . 'OrderItems oi
+								LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ProductId = oi.ProductId
+								WHERE (OrderId = %s) AND (p.Type = ' . PRODUCT_TYPE_TANGIBLE . ')
+								HAVING BackOrderFlagCalc = 0';
+
+							$products = $this->Conn->Query( sprintf($sql, $ord_id) );
+							foreach ($products as $product) {
+								$this->raiseProductEvent('Approve', $product['ProductId'], $product, $next_sub_number);
+							}
+						break;
+
+					default:
+						$order_item_fields = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$named_grouping_data['OrderItemId']);
+						$this->raiseProductEvent('Approve', $named_grouping_data['ProductId'], $order_item_fields, $next_sub_number);
+						break;
+				}
+
+				$sub_order->SetDBField('Status', $named_grouping_data['Type'] == PRODUCT_TYPE_TANGIBLE ? ORDER_STATUS_TOSHIP : ORDER_STATUS_PROCESSED);
+			}
+
+			if ($next_sub_number == $first_sub_number) {
+				$sub_order->SetId($order->GetId());
+				$sub_order->Update();
+			}
+			else {
+				$sub_order->Create();
+			}
+
+			switch ($named_grouping_data['Type']) {
+				case PRODUCT_TYPE_TANGIBLE:
+					$query = '	UPDATE ' . $table_prefix . 'OrderItems
+								SET OrderId = %s, PackageNum = 1
+								WHERE OrderId = %s AND PackageNum = %s';
+					$query = sprintf($query, $sub_order->GetID(), $ord_id, $sub_order_data['PackageNum']);
+					break;
+
+				case PRODUCT_TYPE_DOWNLOADABLE:
+					$query = '	UPDATE ' . $table_prefix . 'OrderItems
+								SET OrderId = %s, PackageNum = 1
+								WHERE OrderId = %s AND ProductId IN (%s)';
+					$query = sprintf($query, $sub_order->GetID(), $ord_id, implode(',', $product_ids));
+					break;
+
+				default:
+					$query = '	UPDATE ' . $table_prefix . 'OrderItems
+								SET OrderId = %s, PackageNum = 1
+								WHERE OrderId = %s AND OrderItemId = %s';
+					$query = sprintf($query, $sub_order->GetID(), $ord_id, $named_grouping_data['OrderItemId']);
+					break;
+			}
+
+			$this->Conn->Query($query);
+
+			if ($order_has_gift) {
+				// gift certificate can be applied only after items are assigned to suborder
+				$sub_order->RecalculateGift($event);
+				$original_amount = $sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost') + $sub_order->GetDBField('VAT') + $sub_order->GetDBField('ProcessingFee') + $sub_order->GetDBField('InsuranceFee') - $sub_order->GetDBField('GiftCertificateDiscount');
+				$sub_order->SetDBField('OriginalAmount', $original_amount);
+				$sub_order->Update();
+			}
+
+			$processed_sub_orders[] = $sub_order->GetID();
+
+			$next_sub_number = $sub_order->getNextSubNumber();
+			$group++;
+		}
+
+		foreach ($processed_sub_orders as $sub_id) {
+			// update DiscountTotal field
+			$sql = 'SELECT SUM(ROUND(FlatPrice-Price,2)*Quantity) FROM '.$table_prefix.'OrderItems WHERE OrderId = '.$sub_id;
+			$discount_total = $this->Conn->GetOne($sql);
+
+			$sql = 'UPDATE '.$sub_order->TableName.'
+					SET DiscountTotal = '.$this->Conn->qstr($discount_total).'
+					WHERE OrderId = '.$sub_id;
+			$this->Conn->Query($sql);
+		}
+	}
+
+	/**
+	 * Call products linked event when spefcfic action is made to product in order
+	 *
+	 * @param string $event_type type of event to get from product ProcessingData = {Approve,Deny,CompleteOrder}
+	 * @param int $product_id ID of product to gather processing data from
+	 * @param Array $order_item_fields OrderItems table record fields (with needed product & order in it)
+	 */
+	function raiseProductEvent($event_type, $product_id, $order_item_fields, $next_sub_number=null)
+	{
+		$sql = 'SELECT ProcessingData
+				FROM '.TABLE_PREFIX.'Products
+				WHERE ProductId = '.$product_id;
+		$processing_data = $this->Conn->GetOne($sql);
+		if ($processing_data) {
+			$processing_data = unserialize($processing_data);
+			$event_key = getArrayValue($processing_data, $event_type.'Event');
+			// if requested type of event is defined for product, only then process it
+			if ($event_key) {
+				$event = new kEvent($event_key);
+				$event->setEventParam('field_values', $order_item_fields);
+				$event->setEventParam('next_sub_number', $next_sub_number);
+				$this->Application->HandleEvent($event);
+			}
+		}
+	}
+
+	function OptionsSalt($options, $comb_only=false)
+	{
+		$helper = $this->Application->recallObject('kProductOptionsHelper');
+		return $helper->OptionsSalt($options, $comb_only);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 * @param int $item_id
+	 */
+	function AddItemToOrder($event, $item_id, $qty = null, $package_num = null)
+	{
+		if (!isset($qty)) {
+			$qty = 1;
+		}
+
+		// Loading product to add
+		/** @var kDBItem $product */
+		$product = $this->Application->recallObject('p.toadd', null, Array('skip_autoload' => true));
+
+		$product->Load($item_id);
+
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+
+		/** @var kDBItem $order */
+		$order = $this->Application->recallObject('ord');
+
+		if (!$order->isLoaded() && !$this->Application->isAdmin) {
+			// no order was created before -> create one now
+			if ($this->_createNewCart($event)) {
+				$this->LoadItem($event);
+			}
+		}
+
+		if (!$order->isLoaded()) {
+			// was unable to create new order
+			return false;
+		}
+
+		$item_data = $event->getEventParam('ItemData');
+		$item_data = $item_data ? unserialize($item_data) : Array ();
+		$options = getArrayValue($item_data, 'Options');
+
+		if ( !$this->CheckOptions($event, $options, $item_id, $qty, $product->GetDBField('OptionsSelectionMode')) ) {
+			return;
+		}
+
+		/** @var OrderManager $manager */
+		$manager = $this->Application->recallObject('OrderManager');
+
+		$manager->setOrder($order);
+		$manager->addProduct($product, $event->getEventParam('ItemData'), $qty, $package_num);
+
+		$this->Application->HandleEvent(new kEvent('ord:OnRecalculateItems'));
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function UpdateShippingTotal($event)
+	{
+		if ( $this->Application->GetVar('ebay_notification') == 1 ) {
+			// TODO: get rid of this "if"
+			return;
+		}
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$shipping_total = $insurance_fee = 0;
+		$shipping_info = $object->GetDBField('ShippingInfo') ? unserialize($object->GetDBField('ShippingInfo')) : false;
+
+		if ( is_array($shipping_info) ) {
+			foreach ($shipping_info as $a_shipping) {
+//				$id_elements = explode('_', $a_shipping['ShippingTypeId']);
+				$shipping_total += $a_shipping['TotalCost'];
+				$insurance_fee += $a_shipping['InsuranceFee'];
+			}
+		}
+
+		$object->SetDBField('ShippingCost', $shipping_total);
+		$object->SetDBField('InsuranceFee', $insurance_fee);
+		// no need to update, it will be called in calling method
+
+		$this->RecalculateTax($event);
+	}
+
+	/**
+	 * Recompile shopping cart, splitting or grouping orders and backorders depending on total quantities.
+	 * First it counts total qty for each ProductId, and then creates order for available items
+	 * and backorder for others. It also updates the sub-total for the order
+	 *
+	 * @param kEvent $event
+	 * @return bool Returns true if items splitting/grouping were changed
+	 */
+	function OnRecalculateItems($event)
+	{
+		if (is_object($event->MasterEvent) && ($event->MasterEvent->status != kEvent::erSUCCESS)) {
+			// e.g. master order update failed, don't recalculate order products
+			return ;
+		}
+
+		/** @var OrdersItem $order */
+		$order = $event->getObject();
+
+		if ( !$order->isLoaded() ) {
+			$this->LoadItem($event); // try to load
+		}
+
+		$ord_id = (int)$order->GetID();
+
+		if ( !$order->isLoaded() ) return; //order has not been created yet
+
+		if( $order->GetDBField('Status') != ORDER_STATUS_INCOMPLETE )
+		{
+			return;
+		}
+
+		/** @var OrderManager $manager */
+		$manager = $this->Application->recallObject('OrderManager');
+
+		$manager->setOrder($order);
+		$result = $manager->calculate();
+
+		if ( $order->GetDBField('CouponId') && $order->GetDBField('CouponDiscount') == 0 ) {
+			$this->RemoveCoupon($order);
+			$order->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED_AUTOMATICALLY);
+		}
+
+		if ( $result ) {
+			$this->UpdateShippingOption($event);
+		}
+
+		$this->UpdateShippingTotal($event);
+
+		$this->RecalculateProcessingFee($event);
+		$this->RecalculateTax($event);
+		$this->RecalculateGift($event);
+
+		if ( $event->Name != 'OnAfterItemUpdate' ) {
+			$order->Update();
+		}
+
+		$event->setEventParam('RecalculateChangedCart', $result);
+
+		if ( is_object($event->MasterEvent) ) {
+			$event->MasterEvent->setEventParam('RecalculateChangedCart', $result);
+		}
+
+		/*if ( $result && !getArrayValue($event->redirect_params, 'checkout_error') ) {
+			$event->SetRedirectParam('checkout_error', OrderCheckoutError::STATE_CHANGED);
+		}*/
+
+		if ( $result && is_object($event->MasterEvent) && $event->MasterEvent->Name == 'OnUserLogin' ) {
+			$shop_cart_template = $this->Application->GetVar('shop_cart_template');
+
+			if ( $shop_cart_template && is_object($event->MasterEvent->MasterEvent) ) {
+//				$event->MasterEvent->MasterEvent->SetRedirectParam('checkout_error', OrderCheckoutError::CHANGED_AFTER_LOGIN);
+				$event->MasterEvent->MasterEvent->redirect = $shop_cart_template;
+			}
+		}
+
+		return $result;
+	}
+
+/*	function GetShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type)
+	{
+		$this->Application->recallObject('ShippingQuoteEngine');
+		$shipping_h = $this->Application->recallObject('CustomShippingQuoteEngine');
+		$query = $shipping_h->QueryShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type);
+		$cost = $this->Conn->GetRow($query);
+		return $cost['TotalCost'];
+	}*/
+
+	/**
+	 * Return product pricing id for given product, if not passed - return primary pricing ID
+	 *
+	 * @param int $product_id ProductId
+	 * @return float
+	 */
+	function GetPricingId($product_id, $item_data)	{
+
+		if (!is_array($item_data)) {
+			$item_data = unserialize($item_data);
+		}
+		$price_id = getArrayValue($item_data, 'PricingId');
+		if (!$price_id) {
+		$price_id = $this->Application->GetVar('pr_id');
+		}
+		if (!$price_id){
+			$price_id = $this->Conn->GetOne('SELECT PriceId FROM '.TABLE_PREFIX.'ProductsPricing WHERE ProductId='.$product_id.' AND IsPrimary=1');
+		}
+		return $price_id;
+	}
+
+	function UpdateShippingOption($event)
+	{
+		$object = $event->getObject();
+		$shipping_option = $object->GetDBField('ShippingOption');
+
+		if($shipping_option == '') return;
+
+		$table_prefix = $this->TablePrefix($event);
+
+		if ($shipping_option == 1 || $shipping_option == 0) { // backorder separately
+			$query = 'UPDATE '.$table_prefix.'OrderItems SET BackOrderFlag = 1 WHERE OrderId = '.$object->GetId().' AND BackOrderFlag > 1';
+			$this->Conn->Query($query);
+		}
+		if ($shipping_option == 2) {
+			$query = 'SELECT * FROM '.$table_prefix.'OrderItems WHERE OrderId = '.$object->GetId().' AND BackOrderFlag >= 1 ORDER By ProductName asc';
+			$items = $this->Conn->Query($query);
+			$backorder_flag = 2;
+			foreach ($items as $an_item) {
+				$query = 'UPDATE '.$table_prefix.'OrderItems SET BackOrderFlag = '.$backorder_flag.' WHERE OrderItemId = '.$an_item['OrderItemId'];
+				$this->Conn->Query($query);
+				$backorder_flag++;
+			}
+		}
+	}
+
+	/**
+	 * Updates shipping types
+	 *
+	 * @param kEvent $event
+	 * @return bool
+	 */
+	function UpdateShippingTypes($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$ord_id = $object->GetID();
+
+		$order_info = $this->Application->GetVar('ord');
+		$shipping_ids = getArrayValue($order_info, $ord_id, 'ShippingTypeId');
+
+		if (!$shipping_ids) {
+			return;
+		}
+
+		$ret = true;
+		$shipping_types = Array();
+		$last_shippings = unserialize( $this->Application->RecallVar('LastShippings') );
+
+		$template = $this->Application->GetVar('t');
+		$shipping_templates = Array ('in-commerce/checkout/shipping', 'in-commerce/orders/orders_edit_shipping');
+
+		/** @var ShippingQuoteCollector $quote_engine_collector */
+		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+		foreach ($shipping_ids as $package => $id) {
+			// try to validate
+			$shipping_types[$package] = $last_shippings[$package][$id];
+			$sqe_class_name = $quote_engine_collector->GetClassByType($shipping_types, $package);
+
+			if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false) && in_array($template, $shipping_templates)) {
+				/** @var ShippingQuoteEngine $shipping_quote_engine */
+				$shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
+
+				// USPS related part
+				// TODO: remove USPS condition from here
+				// set first of found shippings just to check if any errors are returned
+				$current_usps_shipping_types = unserialize($this->Application->RecallVar('current_usps_shipping_types'));
+				$object->SetDBField('ShippingInfo', serialize( Array($package => $current_usps_shipping_types[$id])) );
+
+				$sqe_data = $shipping_quote_engine->MakeOrder($object, true);
+
+				if ( $sqe_data ) {
+					if ( !isset($sqe_data['error_number']) ) {
+						// update only international shipping
+						if ( $object->GetDBField('ShippingCountry') != 'USA') {
+							$shipping_types[$package]['TotalCost'] = $sqe_data['Postage'];
+						}
+					}
+					else {
+						$ret = false;
+						$this->Application->StoreVar('sqe_error', $sqe_data['error_description']);
+					}
+				}
+
+				$object->SetDBField('ShippingInfo', '');
+			}
+		}
+
+		$object->SetDBField('ShippingInfo', serialize($shipping_types));
+
+		return $ret;
+	}
+
+	/*function shipOrder(&$order_items)
+	{
+		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+		$order_item = $this->Application->recallObject('orditems.-item');
+
+		while( !$order_items->EOL() )
+		{
+			$rec = $order_items->getCurrentRecord();
+
+			$order_item->SetDBFieldsFromHash($rec);
+			$order_item->SetId($rec['OrderItemId']);
+			$order_item->SetDBField('QuantityReserved', 0);
+			$order_item->Update();
+
+			$order_items->GoNext();
+		}
+		return true;
+	}*/
+
+	function RecalculateTax($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) {
+			return;
+		}
+
+		$object->RecalculateTax();
+	}
+
+	function RecalculateProcessingFee($event)
+	{
+		$object = $event->getObject();
+
+		// Do not reset processing fee while orders are being split (see SplitOrder)
+		if (preg_match("/^-sub/", $object->Special)) return;
+		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) return; //no changes for orders other than incomple or pending
+
+		$pt = $object->GetDBField('PaymentType');
+		$processing_fee = $this->Conn->GetOne('SELECT ProcessingFee FROM '.$this->Application->getUnitOption('pt', 'TableName').' WHERE PaymentTypeId = '.$pt);
+		$object->SetDBField( 'ProcessingFee', $processing_fee );
+		$this->UpdateTotals($event);
+	}
+
+	function UpdateTotals($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$object->UpdateTotals();
+	}
+
+	/*function CalculateDiscount($event)
+	{
+		$object = $event->getObject();
+
+		$coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
+		if(!$coupon->Load( $object->GetDBField('CouponId'), 'CouponId' ))
+		{
+			return false;
+		}
+
+		$sql = 'SELECT Price * Quantity AS Amount, ProductId FROM '.$this->Application->getUnitOption('orditems', 'TableName').'
+				WHERE OrderId = '.$object->GetDBField('OrderId');
+		$orditems = $this->Conn->GetCol($sql, 'ProductId');
+
+		$sql = 'SELECT coupi.ItemType, p.ProductId FROM '.$this->Application->getUnitOption('coupi', 'TableName').' coupi
+				LEFT JOIN '.$this->Application->getUnitOption('p', 'TableName').' p
+				ON coupi.ItemResourceId = p.ResourceId
+				WHERE CouponId = '.$object->GetDBField('CouponId');
+		$discounts = $this->Conn->GetCol($sql, 'ProductId');
+
+		$discount_amount = 0;
+
+		foreach($orditems as $product_id => $amount)
+		{
+			if(isset($discounts[$product_id]) || array_search('0', $discounts, true) !== false)
+			{
+				switch($coupon->GetDBField('Type'))
+				{
+					case 1:
+						$discount_amount += $coupon->GetDBField('Amount') < $amount ? $coupon->GetDBField('Amount') : $amount;
+					break;
+					case 2:
+						$discount_amount += $amount * $coupon->GetDBField('Amount') / 100;
+					break;
+					default:
+				}
+				break;
+			}
+		}
+
+		$object->SetDBField('CouponDiscount', $discount_amount);
+		return $discount_amount;
+	}*/
+
+	/**
+	 * Jumps to selected order in order's list from search tab
+	 *
+	 * @param kEvent $event
+	 */
+	function OnGoToOrder($event)
+	{
+		$id = current($this->StoreSelectedIDs($event));
+
+		$id_field = $this->Application->getUnitOption($event->Prefix,'IDField');
+		$table = $this->Application->getUnitOption($event->Prefix,'TableName');
+
+		$sql = 'SELECT Status FROM %s WHERE %s = %s';
+
+		$order_status = $this->Conn->GetOne( sprintf($sql, $table, $id_field, $id) );
+
+		$prefix_special = $event->Prefix.'.'.$this->getSpecialByType($order_status);
+
+		/** @var kDBList $orders_list */
+		$orders_list = $this->Application->recallObject($prefix_special, $event->Prefix.'_List', Array('per_page'=>-1) );
+
+		$orders_list->Query();
+
+		foreach ($orders_list->Records as $row_num => $record) {
+			if ( $record[$id_field] == $id ) {
+				break;
+			}
+		}
+
+		$per_page = $this->getPerPage( new kEvent($prefix_special.':OnDummy') );
+		$page = ceil( ($row_num+1) / $per_page );
+
+		$this->Application->StoreVar($prefix_special.'_Page', $page);
+		$event->redirect = 'in-commerce/orders/orders_'.$this->getSpecialByType($order_status).'_list';
+	}
+
+	/**
+	 * Reset's any selected order state to pending
+	 *
+	 * @param kEvent $event
+	 */
+	function OnResetToPending($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array('skip_autoload' => true) );
+
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+		if ( $items_info ) {
+			foreach ($items_info as $id => $field_values) {
+				$object->Load($id);
+				$object->SetDBField('Status', ORDER_STATUS_PENDING);
+
+				if ( $object->Update() ) {
+					$event->status = kEvent::erSUCCESS;
+				}
+				else {
+					$event->status = kEvent::erFAIL;
+					$event->redirect = false;
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Creates list from items selected in grid
+	 *
+	 * @param kEvent $event
+	 */
+	function OnLoadSelected($event)
+	{
+		$event->setPseudoClass('_List');
+
+		/** @var kDBList $object */
+		$object = $event->getObject(array('selected_only' => true, 'per_page' => -1));
+
+		$event->redirect = false;
+	}
+
+	/**
+	 * Return orders list, that will expire in time specified
+	 *
+	 * @param int $pre_expiration timestamp
+	 * @return Array
+	 */
+	function getRecurringOrders($pre_expiration)
+	{
+		$ord_table = $this->Application->getUnitOption('ord', 'TableName');
+		$ord_idfield = $this->Application->getUnitOption('ord', 'IDField');
+
+		$processing_allowed = Array(ORDER_STATUS_PROCESSED, ORDER_STATUS_ARCHIVED);
+		$sql = 'SELECT '.$ord_idfield.', PortalUserId, GroupId, NextCharge
+				FROM '.$ord_table.'
+				WHERE (IsRecurringBilling = 1) AND (NextCharge < '.$pre_expiration.') AND Status IN ('.implode(',', $processing_allowed).')';
+		return $this->Conn->Query($sql, $ord_idfield);
+	}
+
+	/**
+	 * [SCHEDULED TASK] Checks what orders should expire and renew automatically (if such flag set)
+	 *
+	 * @param kEvent $event
+	 */
+	function OnCheckRecurringOrders($event)
+	{
+		$skip_clause = Array();
+		$ord_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+		$ord_idfield = $this->Application->getUnitOption($event->Prefix, 'IDField');
+
+		$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('Comm_RecurringChargeInverval') * 3600 * 24;
+		$to_charge = $this->getRecurringOrders($pre_expiration);
+		if ($to_charge) {
+			$order_ids = Array();
+			foreach ($to_charge as $order_id => $record) {
+				// skip virtual users (e.g. root, guest, etc.) & invalid subscriptions (with no group specified, no next charge, but Recurring flag set)
+				if (!$record['PortalUserId'] || !$record['GroupId'] || !$record['NextCharge']) continue;
+
+				$order_ids[] = $order_id;
+				// prevent duplicate user+group pairs
+				$skip_clause[ 'PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'] ] = $order_id;
+			}
+
+			// process only valid orders
+			$temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
+			$cloned_order_ids = $temp_handler->CloneItems($event->Prefix, 'recurring', $order_ids);
+			$order =&  $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
+			foreach ($cloned_order_ids as $order_id) {
+				$order->Load($order_id);
+				$this->Application->HandleEvent($complete_event, $event->Prefix.'.recurring:OnCompleteOrder' );
+
+				if ($complete_event->status == kEvent::erSUCCESS) {
+					//send recurring ok email
+					$this->Application->emailUser('ORDER.RECURRING.PROCESSED', null, $this->OrderEmailParams($order));
+					$this->Application->emailAdmin('ORDER.RECURRING.PROCESSED');
+				}
+				else {
+					//send Recurring failed event
+					$order->SetDBField('Status', ORDER_STATUS_DENIED);
+					$order->Update();
+					$this->Application->emailUser('ORDER.RECURRING.DENIED', null, $this->OrderEmailParams($order));
+					$this->Application->emailAdmin('ORDER.RECURRING.DENIED');
+				}
+			}
+
+			// remove recurring flag from all orders found, not to select them next time script runs
+			$sql = 'UPDATE '.$ord_table.'
+					SET IsRecurringBilling = 0
+					WHERE '.$ord_idfield.' IN ('.implode(',', array_keys($to_charge)).')';
+			$this->Conn->Query($sql);
+		}
+
+		if ( !is_object($event->MasterEvent) ) {
+			// not called as hook
+			return ;
+		}
+
+		$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
+		$to_charge = $this->getRecurringOrders($pre_expiration);
+
+		foreach ($to_charge as $order_id => $record) {
+			// skip virtual users (e.g. root, guest, etc.) & invalid subscriptions (with no group specified, no next charge, but Recurring flag set)
+			if (!$record['PortalUserId'] || !$record['GroupId'] || !$record['NextCharge']) continue;
+
+			// prevent duplicate user+group pairs
+			$skip_clause[ 'PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'] ] = $order_id;
+		}
+		$skip_clause = array_flip($skip_clause);
+
+		$event->MasterEvent->setEventParam('skip_clause', $skip_clause);
+	}
+
+
+	function OnGeneratePDF($event)
+	{
+		$this->OnLoadSelected($event);
+
+		$this->Application->InitParser();
+		$o = $this->Application->ParseBlock(array('name'=>'in-commerce/orders/orders_pdf'));
+
+		/** @var FileHelper $file_helper */
+		$file_helper = $this->Application->recallObject('FileHelper');
+
+		$file_helper->CheckFolder(EXPORT_PATH);
+
+		$htmlFile = EXPORT_PATH . '/tmp.html';
+		$fh = fopen($htmlFile, 'w');
+		fwrite($fh, $o);
+		fclose($fh);
+//		return;
+
+
+//		require_once (FULL_PATH.'html2pdf/PDFEncryptor.php');
+
+		// Full path to the file to be converted
+//		$htmlFile = dirname(__FILE__) . '/test.html';
+
+		// The default domain for images that use a relative path
+		// (you'll need to change the paths in the test.html page
+		// to an image on your server)
+		$defaultDomain = DOMAIN;
+		// Full path to the PDF we are creating
+		$pdfFile = EXPORT_PATH . '/tmp.pdf';
+		// Remove old one, just to make sure we are making it afresh
+		@unlink($pdfFile);
+
+
+		$pdf_helper = $this->Application->recallObject('kPDFHelper');
+		$pdf_helper->FileToFile($htmlFile, $pdfFile);
+		return ;
+
+		// DOM PDF VERSION
+		/*require_once(FULL_PATH.'/dompdf/dompdf_config.inc.php');
+		$dompdf = new DOMPDF();
+		$dompdf->load_html_file($htmlFile);
+		if ( isset($base_path) ) {
+		  $dompdf->set_base_path($base_path);
+		}
+		$dompdf->set_paper($paper, $orientation);
+		$dompdf->render();
+		file_put_contents($pdfFile, $dompdf->output());
+		return ;*/
+
+		// Instnatiate the class with our variables
+		require_once (FULL_PATH.'/html2pdf/HTML_ToPDF.php');
+		$pdf = new HTML_ToPDF($htmlFile, $defaultDomain, $pdfFile);
+		$pdf->setHtml2Ps('/usr/bin/html2ps');
+		$pdf->setPs2Pdf('/usr/bin/ps2pdf');
+		$pdf->setGetUrl('/usr/local/bin/curl -i');
+		// Set headers/footers
+		$pdf->setHeader('color', 'black');
+		$pdf->setFooter('left', '');
+		$pdf->setFooter('right', '$D');
+
+		$pdf->setDefaultPath(BASE_PATH.'/kernel/admin_templates/');
+
+		$result = $pdf->convert();
+
+		// Check if the result was an error
+		if (PEAR::isError($result)) {
+		    $this->Application->ApplicationDie($result->getMessage());
+		}
+		else {
+			$download_url = rtrim($this->Application->BaseURL(), '/') . EXPORT_BASE_PATH . '/tmp.pdf';
+		    echo "PDF file created successfully: $result";
+		    echo '<br />Click <a href="' . $download_url . '">here</a> to view the PDF file.';
+		}
+	}
+
+	/**
+	 * Occurs, when config was parsed, allows to change config data dynamically
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		if (defined('IS_INSTALL') && IS_INSTALL) {
+			return ;
+		}
+
+		$order_number = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_P');
+		$order_sub_number = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_S');
+
+		$calc_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+		foreach ($calc_fields as $special => $fields) {
+			$calc_fields[$special]['OrderNumber'] = str_replace('6', $order_number, $calc_fields[$special]['OrderNumber']);
+			$calc_fields[$special]['OrderNumber'] = str_replace('3', $order_sub_number, $calc_fields[$special]['OrderNumber']);
+		}
+		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calc_fields);
+
+		$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+		$fields['Number']['format'] = str_replace('%06d', '%0'.$order_number.'d', $fields['Number']['format']);
+		$fields['SubNumber']['format'] = str_replace('%03d', '%0'.$order_sub_number.'d', $fields['SubNumber']['format']);
+
+		/** @var SiteHelper $site_helper */
+		$site_helper = $this->Application->recallObject('SiteHelper');
+
+		$fields['BillingCountry']['default'] = $site_helper->getDefaultCountry('Billing');
+		$fields['ShippingCountry']['default'] = $site_helper->getDefaultCountry('Shipping');
+
+		if (!$this->Application->isAdminUser) {
+			$user_groups = explode(',', $this->Application->RecallVar('UserGroups'));
+			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
+			if (!in_array($default_group, $user_groups)){
+				$user_groups[] = $default_group;
+			}
+
+			$sql_part = '';
+
+			// limit payment types by domain
+			$payment_types = $this->Application->siteDomainField('PaymentTypes');
+
+			if (strlen($payment_types)) {
+				$payment_types = explode('|', substr($payment_types, 1, -1));
+				$sql_part .= ' AND PaymentTypeId IN (' . implode(',', $payment_types) . ')';
+			}
+
+			// limit payment types by user group
+			$sql_part .= ' AND (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%")';
+
+			$fields['PaymentType']['options_sql'] = str_replace(
+				'ORDER BY ',
+				$sql_part . ' ORDER BY ',
+				$fields['PaymentType']['options_sql']
+			);
+		}
+
+		$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+
+		$user_forms = $this->Application->getUnitOption('u', 'Forms');
+
+		$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
+		$virtual_fields['UserPassword']['hashing_method'] = $user_forms['default']['Fields']['PasswordHashingMethod']['default'];
+		$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields);
+	}
+
+	/**
+	 * Allows configuring export options
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeExportBegin(kEvent $event)
+	{
+		parent::OnBeforeExportBegin($event);
+
+		/** @var kDBItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.export');
+
+		$object->SetField('Number', 999999);
+		$object->SetField('SubNumber', 999);
+	}
+
+	/**
+	 * Returns specific to each item type columns only
+	 *
+	 * @param kEvent $event
+	 * @return Array
+	 * @access protected
+	 */
+	public function getCustomExportColumns(kEvent $event)
+	{
+		$columns = parent::getCustomExportColumns($event);
+
+		$new_columns = Array (
+			'__VIRTUAL__CustomerName' => 'CustomerName',
+			'__VIRTUAL__TotalAmount' => 'TotalAmount',
+			'__VIRTUAL__AmountWithoutVAT' =>	'AmountWithoutVAT',
+			'__VIRTUAL__SubtotalWithDiscount' =>	'SubtotalWithDiscount',
+			'__VIRTUAL__SubtotalWithoutDiscount' =>	'SubtotalWithoutDiscount',
+			'__VIRTUAL__OrderNumber' => 'OrderNumber',
+		);
+
+		return array_merge($columns, $new_columns);
+	}
+
+	/**
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		parent::OnSave($event);
+
+		if ( $event->status != kEvent::erSUCCESS ) {
+			return ;
+		}
+
+		foreach ( $this->trackCopiedOrderIDs($event) as $id ) {
+			$this->Application->removeObject($event->getPrefixSpecial());
+
+			$an_event = new kEvent($this->Prefix . ':Dummy');
+			$this->Application->SetVar($this->Prefix . '_id', $id);
+			$this->Application->SetVar($this->Prefix . '_mode', ''); // this is to fool ReserveItems to use live table
+			$this->ReserveItems($an_event);
+		}
+	}
+
+	/**
+	 * Occurs after an item has been copied to live table
+	 * Id of copied item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterCopyToLive(kEvent $event)
+	{
+		parent::OnAfterCopyToLive($event);
+
+		$this->trackCopiedOrderIDs($event, $event->getEventParam('id'));
+	}
+
+	/**
+	 * Tracks copied order IDs.
+	 *
+	 * @param kEvent  $event Event.
+	 * @param integer $id    Order ID.
+	 *
+	 * @return array
+	 */
+	protected function trackCopiedOrderIDs(kEvent $event, $id = null)
+	{
+		$setting_name = $event->Prefix . '_copied_ids' . $this->Application->GetVar('wid');
+		$ids = $this->Application->GetVar($setting_name, array());
+
+		if ( isset($id) ) {
+			array_push($ids, $id);
+			$this->Application->SetVar($setting_name, $ids);
+		}
+
+		return $ids;
+	}
+
+	/**
+	 * Checks, that currently loaded item is allowed for viewing (non permission-based)
+	 *
+	 * @param kEvent $event
+	 * @return bool
+	 * @access protected
+	 */
+	protected function checkItemStatus(kEvent $event)
+	{
+		if ( $this->Application->isAdminUser ) {
+			return true;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		if ( !$object->isLoaded() ) {
+			return true;
+		}
+
+		return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
+	}
+
+	// ===== Gift Certificates Related =====
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnApplyGiftCertificate($event)
+	{
+		$code = $this->Application->GetVar('giftcert_code');
+
+		if ( $code == '' ) {
+			return;
+		}
+
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		/** @var kDBItem $gift_certificate */
+		$gift_certificate = $this->Application->recallObject('gc', null, Array ('skip_autoload' => true));
+
+		$gift_certificate->Load($code, 'Code');
+
+		if ( !$gift_certificate->isLoaded() ) {
+			$event->status = kEvent::erFAIL;
+			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_CODE_INVALID);
+			$event->redirect = false; // check!!!
+
+			return;
+		}
+
+		$debit = $gift_certificate->GetDBField('Debit');
+		$expire_date = $gift_certificate->GetDBField('Expiration');
+
+		if ( $gift_certificate->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) || ($debit <= 0) ) {
+			$event->status = kEvent::erFAIL;
+			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_CODE_EXPIRED);
+			$event->redirect = false;
+
+			return;
+		}
+
+		$object->SetDBField('GiftCertificateId', $gift_certificate->GetDBField('GiftCertificateId'));
+		$object->Update();
+
+		$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_APPLIED);
+	}
+
+	/**
+	 * Removes gift certificate from order
+	 *
+	 * @param kEvent $event
+	 * @deprecated
+	 */
+	function OnRemoveGiftCertificate($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		$this->RemoveGiftCertificate($object);
+		$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED);
+
+		$event->CallSubEvent('OnRecalculateItems');
+	}
+
+	function RemoveGiftCertificate(&$object)
+	{
+		$object->RemoveGiftCertificate();
+	}
+
+	function RecalculateGift($event)
+	{
+		/** @var OrdersItem $object */
+		$object = $event->getObject();
+
+		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) {
+			return ;
+		}
+		$object->RecalculateGift($event);
+	}
+
+	function GetWholeOrderGiftCertificateDiscount($gift_certificate_id)
+	{
+		if (!$gift_certificate_id) {
+			return 0;
+		}
+
+		$sql = 'SELECT Debit
+				FROM '.TABLE_PREFIX.'GiftCertificates
+				WHERE GiftCertificateId = '.$gift_certificate_id;
+		return $this->Conn->GetOne($sql);
+	}
+
+	/**
+	 * Downloads shipping tracking bar code, that was already generated by USPS service
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDownloadLabel($event)
+	{
+		$event->status = kEvent::erSTOP;
+		ini_set('memory_limit', '300M');
+		ini_set('max_execution_time', '0');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$file = $object->GetDBField('ShippingTracking') . '.pdf';
+		$full_path = USPS_LABEL_FOLDER . $file;
+
+		if ( !file_exists($full_path) || !is_file($full_path) ) {
+			return;
+		}
+
+		$this->Application->setContentType(kUtil::mimeContentType($full_path), false);
+		header('Content-Disposition: attachment; filename="' . $file . '"');
+		readfile($full_path);
+	}
+
+	/**
+	 * Occurs before validation attempt
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemValidate(kEvent $event)
+	{
+		parent::OnBeforeItemValidate($event);
+
+		$create_account = $this->Application->GetVar('create_account');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$required_fields = Array ('UserPassword', 'UserPassword_plain', 'VerifyUserPassword', 'VerifyUserPassword_plain');
+		$object->setRequired($required_fields, $create_account);
+
+		$billing_email = $object->GetDBField('BillingEmail');
+
+		if ( $create_account && $object->GetDBField('PortalUserId') == USER_GUEST && $billing_email ) {
+			// check that e-mail available
+			$sql = 'SELECT PortalUserId
+					FROM ' . TABLE_PREFIX . 'Users
+					WHERE Email = ' . $this->Conn->qstr($billing_email);
+			$user_id = $this->Conn->GetOne($sql);
+
+			if ( $user_id ) {
+				$object->SetError('BillingEmail', 'unique');
+			}
+		}
+	}
+
+	/**
+	 * Performs order update and returns results in format, needed by FormManager
+	 *
+	 * @param kEvent $event Event.
+	 *
+	 * @return void
+	 */
+	protected function OnUpdateAjax(kEvent $event)
+	{
+		/** @var AjaxFormHelper $ajax_form_helper */
+		$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
+		$ajax_form_helper->transitEvent($event, 'OnUpdate');
+	}
+
+	/**
+	 * Performs order update after billing step submission and returns results in format, needed by FormManager
+	 *
+	 * @param kEvent $event Event.
+	 *
+	 * @return void
+	 */
+	protected function OnProceedToPreviewAjax(kEvent $event)
+	{
+		/** @var AjaxFormHelper $ajax_form_helper */
+		$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
+		$ajax_form_helper->transitEvent($event, 'OnProceedToPreview');
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/orders/orders_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.150.2.20
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/orders_item.php
===================================================================
--- releases/5.2.2-B2/units/orders/orders_item.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/orders_item.php	(revision 16630)
@@ -0,0 +1,387 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class OrdersItem extends kDBItem
+	{
+
+		/**
+		 * Sets item' fields corresponding to elements in passed $hash values.
+		 * The function sets current item fields to values passed in $hash, by matching $hash keys with field names
+		 * of current item. If current item' fields are unknown {@link kDBItem::PrepareFields()} is called before actually setting the fields
+		 *
+		 * @param Array $hash       Fields hash.
+		 * @param Array $set_fields Optional param, field names in target object to set, other fields will be skipped
+		 *
+		 * @return void
+		 */
+		public function SetFieldsFromHash($hash, $set_fields = Array ())
+		{
+			parent::SetFieldsFromHash($hash, $set_fields);
+
+			$options = $this->GetFieldOptions('PaymentCCExpDate');
+
+			if ( $this->GetDirtyField($options['month_field']) || $this->GetDirtyField($options['year_field']) ) {
+				$this->SetDirtyField('PaymentCCExpDate', 0);
+				$this->SetField('PaymentCCExpDate', 0);
+			}
+		}
+
+		/**
+		 * Returns gateway data based on payment type used in order
+		 *
+		 * @param int $pt_id
+		 * @return Array
+		 * @access public
+		 */
+		public function getGatewayData($pt_id = null)
+		{
+			// get Gateway fields
+			if ( !isset($pt_id) || !$pt_id ) {
+				$pt_id = $this->GetDBField('PaymentType');
+
+				if ( !$pt_id ) {
+					// no Payment Type Id found for this order - escape SQL fatal below
+					return false;
+				}
+			}
+
+			$pt_table = $this->Application->getUnitOption('pt', 'TableName');
+
+			$sql = 'SELECT GatewayId
+					FROM %s
+					WHERE PaymentTypeId = %s';
+			$gw_id = $this->Conn->GetOne(sprintf($sql, $pt_table, $pt_id));
+
+			$sql = 'SELECT *
+					FROM %s
+					WHERE GatewayId = %s';
+			$ret = $this->Conn->GetRow(sprintf($sql, TABLE_PREFIX . 'Gateways', $gw_id));
+
+			// get Gateway parameters based on payment type
+			$gwf_table = $this->Application->getUnitOption('gwf', 'TableName');
+			$gwfv_table = $this->Application->getUnitOption('gwfv', 'TableName');
+
+			$sql = 'SELECT gwfv.Value, gwf.SystemFieldName
+					FROM %s gwf
+					LEFT JOIN %s gwfv ON gwf.GWConfigFieldId = gwfv.GWConfigFieldId
+					WHERE gwfv.PaymentTypeId = %s AND gwf.GatewayId = %s';
+			$ret['gw_params'] = $this->Conn->GetCol(sprintf($sql, $gwf_table, $gwfv_table, $pt_id, $gw_id), 'SystemFieldName');
+
+			$ret['gw_params']['gateway_id'] = $gw_id;
+
+			if ( $this->GetDBField('IsRecurringBilling') && $this->Application->ConfigValue('Comm_AutoProcessRecurringOrders') ) {
+				if ( isset($ret['gw_params']['shipping_control']) ) {
+					$ret['gw_params']['shipping_control'] = SHIPPING_CONTROL_DIRECT;
+				}
+			}
+
+			return $ret;
+		}
+
+		/**
+		 * Checks if tangible items are present in order
+		 *
+		 * @return boolean
+		 */
+		public function HasTangibleItems()
+		{
+			$oi_table = TABLE_PREFIX . 'OrderItems';
+
+			if ( $this->IsTempTable() ) {
+				$oi_table = $this->Application->GetTempName($oi_table, 'prefix:' . $this->Prefix);
+			}
+
+			$sql = 'SELECT COUNT(*)
+					FROM ' . $oi_table . ' orditems
+					LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ProductId = orditems.ProductId
+					WHERE (orditems.OrderId = ' . $this->GetID() . ') AND (p.Type = ' . PRODUCT_TYPE_TANGIBLE . ')';
+
+			return $this->Conn->GetOne($sql) > 0;
+		}
+
+		/**
+		 * Calculates tax value of order items based on billing & shipping country specified
+		 *
+		 * @return double
+		 */
+		function getTaxPercent()
+		{
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$shipping_country_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingCountry'), DESTINATION_TYPE_COUNTRY);
+			$shipping_state_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingState'), DESTINATION_TYPE_STATE);
+			$shipping_zip = (string) $this->GetDBField('ShippingZip');
+
+			$billing_country_id = $cs_helper->getCountryStateId($this->GetDBField('BillingCountry'), DESTINATION_TYPE_COUNTRY);
+			$billing_state_id =  $cs_helper->getCountryStateId($this->GetDBField('BillingState'), DESTINATION_TYPE_STATE);
+			$billing_zip = (string) $this->GetDBField('BillingZip');
+
+			/*
+			$dest_ids = array_diff( array_unique( Array( $shipping_country_id, $shipping_state_id, $billing_country_id, $billing_state_id ) ), Array(0) );
+			$dest_values = array_diff( array_unique( Array( $this->Conn->qstr($shipping_zip), $this->Conn->qstr($billing_zip) ) ), Array('\'\'') );
+			*/
+
+			$tax = false;
+			$sql = 'SELECT tx.*
+				FROM '.$this->Application->getUnitOption('tax', 'TableName').' tx
+				LEFT JOIN '.$this->Application->getUnitOption('taxdst', 'TableName').' txd ON tx.TaxZoneId = txd.TaxZoneId
+				WHERE
+					(	txd.StdDestId IN ('.$shipping_country_id.','.$shipping_state_id.')
+						AND
+						( (txd.DestValue = "" OR txd.DestValue IS NULL)
+							OR
+							txd.DestValue = '.$this->Conn->qstr($shipping_zip).'
+						)
+					)
+					OR
+					(	txd.StdDestId IN ('.$billing_country_id.','.$billing_state_id.')
+						AND
+						( (txd.DestValue = "" OR txd.DestValue IS NULL)
+							OR
+							txd.DestValue = '.$this->Conn->qstr($billing_zip).'
+						)
+					)
+
+				ORDER BY tx.TaxValue DESC';
+
+			$tax = $this->Conn->GetRow($sql);
+			if ($tax == false) {
+				$tax['TaxValue'] = 0;
+				$tax['ApplyToShipping'] = 0;
+				$tax['ApplyToProcessing'] = 0;
+			}
+
+			return $tax;
+		}
+
+		function RecalculateTax()
+		{
+			$tax = $this->getTaxPercent();
+			$this->SetDBField('VATPercent', $tax['TaxValue']);
+			$this->SetDBField('ShippingTaxable', $tax['ApplyToShipping']);
+			$this->SetDBField('ProcessingTaxable', $tax['ApplyToProcessing']);
+			$this->UpdateTotals();
+
+			if ( !$this->GetDBField('VATIncluded') ) {
+				$subtotal = $this->GetDBField('AmountWithoutVAT');
+
+				$tax_exempt = $this->getTaxExempt();
+
+				if ( $tax_exempt ) {
+					$subtotal -= $tax_exempt;
+				}
+
+				$this->SetDBField('VAT', round($subtotal * $tax['TaxValue'] / 100, 2));
+				$this->UpdateTotals();
+			}
+		}
+
+		/**
+		 * Returns order amount, that is excluded from tax calculations
+		 *
+		 * @return float
+		 * @access protected
+		 */
+		protected function getTaxExempt()
+		{
+			$sql = 'SELECT SUM(oi.Quantity * oi.Price)
+					FROM ' . TABLE_PREFIX . 'OrderItems AS oi
+					LEFT JOIN ' . TABLE_PREFIX . 'Products AS p ON p.ProductId = oi.ProductId
+					WHERE p.Type = 6 AND oi.OrderId = ' . $this->GetDBField('OrderId');
+
+			return $this->Conn->GetOne($sql);
+		}
+
+		function UpdateTotals()
+		{
+			$total = 0;
+			$total += $this->GetDBField('SubTotal');
+
+			if ( $this->GetDBField('ShippingTaxable') ) {
+				$total += $this->GetDBField('ShippingCost');
+			}
+
+			if ( $this->GetDBField('ProcessingTaxable') ) {
+				$total += $this->GetDBField('ProcessingFee');
+			}
+
+			if ( $this->GetDBField('VATIncluded') ) {
+				$tax_exempt = $this->getTaxExempt();
+
+				$vat_percent = $this->GetDBField('VATPercent');
+				$this->SetDBField('VAT', round(($total - $tax_exempt) * $vat_percent / (100 + $vat_percent), 2));
+				$this->SetDBField('AmountWithoutVAT', $total - $this->GetDBField('VAT'));
+			}
+			else {
+				$this->SetDBField('AmountWithoutVAT', $total);
+				$total += $this->GetDBField('VAT');
+			}
+
+			if ( !$this->GetDBField('ShippingTaxable') ) {
+				$total += $this->GetDBField('ShippingCost');
+			}
+
+			if ( !$this->GetDBField('ProcessingTaxable') ) {
+				$total += $this->GetDBField('ProcessingFee');
+			}
+
+			$total += $this->GetDBField('InsuranceFee');
+
+			$this->SetDBField('TotalAmount', $total);
+		}
+
+		function getTotalAmount()
+		{
+			return 	$this->GetDBField('SubTotal') +
+					$this->GetDBField('ShippingCost') +
+					($this->GetDBField('VATIncluded') ? 0 : $this->GetDBField('VAT')) +
+					$this->GetDBField('ProcessingFee') +
+					$this->GetDBField('InsuranceFee') -
+					$this->GetDBField('GiftCertificateDiscount');
+		}
+
+		function requireCreditCard()
+		{
+			$sql = 'SELECT RequireCCFields
+					FROM ' . $this->Application->getUnitOption('pt', 'TableName') . ' pt
+					LEFT JOIN '.TABLE_PREFIX.'Gateways gw ON gw.GatewayId = pt.GatewayId
+					WHERE pt.PaymentTypeId = ' . $this->GetDBField('PaymentType');
+
+			return $this->Conn->GetOne($sql);
+		}
+
+		function getNextSubNumber()
+		{
+			$table = $this->Application->GetLiveName($this->TableName);
+			$sql = 'SELECT MAX(SubNumber) FROM '.$table.' WHERE Number = '.$this->GetDBField('Number');
+			return $this->Conn->GetOne($sql) + 1;
+		}
+
+		function ResetAddress($prefix)
+		{
+			$fields = Array('To','Company','Phone','Fax','Email','Address1','Address2','City','State','Zip','Country');
+			foreach($fields as $field)
+			{
+				$this->SetDBField($prefix.$field, $this->Fields[$prefix.$field]['default']);
+			}
+		}
+
+		function IsProfileAddress($address_type)
+		{
+			return $this->Application->GetVar($this->Prefix.'_IsProfileAddress');
+		}
+
+		// ===== Gift Certificates Related =====
+		function RecalculateGift($event)
+		{
+			$gc_id = $this->GetDBField('GiftCertificateId');
+			if ($gc_id < 1) {
+				return;
+			}
+
+			/** @var kDBItem $gc */
+			$gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
+
+			$gc->Load($gc_id);
+
+			if ($gc->GetDBField('Status') == gcDISABLED) {
+				// disabled GC
+				$this->SetDBField('GiftCertificateId', 0);
+				$this->SetDBField('GiftCertificateDiscount', 0);
+				// disabled
+				return;
+			}
+
+			$debit = $gc->GetDBField('Debit') + $this->GetDBField('GiftCertificateDiscount');
+
+			$this->UpdateTotals();
+
+			$total = $this->GetDBField('TotalAmount');
+			$gift_certificate_discount = $debit >= $total ? $total : $debit;
+
+			$this->SetDBField('TotalAmount', $total - $gift_certificate_discount);
+			$this->GetDBField('GiftCertificateDiscount', $gift_certificate_discount);
+
+			$debit -= $gift_certificate_discount;
+			$gc->SetDBField('Debit', $debit);
+
+			$gc->SetDBField('Status', $debit > 0 ? gcENABLED : gcUSED);
+			$gc->Update();
+
+			if ($gift_certificate_discount == 0) {
+				$this->RemoveGiftCertificate($object);
+				$this->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED_AUTOMATICALLY);
+			}
+
+			$this->SetDBField('GiftCertificateDiscount', $gift_certificate_discount);
+		}
+
+		function RemoveGiftCertificate()
+		{
+			$gc_id = $this->GetDBField('GiftCertificateId');
+
+			/** @var kDBItem $gc */
+			$gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
+
+			$gc->Load($gc_id);
+
+			$debit = $gc->GetDBField('Debit') + $this->GetDBField('GiftCertificateDiscount');
+
+			if ($gc->isLoaded() && ($debit > 0)) {
+				$gc->SetDBField('Debit', $debit);
+				$gc->SetDBField('Status', gcENABLED);
+				$gc->Update();
+			}
+
+			$this->SetDBField('GiftCertificateId', 0);
+			$this->SetDBField('GiftCertificateDiscount', 0);
+		}
+
+		/**
+		 * Sets checkout error
+		 *
+		 * @param int $error_type = {product,coupon,gc}
+		 * @param int $error_code
+		 * @param int $product_id - {ProductId}:{OptionsSalt}:{BackOrderFlag}:{FieldName}
+		 */
+		function setCheckoutError($error_type, $error_code, $product_id = null)
+		{
+			$errors = $this->Application->RecallVar('checkout_errors');
+			$errors = $errors ? unserialize($errors) : Array ();
+
+			if ( isset($product_id) ) {
+				$error_type .= ':' . $product_id;
+
+				// any error takes priority over FIELD_UPDATE_SUCCESS error
+				if ( isset($errors[$error_type]) && $error_code == OrderCheckoutError::FIELD_UPDATE_SUCCESS ) {
+					return ;
+				}
+			}
+
+			if ( is_numeric($error_code) ) {
+				$errors[$error_type] = $error_code;
+			}
+			else {
+				unset($errors[$error_type]);
+			}
+
+			if ( $this->Application->isDebugMode() ) {
+				$this->Application->Debugger->appendHTML('CO_ERROR: ' . $error_type . ' - ' . $error_code);
+			}
+
+			$this->Application->StoreVar('checkout_errors', serialize($errors));
+		}
+	}

Property changes on: releases/5.2.2-B2/units/orders/orders_item.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.27.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/order_validator.php
===================================================================
--- releases/5.2.2-B2/units/orders/order_validator.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/order_validator.php	(revision 16630)
@@ -0,0 +1,246 @@
+<?php
+/**
+* @version   $Id$
+* @package   In-Commerce
+* @copyright   Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
+* @license   Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class OrderValidator extends kValidator {
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->ErrorMsgs['credit_card_validation_error'] = '!lu_cc_validation_error!';
+		$this->ErrorMsgs['credit_card_expired'] = '!lu_cc_expired!';
+	}
+
+	/**
+	 * Return error message for field
+	 *
+	 * @param string $field
+	 * @return string
+	 * @access public
+	 */
+	public function GetErrorMsg($field, $force_escape = null)
+	{
+		if ( $field != 'OrderNumber' ) {
+			return parent::GetErrorMsg($field, $force_escape);
+		}
+
+		$number['error'] = parent::GetErrorMsg('Number', $force_escape);
+		$number['pseudo'] = $this->GetErrorPseudo('Number');
+
+		$subnumber['error'] = parent::GetErrorMsg('SubNumber', $force_escape);
+		$subnumber['pseudo'] = $this->GetErrorPseudo('SubNumber');
+
+		// if pseudo match & not empty -> return 1st
+		// if one of pseudos not empty -> return it
+		// if we got one pseudo "bad_type" and other pseudo "required", then return "bad_type" error message
+
+
+		if ( $number['pseudo'] && ($number['pseudo'] == $subnumber['pseudo']) ) {
+			return $number['error'];
+		}
+
+		if ( $number['pseudo'] && !$subnumber['pseudo'] ) {
+			return $number['error'];
+		}
+
+		if ( !$number['pseudo'] && $subnumber['pseudo'] ) {
+			return $subnumber['error'];
+		}
+
+		if ( $number['pseudo'] == 'bad_type' ) {
+			return $number['error'];
+		}
+
+		if ( $subnumber['pseudo'] == 'bad_type' ) {
+			return $subnumber['error'];
+		}
+
+		return '';
+
+		/*$msg = '[' . $number_error . '(' . $number_pseudo . ')] [' . $subnumber_error . '] (' . $subnumber_pseudo . ')';
+
+		return $msg;*/
+	}
+
+	/**
+	 * Check field value by user-defined alghoritm
+	 *
+	 * @param string $field field name
+	 * @param Array $params field options from config
+	 * @return bool
+	 */
+	function CustomValidation($field, $params)
+	{
+		// TODO: move to OrdersEventHandler OR extend kValidator class
+		$res = true;
+
+		$res = $res && $this->ValidateCCNumber($field, $params);
+		$res = $res && $this->ValidateCCExpiration($field, $params);
+		return $res;
+	}
+
+	/**
+	 * Check if field value is valid credit card number against credit card type specified
+	 *
+	 * @param string $field field name
+	 * @param Array $params field options from config
+	 * @return bool
+	 * @access private
+	 */
+	function ValidateCCNumber($field, $params)
+	{
+		$value = $this->dataSource->GetDBField($field);
+		$cardtype_field = getArrayValue($params, 'cardtype_field');
+
+		if ( !$cardtype_field || !$value || !$this->dataSource->requireCreditCard() ) {
+			return true;
+		}
+
+		if ( $this->Application->ConfigValue('Comm_MaskProcessedCreditCards') ) {
+			$mask_found = strpos($value, str_repeat('X', 4)) !== false;
+
+			if ( $this->Application->isAdminUser && $mask_found ) {
+				// masked card numbers always appear valid in admin
+				return true;
+			}
+		}
+
+		if (defined('DEBUG_MODE') && kUtil::constOn('DBG_PAYMENT_GW')) {
+			$gw_data = $this->dataSource->getGatewayData();
+
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+			$test_numbers = $gateway_object->GetTestCCNumbers();
+
+			if ( in_array($value, $test_numbers) ) {
+				return true;
+			}
+		}
+
+		$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
+		// '1' => 'Visa','2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', 5 => 'Diners Club', 6 => 'JBC'
+
+		// Innocent until proven guilty
+		$cc_valid = true;
+
+		// Get rid of any non-digits
+		$value = preg_replace('/[^\d]/', '', $value);
+
+		// Perform card-specific checks, if applicable
+		switch( $this->dataSource->GetDBField($cardtype_field) )
+		{
+			case 2: // MasterCard
+				$cc_valid = preg_match('/^5[1-5].{14}$/', $value);
+				break;
+
+			case 1: // Visa
+				$cc_valid = preg_match('/^4.{15}$|^4.{12}$/', $value);
+				break;
+
+			case 3: // American Express
+				$cc_valid = preg_match('/^3[47].{13}$/', $value);
+				break;
+
+			case 4: // Discover
+				$cc_valid = preg_match('/^6011.{12}$/', $value);
+				break;
+
+			case 5: // Diners Club
+				$cc_valid = preg_match('/^30[0-5].{11}$|^3[68].{12}$/', $value);
+				break;
+
+			case 6: // JBC
+				$cc_valid = preg_match('/^3.{15}$|^2131|1800.{11}$/', $value);
+				break;
+
+			default:
+				$this->SetError($error_field, 'credit_card_validation_error');
+				return false;
+				break;
+		}
+
+		//  The Luhn formula works right to left, so reverse the number.
+		$value = strrev($value);
+
+		$total = 0;
+
+		for($x = 0; $x < strlen($value); $x++)
+		{
+			$digit = substr($value, $x, 1);
+
+			// If it's an odd digit, double it
+			if( $x / 2 != floor($x/2) )
+			{
+				$digit *= 2;
+
+				// If the result is two digits, add them
+				if( strlen($digit) == 2 )
+				{
+					$digit = substr($digit, 0, 1) + substr($digit, 1, 1);
+				}
+			}
+
+			// Add the current digit, doubled and added if applicable, to the Total
+			$total += $digit;
+		}
+
+		//  If it passed (or bypassed) the card-specific check and the Total is
+		//  evenly divisible by 10, it's cool!
+		if ($cc_valid && $total % 10 == 0) {
+			return true;
+		}
+
+		$this->SetError($error_field, 'credit_card_validation_error');
+
+		return false;
+	}
+
+	/**
+	 * Check if field value is non-expired credit card expiration date
+	 *
+	 * @param string $field field name
+	 * @param Array $params field options from config
+	 * @return bool
+	 * @access private
+	 */
+	function ValidateCCExpiration($field, $params)
+	{
+		$formatter = getArrayValue($params, 'formatter');
+
+		if ( ($formatter != 'kCCDateFormatter') || !$this->dataSource->requireCreditCard() ) {
+			return true;
+		}
+
+		if ( !$this->Application->isAdminUser ) {
+			// validate expiration date only for front
+			if ( preg_match('/([\d]{2})\/([\d]{2})/', $this->dataSource->GetDBField($field), $rets) ) {
+				$month = $rets[1];
+				$year = $rets[2];
+				$now_date = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), adodb_date('Y') );
+				$day_count = adodb_date('t', adodb_mktime(0, 0, 0, $month, 1, $year) );
+				$cc_date = adodb_mktime(23, 59, 59, $month, $day_count, $year);
+
+				if ($cc_date < $now_date) {
+					$error_field = isset($params['error_field']) ? $params['error_field'] : $field;
+					$this->SetError($error_field, 'credit_card_expired');
+
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}

Property changes on: releases/5.2.2-B2/units/orders/order_validator.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/orders_config.php
===================================================================
--- releases/5.2.2-B2/units/orders/orders_config.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/orders_config.php	(revision 16630)
@@ -0,0 +1,599 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'ord',
+	'ItemClass' => Array ('class' => 'OrdersItem', 'file' => 'orders_item.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'OrdersEventHandler', 'file' => 'orders_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'OrdersTagProcessor', 'file' => 'orders_tag_processor.php', 'build_event' => 'OnBuild'),
+	'ValidatorClass' => 'OrderValidator',
+
+	'AutoLoad' => true,
+
+	'RegisterClasses' => Array (
+		Array ('pseudo' => 'OrderCalculator', 'class' => 'OrderCalculator', 'file' => 'order_calculator.php', 'build_event' => ''),
+		Array ('pseudo' => 'OrderManager', 'class' => 'OrderManager', 'file' => 'order_manager.php', 'build_event' => ''),
+		Array ('pseudo' => 'OrderValidator', 'class' => 'OrderValidator', 'file' => 'order_validator.php', 'build_event' => ''),
+	),
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'ord',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnPreSave' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnRecalculateItems',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnUpdateCart', 'OnUpdateCartJSON', 'OnCheckout' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnApplyCoupon',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnUpdateCart', 'OnUpdateCartJSON', 'OnCheckout' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnApplyGiftCertificate',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ( 'OnCreate' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnUserCreate',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnCheckExpiredMembership'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnCheckRecurringOrders',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnAfterLogin' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnUserLogin',
+		),
+
+		Array (
+			'Mode' => hBEFORE, // before because OnInpLogin is called after real in-portal login and uses data from hooks
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnInpLogin' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnUserLogin',
+		),
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'adm',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnStartup'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnRestoreOrder',
+		),
+		array(
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'conf',
+			'HookToSpecial' => '',
+			'HookToEvent' => array('OnBeforeItemValidate'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnBeforeNextOrderNumberChange',
+		),
+	),
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => 'orditems',
+			'AggregatedTagName' => 'LinkRemoveFromCart',
+			'LocalTagName' => 'Orditems_LinkRemoveFromCart',
+		),
+		Array (
+			'AggregateTo' => 'orditems',
+			'AggregatedTagName' => 'ProductLink',
+			'LocalTagName' => 'Orderitems_ProductLink',
+		),
+		Array (
+			'AggregateTo' => 'orditems',
+			'AggregatedTagName' => 'ProductExists',
+			'LocalTagName' => 'Orderitems_ProductExists',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'OrderId',
+	'StatusField' => Array ('Status'),	// field, that is affected by Approve/Decline events
+
+	'ViewMenuPhrase' => 'la_title_Orders',
+	'CatalogTabIcon' => 'icon16_item.png',
+
+	'TitleField' => 'OrderNumber',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('ord' => '!la_title_Adding_Order!'),
+			'edit_status_labels' => Array ('ord' => '!la_title_Editing_Order!'),
+			'new_titlefield' => Array ('ord' => '!la_title_New_Order!'),
+		),
+
+		'orders_incomplete' => Array (
+			'prefixes' => Array ('ord.incomplete_List'), 'format' => "!la_title_IncompleteOrders!",
+		),
+
+		'orders_pending' => Array (
+			'prefixes' => Array ('ord.pending_List'), 'format' => "!la_title_PendingOrders!",
+		),
+
+		'orders_backorders' => Array (
+			'prefixes' => Array ('ord.backorders_List'), 'format' => "!la_title_BackOrders!",
+		),
+
+		'orders_toship' => Array (
+			'prefixes' => Array ('ord.toship_List'), 'format' => "!la_title_OrdersToShip!",
+		),
+
+		'orders_processed' => Array (
+			'prefixes' => Array ('ord.processed_List'), 'format' => "!la_title_OrdersProcessed!",
+		),
+
+		'orders_returns' => Array (
+			'prefixes' => Array ('ord.returns_List'), 'format' => "!la_title_OrdersReturns!",
+		),
+
+		'orders_denied' => Array (
+			'prefixes' => Array ('ord.denied_List'), 'format' => "!la_title_OrdersDenied!",
+		),
+
+		'orders_archived' => Array (
+			'prefixes' => Array ('ord.archived_List'), 'format' => "!la_title_OrdersArchived!",
+		),
+
+		'orders_search' => Array (
+			'prefixes' => Array ('ord.search_List'), 'format' => "!la_title_OrdersSearch!",
+		),
+
+		'orders_edit_general' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_General!"),
+		'orders_edit_billing' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderBilling!"),
+		'orders_edit_shipping' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderShipping!"),
+		'orders_edit_items' => Array ('prefixes' => Array ('ord', 'orditems_List'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderItems!"),
+		'orders_edit_preview' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderPreview!"),
+
+		'orders_gw_result' => Array ('prefixes' => Array ('ord'), 'format' => "!la_title_OrderGWResult!"),
+
+		'orders_export' => Array ('format' => '!la_title_OrdersExport!'),
+
+		'orders_product_edit' => Array ('format' => '!la_title_Editing_Order_Item!'),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/orders/orders_edit', 'priority' => 1),
+			'items' => Array ('title' => 'la_tab_Items', 't' => 'in-commerce/orders/orders_edit_items', 'priority' => 2),
+			'shipping' => Array ('title' => 'la_tab_Shipping', 't' => 'in-commerce/orders/orders_edit_shipping', 'priority' => 3),
+			'billing' => Array ('title' => 'la_tab_Billing', 't' => 'in-commerce/orders/orders_edit_billing', 'priority' => 4),
+			'preview' => Array ('title' => 'la_tab_Preview', 't' => 'in-commerce/orders/orders_edit_preview', 'priority' => 5),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:orders'),
+
+	'Sections' => Array (
+		'in-commerce:orders' => Array (
+			'parent' => 'in-commerce',
+			'icon' => 'in-commerce:orders',
+			'label' => 'la_tab_Orders',
+			'url' => Array ('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:deny', 'advanced:archive', 'advanced:place', 'advanced:process', 'advanced:ship', 'advanced:reset_to_pending'),
+			'priority' => 1,
+			'type' => stTREE,
+		),
+	),
+
+	'SectionAdjustments' => Array (
+		'in-portal:visits' => Array (
+			'url' => Array ('t' => 'in-commerce/visits/visits_list_incommerce', 'pass' => 'm'),
+		),
+	),
+
+	'StatisticsInfo' => Array (
+		'pending' => Array (
+			'icon' => 'core:icon16_item.png',
+			'label' => 'la_title_Orders',
+			'js_url' => "#url#",
+			'url' => Array ('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'),
+			'status' => ORDER_STATUS_PENDING,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX . 'Orders',
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'CustomerName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', "root", IF (%1$s.PortalUserId = ' . USER_GUEST . ', "Guest", "n/a")), CONCAT(u.FirstName," ",u.LastName) )',
+			'Username' => 'IF( ISNULL(u.Username),"root",IF(u.Username = "", u.Email, u.Username))',
+			'OrderNumber' => 'CONCAT(LPAD(%1$s.Number,6,"0"),\'-\',LPAD(%1$s.SubNumber,3,"0") )',
+			'SubtotalWithoutDiscount' => '(%1$s.SubTotal + %1$s.DiscountTotal)',
+			'SubtotalWithDiscount' => '(%1$s.SubTotal)',
+			'AmountWithoutVAT' => '(%1$s.SubTotal+IF(%1$s.ShippingTaxable=1, %1$s.ShippingCost, 0)+IF(%1$s.ProcessingTaxable=1, %1$s.ProcessingFee, 0)-IF(%1$s.VATIncluded=1,%1$s.VAT,0))',
+			'TotalAmount' => '%1$s.SubTotal+%1$s.ShippingCost+IF(%1$s.VATIncluded=1,0,%1$s.VAT)+%1$s.ProcessingFee+%1$s.InsuranceFee-%1$s.GiftCertificateDiscount',
+			'CouponCode' => 'pc.Code',
+			'CouponName' => 'pc.Name',
+			'AffiliateUser' => 'IF(au.PortalUserId IS NULL, "!la_None!", IF(au.Username = "", au.Email, au.Username))',
+			'AffiliatePortalUserId' => 'af.PortalUserId',
+			'GiftCertificateCode' => 'gc.Code',
+			'GiftCertificateRecipient' => 'gc.Recipient',
+			'ShippingSubTotal' => '%1$s.ShippingCost + %1$s.InsuranceFee',
+		),
+
+		'myorders' => Array (
+			'OrderNumber' => 'CONCAT(LPAD(%1$s.Number,6,"0"),\'-\',LPAD(%1$s.SubNumber,3,"0") )',
+			'SubtotalWithoutDiscount' => '(%1$s.SubTotal + %1$s.DiscountTotal)',
+			'SubtotalWithDiscount' => '(%1$s.SubTotal)',
+			'AmountWithoutVAT' => '(%1$s.SubTotal+IF(%1$s.ShippingTaxable=1, %1$s.ShippingCost, 0)+IF(%1$s.ProcessingTaxable=1, %1$s.ProcessingFee, 0)-IF(%1$s.VATIncluded=1,%1$s.VAT,0))',
+			'TotalAmount' => '%1$s.SubTotal+%1$s.ShippingCost+IF(%1$s.VATIncluded=1,0,%1$s.VAT)+%1$s.ProcessingFee+%1$s.InsuranceFee-%1$s.GiftCertificateDiscount',
+			/*'ItemsCount' => 'COUNT(%1$s.OrderId)',*/
+			'ShippingSubTotal' => '%1$s.ShippingCost + %1$s.InsuranceFee',
+		),
+	),
+	// %1$s - table name of object
+	// %2$s - calculated fields
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId
+				LEFT JOIN '.TABLE_PREFIX.'ProductsCoupons pc ON %1$s.CouponId = pc.CouponId
+				LEFT JOIN '.TABLE_PREFIX.'GiftCertificates gc ON %1$s.GiftCertificateId = gc.GiftCertificateId
+				LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
+				LEFT JOIN '.TABLE_PREFIX.'Users au ON af.PortalUserId = au.PortalUserId',
+
+		'myorders' => '	SELECT %1$s.* %2$s
+						FROM %1$s
+						LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId',
+//						LEFT JOIN '.TABLE_PREFIX.'OrderItems ON %1$s.OrderId = '.TABLE_PREFIX.'OrderItems.OrderId',
+	),
+
+	'SubItems' => Array ('orditems'),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('OrderDate' => 'desc'),
+		)
+	),
+
+	'Fields' => Array (
+		'OrderId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'filter_type' => 'equals'),
+		'Number' => Array ('type' => 'int', 'required' =>1, 'formatter' => 'kFormatter', 'unique' =>Array ('SubNumber'), 'format' => '%06d', 'max_value_inc'>999999, 'not_null' => 1, 'default' => 0),
+		'SubNumber' => Array ('type' => 'int', 'required' =>1, 'formatter' => 'kFormatter', 'unique' =>Array ('Number'), 'format' => '%03d', 'max_value_inc'>999, 'not_null' => 1, 'default' => 0),
+		'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' =>Array (0=> 'la_Incomplete',1=> 'la_Pending',2=> 'la_BackOrders',3=> 'la_ToShip',4=> 'la_Processed',5=> 'la_Denied',6=> 'la_Archived'), 'use_phrases' =>1, 'not_null' => 1, 'default' => 0, 'filter_type' => 'equals'),
+		'OnHold' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
+		'PortalUserId' =>Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' =>Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' =>1, 'not_null' =>1, 'default' =>-1),
+		'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'),
+		'UserComment' => Array ('type' => 'string', 'default' => NULL),
+		'AdminComment' => Array ('type' => 'string', 'default' => NULL),
+		'BillingTo' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingCompany' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingEmail' => Array (
+			'type' => 'string',
+			'formatter' => 'kFormatter',
+			'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+			'error_msgs' => Array ('invalid_format' => '!la_invalid_email!', 'unique' => '!lu_email_already_exist!'),
+			'not_null' => 1, 'default' => '',
+		),
+		'BillingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingCity' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingState' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (),
+			'option_key_field' => 'DestAbbr',
+			'option_title_field' => 'Translation',
+			'not_null' => 1, 'default' => '',
+		),
+		'BillingZip' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'BillingCountry' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+								FROM '.TABLE_PREFIX.'CountryStates
+								WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+								ORDER BY Name',
+			'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+			'not_null' => 1, 'default' => 'USA'
+		),
+		'VAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.2f'),
+		'VATPercent' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.3f'),
+		'VATIncluded' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'PaymentType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => 'SELECT IF(l%2$s_Description <> "", l%2$s_Description, l%3$s_Description) AS Description, PaymentTypeId
+								FROM ' . TABLE_PREFIX . 'PaymentTypes
+								WHERE Status = 1
+								ORDER BY Priority DESC, Name ASC',
+			'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Description',
+			'not_null' => 1, 'default' => 0
+		),
+
+		'PaymentAccount' => Array ('type' => 'string', 'not_null' => 1, 'cardtype_field' => 'PaymentCardType', 'default' => '', 'filter_type' => 'like'),
+		'PaymentNameOnCard' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'PaymentCCExpDate' => Array ('type' => 'string', 'formatter' => 'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field' => 'PaymentCCExpYear', 'not_null' => 1, 'default' => ''),
+		'PaymentCardType' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => '', '1' => 'Visa', '2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', '5' => 'Diners Club', '6' => 'JBC'), 'default' => ''),
+		'PaymentExpires' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'ShippingTo' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingCompany' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingEmail' => Array (
+			'type' => 'string',
+			'formatter' => 'kFormatter',
+			'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+			'error_msgs' => Array ('invalid_format' => '!la_invalid_email!'),
+			'not_null' => 1, 'default' => '',
+		),
+		'ShippingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingCity' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingState' => Array (
+			'type' => 'string', 'formatter' => 'kOptionsFormatter',
+									'options' => Array (),
+									'option_key_field' => 'DestAbbr', 'option_title_field' => 'Translation',
+									'not_null' => 1, 'default' => ''),
+		'ShippingZip' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingCountry' => Array (
+			'type' => 'string', 'formatter' => 'kOptionsFormatter',
+			'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+								FROM '.TABLE_PREFIX.'CountryStates
+								WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+								ORDER BY Name',
+			'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+			'not_null' => 1, 'default' => 'USA'
+		),
+		'ShippingType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => 'SELECT %s
+									FROM ' . TABLE_PREFIX . 'ShippingType
+								WHERE Status = 1',
+			'option_key_field' => 'ShippingID',
+			'option_title_field' => 'Name',
+			'not_null' => 1, 'default' => 0,
+		),
+		'ShippingCost' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'ShippingCustomerAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingTracking' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'ShippingDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+		'SubTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'OriginalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'ShippingOption' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail',
+			),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+		),
+		'ShippingGroupOption' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+			'options' => Array (0 => 'la_opt_AutoGroupShipments', 1 => 'la_opt_ManualGroupShipments'),
+			'not_null' => 1, 'default' => 0,
+		),
+		'GiftCertificateId' => Array ('type' => 'int', 'default' => null),
+		'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',),
+		'ShippingInfo' => Array ('type' => 'string', 'default' => NULL),
+		'CouponId' => Array ('type' => 'int', 'default' => null),
+		'CouponDiscount' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
+		'DiscountTotal' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'),
+		'TransactionStatus' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_opt_Invalid', 1 => 'la_opt_Verified', 2 => 'la_opt_Pending'),
+			'use_phrases' =>1, 'not_null' => 1, 'default' => 2,
+		),
+		'GWResult1' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
+		'GWResult2' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL),
+		'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),  'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'IF(u.Email = "", u.Username, u.Email)', 'not_null' =>1, 'default' =>0),
+		'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'AffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.0000'),
+		'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '0', 'default' => '0.0000'),
+		'InsuranceFee' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+		'ShippingTaxable' => Array ('type' => 'int', 'not_null' => 0, 'default' => 0),
+		'ProcessingTaxable' => Array ('type' => 'int', 'not_null' => 0, 'default' => 0),
+		'IsRecurringBilling' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1,
+			'default' => 0, 'not_null' => 1,
+		),
+		'ChargeOnNextApprove' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1,
+			'default' => 0, 'not_null' => 1,
+		),
+		'NextCharge' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+		'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'GoogleOrderNumber' => Array ('type' => 'string', 'default' => NULL), // MySQL BIGINT UNSIGNED = 8 Bytes, PHP int = 4 Bytes -> threat as string
+	),
+
+	'VirtualFields' => Array (
+		'CustomerName' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'),
+		'TotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'AmountWithoutVAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'SubtotalWithDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'SubtotalWithoutDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'ShippingSubTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'OrderNumber' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'),
+		'CouponCode' => Array ('type' => 'string', 'default' => ''),
+		'CouponName' => Array ('type' => 'string', 'default' => ''),
+		'GiftCertificateCode' => Array ('type' => 'string', 'default' => ''),
+		'GiftCertificateRecipient' => Array ('type' => 'string', 'default' => ''),
+
+		// for ResetToUser
+		'UserTo' => Array ('type' => 'string', 'default' => ''),
+		'UserCompany' => Array ('type' => 'string', 'default' => ''),
+		'UserPhone' => Array ('type' => 'string', 'default' => ''),
+		'UserFax' => Array ('type' => 'string', 'default' => ''),
+		'UserEmail' => Array ('type' => 'string', 'default' => ''),
+		'UserAddress1' => Array ('type' => 'string', 'default' => ''),
+		'UserAddress2' => Array ('type' => 'string', 'default' => ''),
+		'UserCity' => Array ('type' => 'string', 'default' => ''),
+		'UserState' => Array ('type' => 'string', 'default' => ''),
+		'UserZip' => Array ('type' => 'string', 'default' => ''),
+		'UserCountry' => Array ('type' => 'string', 'default' => ''),
+
+		// for Search
+		'Username' => Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''),
+		'HasBackOrders' => Array ('type' => 'int', 'default' => 0),
+		'PaymentCVV2' => Array ('type' => 'string', 'default' => ''),
+		'AffiliateUser' => Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''),
+		'AffiliatePortalUserId' => Array ('type' => 'int', 'default' => 0),
+
+		// export related fields: begin
+		'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
+		'ExportFilename' => Array ('type' => 'string', 'default' => ''),
+		'FieldsSeparatedBy' => Array ('type' => 'string', 'default' => ', '),
+		'FieldsEnclosedBy' => Array ('type' => 'string', 'default' => '"'),
+		'LineEndings' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
+		'LineEndingsInside' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
+		'IncludeFieldTitles' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'default' => 1,
+		),
+		'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+		'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+		'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+		'ExportSavePreset' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'default' => 0,
+		),
+		'ExportPresetName' => Array ('type' => 'string', 'default' => ''),
+		// export related fields: end
+
+		// for "one step checkout"
+		'UserPassword' => Array (
+			'type' => 'string',
+			'formatter' => 'kPasswordFormatter', 'hashing_method' => PasswordHashingMethod::MD5, 'verify_field' => 'VerifyUserPassword',
+			'skip_empty' => 1, 'default' => 'd41d8cd98f00b204e9800998ecf8427e'
+		),
+
+		// for "Shipping Info" step during Checkout
+		'ShippingTypeId' => Array ('type' => 'array', 'default' => ''),
+	),
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				1 => 'icon16_pending.png',
+				5 => 'icon16_disabled.png',
+				'module' => 'core',
+			),
+
+			'Fields' => Array (
+				'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+				'OrderNumber' => Array ( 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'CustomerName' => Array ( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
+				'PaymentType' => Array ( 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+				'TotalAmount' => Array ( 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
+				'AffiliateUser' => Array ( 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
+				'OnHold' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+			),
+		),
+
+		'Search' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				1 => 'icon16_pending.png',
+				5 => 'icon16_disabled.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+				'OrderNumber' => Array ('data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
+				'PaymentType' => Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
+				'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter'),
+				'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
+				'OrderIP' => Array ('filter_block' => 'grid_like_filter'),
+				'Username' => Array ('filter_block' => 'grid_user_like_filter'),
+				'PaymentAccount' => Array ('title' => 'column:la_fld_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/orders/orders_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.59.2.15
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/order_calculator.php
===================================================================
--- releases/5.2.2-B2/units/orders/order_calculator.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/order_calculator.php	(revision 16630)
@@ -0,0 +1,859 @@
+<?php
+/**
+* @version   $Id$
+* @package   In-Commerce
+* @copyright   Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license   Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	/**
+	 * Performs order price calculations
+	 *
+	 */
+	class OrderCalculator extends kBase {
+
+		/**
+		 * Order manager instance
+		 *
+		 * @var OrderManager
+		 */
+		protected $manager = null;
+
+		/**
+		 * Items, associated with current order
+		 *
+		 * @var Array
+		 */
+		protected $items = Array ();
+
+		/**
+		 * Creates new clean instance of calculator
+		 *
+		 */
+		public function __construct()
+		{
+			parent::__construct();
+
+			$this->reset();
+		}
+
+		/**
+		 * Sets order manager instance to calculator
+		 *
+		 * @param OrderManager $manager
+		 */
+		public function setManager(&$manager)
+		{
+			$this->manager =& $manager;
+		}
+
+		public function reset()
+		{
+			$this->items = Array ();
+		}
+
+		/**
+		 * Returns order object used in order manager
+		 *
+		 * @return OrdersItem
+		 */
+		protected function &getOrder()
+		{
+			$order =& $this->manager->getOrder();
+
+			return $order;
+		}
+
+		/**
+		 * Sets checkout error
+		 *
+		 * @param int $error_type = {product,coupon,gc}
+		 * @param int $error_code
+		 * @param int $product_id - {ProductId}:{OptionsSalt}:{BackOrderFlag}:{FieldName}
+		 * @return void
+		 * @access protected
+		 */
+		protected function setError($error_type, $error_code, $product_id = null)
+		{
+			$this->manager->setError($error_type, $error_code, $product_id);
+		}
+
+		/**
+		 * Perform order calculations and prepares operations for order manager
+		 *
+		 */
+		public function calculate()
+		{
+			$this->queryItems();
+			$this->groupItems();
+
+			$this->generateOperations();
+			$this->applyWholeOrderFlatDiscount();
+		}
+
+		/**
+		 * Groups order items, when requested
+		 *
+		 * @return Array
+		 */
+		protected function groupItems()
+		{
+			$skipped_items = Array ();
+
+			foreach ($this->items as $item_id => $item_data) {
+				if ( in_array($item_id, $skipped_items) ) {
+					continue;
+				}
+
+				$group_items = $this->getItemsToGroupWith($item_id);
+
+				if (!$group_items) {
+					continue;
+				}
+
+				foreach ($group_items as $group_item_id) {
+					$this->items[$item_id]['Quantity'] += $this->items[$group_item_id]['Quantity'];
+					$this->items[$group_item_id]['Quantity'] = 0;
+				}
+
+				$skipped_items = array_merge($skipped_items, $group_items);
+			}
+		}
+
+		/**
+		 * Returns order item ids, that can be grouped with given order item id
+		 *
+		 * @param int $target_item_id
+		 * @return Array
+		 * @see OrderCalculator::canBeGrouped
+		 */
+		protected function getItemsToGroupWith($target_item_id)
+		{
+			$ret = Array ();
+
+			foreach ($this->items as $item_id => $item_data) {
+				if ( $this->canBeGrouped($this->items[$item_id], $this->items[$target_item_id]) ) {
+					$ret[] = $item_id;
+				}
+			}
+
+			return array_diff($ret, Array ($target_item_id));
+		}
+
+		/**
+		 * Checks if 2 given order items can be grouped together
+		 *
+		 * @param Array $src_item
+		 * @param Array $dst_item
+		 * @return bool
+		 */
+		public function canBeGrouped($src_item, $dst_item)
+		{
+			if ($dst_item['Type'] != PRODUCT_TYPE_TANGIBLE) {
+				return false;
+			}
+
+			return ($src_item['ProductId'] == $dst_item['ProductId']) && ($src_item['OptionsSalt'] == $dst_item['OptionsSalt']);
+		}
+
+		/**
+		 * Retrieves order contents from database
+		 *
+		 */
+		protected function queryItems()
+		{
+			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+
+			$query = '	SELECT 	oi.ProductId, oi.OptionsSalt, oi.ItemData, oi.Quantity,
+								IF(p.InventoryStatus = ' . ProductInventory::BY_OPTIONS . ', poc.QtyInStock, p.QtyInStock) AS QtyInStock,
+								p.QtyInStockMin, p.BackOrder, p.InventoryStatus,
+								p.Type, oi.OrderItemId
+						FROM ' . $this->getTable('orditems') . ' AS oi
+						LEFT JOIN ' . TABLE_PREFIX . 'Products AS p ON oi.ProductId = p.ProductId
+						LEFT JOIN ' . $poc_table . ' poc ON (poc.CombinationCRC = oi.OptionsSalt) AND (oi.ProductId = poc.ProductId)
+						WHERE oi.OrderId = ' . $this->getOrder()->GetID();
+
+			$this->items = $this->Conn->Query($query, 'OrderItemId');
+		}
+
+		/**
+		 * Generates operations and returns true, when something was changed
+		 *
+		 * @return bool
+		 */
+		protected function generateOperations()
+		{
+			$this->manager->resetOperationTotals();
+
+			foreach ($this->items as $item) {
+				$this->ensureMinQty($item);
+
+				$to_order = $back_order = 0;
+				$available = $this->getAvailableQty($item);
+
+				if ( $this->allowBackordering($item) ) {
+					// split order into order & backorder
+					if ($item['BackOrder'] == ProductBackorder::ALWAYS) {
+						$to_order = $available = 0;
+						$back_order = $item['Quantity'];
+					}
+					elseif ($item['BackOrder'] == ProductBackorder::AUTO) {
+						$to_order = $available;
+						$back_order = $item['Quantity'] - $available;
+					}
+
+					$qty = $to_order + $back_order;
+
+					$price = $this->getPlainProductPrice($item, $qty);
+					$cost = $this->getProductCost($item, $qty);
+					$discount_info = $this->getDiscountInfo( $item['ProductId'], $price, $qty );
+
+					$this->manager->addOperation($item, 0, $to_order, $price, $cost, $discount_info);
+					$this->manager->addOperation($item, 1, $back_order, $price, $cost, $discount_info);
+				}
+				else {
+					// store as normal order (and remove backorder)
+					// we could get here with backorder=never then we should order only what's available
+					$to_order = min($item['Quantity'], $available);
+
+					$price = $this->getPlainProductPrice($item, $to_order);
+					$cost = $this->getProductCost($item, $to_order);
+					$discount_info = $this->getDiscountInfo( $item['ProductId'], $price, $to_order );
+
+					$this->manager->addOperation($item, 0, $to_order, $price, $cost, $discount_info, $item['OrderItemId']);
+					$this->manager->addOperation($item, 1, 0, $price, $cost, $discount_info); // remove backorder record
+
+					if ($to_order < $item['Quantity']) {
+						// ordered less, then requested -> inform user
+						if ( $to_order > 0 ) {
+							$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_UNAVAILABLE, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+						}
+						else {
+							$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_OUT_OF_STOCK, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+						}
+					}
+				}
+			}
+		}
+
+		/**
+		 * Adds product to order (not to db)
+		 *
+		 * @param Array $item
+		 * @param kCatDBItem $product
+		 * @param int $qty
+		 */
+		public function addProduct($item, &$product, $qty)
+		{
+			$this->updateItemDataFromProduct($item, $product);
+
+			$price = $this->getPlainProductPrice($item, $qty);
+			$cost = $this->getProductCost($item, $qty);
+			$discount_info = $this->getDiscountInfo( $item['ProductId'], $price, $qty );
+
+			$this->manager->addOperation( $item, 0, $qty, $price, $cost, $discount_info, $item['OrderItemId'] );
+		}
+
+		/**
+		 * Apply whole order flat discount after sub-total been calculated
+		 *
+		 */
+		protected function applyWholeOrderFlatDiscount()
+		{
+			$sub_total_flat = $this->manager->getOperationTotal('SubTotalFlat');
+			$flat_discount = min( $sub_total_flat, $this->getWholeOrderPlainDiscount($global_discount_id) );
+			$coupon_flat_discount = min( $sub_total_flat, $this->getWholeOrderCouponDiscount() );
+
+			if ($coupon_flat_discount && $coupon_flat_discount > $flat_discount) {
+				$global_discount_type = 'coupon';
+				$flat_discount = $coupon_flat_discount;
+				$global_discount_id = $coupon_id;
+			}
+			else {
+				$global_discount_type = 'discount';
+			}
+
+			$sub_total = $this->manager->getOperationTotal('SubTotal');
+
+			if ($sub_total_flat - $sub_total < $flat_discount) {
+				// individual item discounts together are smaller when order flat discount
+				$this->manager->setOperationTotal('CouponDiscount', $flat_discount == $coupon_flat_discount ? $flat_discount : 0);
+				$this->manager->setOperationTotal('SubTotal', $sub_total_flat - $flat_discount);
+
+				// replace discount for each operation
+				foreach ($this->operations as $index => $operation) {
+					$discounted_price = ($operation['Price'] / $sub_total_flat) * $sub_total;
+					$this->operations[$index]['DiscountInfo'] = Array ($global_discount_id, $global_discount_type, $discounted_price, 0);
+				}
+			}
+		}
+
+		/**
+		 * Returns discount information for given product price and qty
+		 *
+		 * @param int $product_id
+		 * @param float $price
+		 * @param int $qty
+		 * @return Array
+		 */
+		protected function getDiscountInfo($product_id, $price, $qty)
+		{
+			$discounted_price = $this->getDiscountedProductPrice($product_id, $price, $discount_id);
+			$couponed_price = $this->getCouponDiscountedPrice($product_id, $price);
+
+			if ($couponed_price < $discounted_price) {
+				$discount_type = 'coupon';
+				$discount_id = $coupon_id;
+
+				$discounted_price =	$couponed_price;
+				$coupon_discount = ($price - $couponed_price) * $qty;
+			}
+			else {
+				$coupon_discount = 0;
+				$discount_type = 'discount';
+			}
+
+			return Array ($discount_id, $discount_type, $discounted_price, $coupon_discount);
+		}
+
+		/**
+		 * Returns product qty, available for ordering
+		 *
+		 * @param Array $item
+		 * @return int
+		 */
+		protected function getAvailableQty($item)
+		{
+			if ( $item['InventoryStatus'] == ProductInventory::DISABLED ) {
+				// always available
+				return $item['Quantity'] * 2;
+			}
+
+			return max(0, $item['QtyInStock'] - $item['QtyInStockMin']);
+		}
+
+		/**
+		 * Checks, that product in given order item can be backordered
+		 *
+		 * @param Array $item
+		 * @return bool
+		 */
+		protected function allowBackordering($item)
+		{
+			if ($item['BackOrder'] == ProductBackorder::ALWAYS) {
+				return true;
+			}
+
+			$available = $this->getAvailableQty($item);
+			$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
+
+			return $backordering && ($item['Quantity'] > $available) && ($item['BackOrder'] == ProductBackorder::AUTO);
+		}
+
+		/**
+		 * Make sure, that user can't order less, then minimal required qty of product
+		 *
+		 * @param Array $item
+		 */
+		protected function ensureMinQty(&$item)
+		{
+			$sql = 'SELECT MIN(MinQty)
+					FROM ' . TABLE_PREFIX . 'ProductsPricing
+					WHERE ProductId = ' . $item['ProductId'];
+			$min_qty = max(1, $this->Conn->GetOne($sql));
+
+			$qty = $item['Quantity'];
+
+			if ($qty > 0 && $qty < $min_qty) {
+				// qty in cart increased to meat minimal qry requirements of given product
+				$this->setError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::QTY_CHANGED_TO_MINIMAL, $item['ProductId'] . ':' . $item['OptionsSalt'] . ':0:Quantity');
+
+				$item['Quantity'] = $min_qty;
+			}
+		}
+
+		/**
+		 * Return product price for given qty, taking no discounts into account
+		 *
+		 * @param Array $item
+		 * @param int $qty
+		 * @return float
+		 */
+		public function getPlainProductPrice($item, $qty)
+		{
+			$item_data = $this->getItemData($item);
+
+			if ( isset($item_data['ForcePrice']) ) {
+				return $item_data['ForcePrice'];
+			}
+
+			$pricing_id = $this->getPriceBracketByQty($item, $qty);
+
+			$sql = 'SELECT Price
+					FROM ' . TABLE_PREFIX . 'ProductsPricing
+					WHERE PriceId = ' . $pricing_id;
+			$price = (float)$this->Conn->GetOne($sql);
+
+			if ( isset($item_data['Options']) ) {
+				$price += $this->getOptionPriceAddition($price, $item_data);
+				$price = $this->getCombinationPriceOverride($price, $item_data);
+			}
+
+			return max($price, 0);
+		}
+
+		/**
+		 * Return product cost for given qty, taking no discounts into account
+		 *
+		 * @param Array $item
+		 * @param int $qty
+		 * @return float
+		 */
+		public function getProductCost($item, $qty)
+		{
+			$pricing_id = $this->getPriceBracketByQty($item, $qty);
+
+			$sql = 'SELECT Cost
+					FROM ' . TABLE_PREFIX . 'ProductsPricing
+					WHERE PriceId = ' . $pricing_id;
+
+			return (float)$this->Conn->GetOne($sql);
+		}
+
+		/**
+		 * Return product price for given qty, taking no discounts into account
+		 *
+		 * @param Array $item
+		 * @param int $qty
+		 * @return float
+		 */
+		protected function getPriceBracketByQty($item, $qty)
+		{
+			$orderby_clause = '';
+			$where_clause = Array ();
+			$product_id = $item['ProductId'];
+
+			if ( $this->usePriceBrackets($item) ) {
+				$user_id = $this->getOrder()->GetDBField('PortalUserId');
+
+				$where_clause = Array (
+					'GroupId IN (' . $this->Application->getUserGroups($user_id) . ')',
+					'pp.ProductId = ' . $product_id,
+					'pp.MinQty <= ' . $qty,
+					$qty . ' < pp.MaxQty OR pp.MaxQty = -1',
+				);
+
+				$orderby_clause = $this->getPriceBracketOrderClause($user_id);
+			}
+			else {
+				$item_data = $this->getItemData($item);
+
+				$where_clause = Array(
+					'pp.ProductId = ' . $product_id,
+					'pp.PriceId = ' . $this->getPriceBracketFromRequest($product_id, $item_data),
+				);
+			}
+
+			$sql = 'SELECT pp.PriceId
+					FROM ' . TABLE_PREFIX . 'ProductsPricing AS pp
+					LEFT JOIN ' . TABLE_PREFIX . 'Products AS p ON p.ProductId = pp.ProductId
+					WHERE (' . implode(') AND (', $where_clause) . ')';
+
+			if ($orderby_clause) {
+				$sql .= ' ORDER BY ' . $orderby_clause;
+			}
+
+			return (float)$this->Conn->GetOne($sql);
+		}
+
+		/**
+		 * Checks if price brackets should be used in price calculations
+		 *
+		 * @param Array $item
+		 * @return bool
+		 */
+		protected function usePriceBrackets($item)
+		{
+			return $item['Type'] == PRODUCT_TYPE_TANGIBLE;
+		}
+
+		/**
+		 * Return product pricing id for given product.
+		 * If not passed - return primary pricing ID
+		 *
+		 * @param int $product_id
+		 * @return int
+		 */
+		public function getPriceBracketFromRequest($product_id, $item_data)
+		{
+			if ( !is_array($item_data) ) {
+				$item_data = unserialize($item_data);
+			}
+
+			// remembered pricing during checkout
+			if ( isset($item_data['PricingId']) && $item_data['PricingId'] ) {
+				return $item_data['PricingId'];
+			}
+
+			// selected pricing from product detail page
+			$price_id = $this->Application->GetVar('pr_id');
+
+			if ($price_id) {
+				return $price_id;
+			}
+
+			$sql = 'SELECT PriceId
+					FROM ' . TABLE_PREFIX . 'ProductsPricing
+					WHERE ProductId = ' . $product_id . ' AND IsPrimary = 1';
+
+			return $this->Conn->GetOne($sql);
+		}
+
+		/**
+		 * Returns order clause for price bracket selection based on configration
+		 *
+		 * @param int $user_id
+		 * @return string
+		 */
+		protected function getPriceBracketOrderClause($user_id)
+		{
+			if ($this->Application->ConfigValue('Comm_PriceBracketCalculation') == 1) {
+				// if we have to stick to primary group, then its pricing will go first,
+				// but if there is no pricing for primary group, then next optimal will be taken
+				$primary_group = $this->getUserPrimaryGroup($user_id);
+
+				return '( IF(GroupId = ' . $primary_group . ', 1, 2) ) ASC, pp.Price ASC';
+			}
+
+			return 'pp.Price ASC';
+		}
+
+		/**
+		 * Returns addition to product price based on used product option
+		 *
+		 * @param float $price
+		 * @param Array $item_data
+		 * @return float
+		 */
+		protected function getOptionPriceAddition($price, $item_data)
+		{
+			$addition = 0;
+
+			/** @var kProductOptionsHelper $opt_helper */
+			$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+			foreach ($item_data['Options'] as $opt => $val) {
+				$sql = 'SELECT *
+						FROM ' . TABLE_PREFIX . 'ProductOptions
+						WHERE ProductOptionId = ' . $opt;
+				$data = $this->Conn->GetRow($sql);
+
+				$parsed = $opt_helper->ExplodeOptionValues($data);
+
+				if ( !$parsed ) {
+					continue;
+				}
+
+				if ( is_array($val) ) {
+					foreach ($val as $a_val) {
+						$addition += $this->formatPrice($a_val, $price, $parsed);
+					}
+				}
+				else {
+					$addition += $this->formatPrice($val, $price, $parsed);
+				}
+			}
+
+			return $addition;
+		}
+
+		protected function formatPrice($a_val, $price, $parsed)
+		{
+			$a_val = kUtil::unescape($a_val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
+
+			$addition = 0;
+			$conv_prices = $parsed['Prices'];
+			$conv_price_types = $parsed['PriceTypes'];
+
+			if ( isset($conv_prices[$a_val]) && $conv_prices[$a_val] ) {
+				if ($conv_price_types[$a_val] == '$') {
+					$addition += $conv_prices[$a_val];
+				}
+				elseif ($conv_price_types[$a_val] == '%') {
+					$addition += $price * $conv_prices[$a_val] / 100;
+				}
+			}
+
+			return $addition;
+		}
+
+		/**
+		 * Returns product price after applying combination price override
+		 *
+		 * @param float $price
+		 * @param Array $item_data
+		 * @return float
+		 */
+		protected function getCombinationPriceOverride($price, $item_data)
+		{
+			$combination_salt = $this->generateOptionsSalt( $item_data['Options'] );
+
+			if (!$combination_salt) {
+				return $price;
+			}
+
+			$sql = 'SELECT *
+					FROM ' . TABLE_PREFIX . 'ProductOptionCombinations
+					WHERE CombinationCRC = ' . $combination_salt;
+			$combination = $this->Conn->GetRow($sql);
+
+			if (!$combination) {
+				return $price;
+			}
+
+			switch ( $combination['PriceType'] ) {
+				case OptionCombinationPriceType::EQUALS:
+					return $combination['Price'];
+					break;
+
+				case OptionCombinationPriceType::FLAT:
+					return $price + $combination['Price'];
+					break;
+
+				case OptionCombinationPriceType::PECENT:
+					return $price * (1 + $combination['Price'] / 100);
+					break;
+			}
+
+			return $price;
+		}
+
+		/**
+		 * Generates salt for given option set
+		 *
+		 * @param Array $options
+		 * @return int
+		 */
+		public function generateOptionsSalt($options)
+		{
+			/** @var kProductOptionsHelper $opt_helper */
+			$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+			return $opt_helper->OptionsSalt($options, true);
+		}
+
+		/**
+		 * Return product price for given qty, taking possible discounts into account
+		 *
+		 * @param int $product_id
+		 * @param int $price
+		 * @param int $discount_id
+		 * @return float
+		 */
+		public function getDiscountedProductPrice($product_id, $price, &$discount_id)
+		{
+			$discount_id = 0;
+			$user_id = $this->getOrder()->GetDBField('PortalUserId');
+
+			$join_clause = Array (
+				'd.DiscountId = di.DiscountId',
+				'di.ItemType = ' . DiscountItemType::PRODUCT . ' OR (di.ItemType = ' . DiscountItemType::WHOLE_ORDER . ' AND d.Type = ' . DiscountType::PERCENT . ')',
+				'd.Status = ' . STATUS_ACTIVE,
+				'd.GroupId IN (' . $this->Application->getUserGroups($user_id) . ')',
+				'd.Start IS NULL OR d.Start < ' . $this->getOrder()->GetDBField('OrderDate'),
+				'd.End IS NULL OR d.End > ' . $this->getOrder()->GetDBField('OrderDate'),
+			);
+
+			$sql = 'SELECT
+						ROUND(CASE d.Type
+							WHEN ' . DiscountType::FLAT . ' THEN ' . $price . ' - d.Amount
+							WHEN ' . DiscountType::PERCENT . ' THEN ' . $price . ' * (1 - d.Amount / 100)
+							ELSE ' . $price . '
+						END, 4), d.DiscountId
+					FROM ' . TABLE_PREFIX . 'Products AS p
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsDiscountItems AS di ON (di.ItemResourceId = p.ResourceId) OR (di.ItemType = ' . DiscountItemType::WHOLE_ORDER . ')
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsDiscounts AS d ON (' . implode(') AND (', $join_clause) . ')
+					WHERE (p.ProductId = ' . $product_id . ') AND (d.DiscountId IS NOT NULL)';
+			$pricing = $this->Conn->GetCol($sql, 'DiscountId');
+
+			if (!$pricing) {
+				return $price;
+			}
+
+			// get minimal price + discount
+			$discounted_price = min($pricing);
+			$pricing = array_flip($pricing);
+			$discount_id = $pricing[$discounted_price];
+
+			// optimal discount, but prevent negative price
+			return max( min($discounted_price, $price), 0 );
+		}
+
+		public function getWholeOrderPlainDiscount(&$discount_id)
+		{
+			$discount_id = 0;
+			$user_id = $this->getOrder()->GetDBField('PortalUserId');
+
+			$join_clause = Array (
+				'd.DiscountId = di.DiscountId',
+				'di.ItemType = ' . DiscountItemType::WHOLE_ORDER . ' AND d.Type = ' . DiscountType::FLAT,
+				'd.Status = ' . STATUS_ACTIVE,
+				'd.GroupId IN (' . $this->Application->getUserGroups($user_id) . ')',
+				'd.Start IS NULL OR d.Start < ' . $this->getOrder()->GetDBField('OrderDate'),
+				'd.End IS NULL OR d.End > ' . $this->getOrder()->GetDBField('OrderDate'),
+			);
+
+			$sql = 'SELECT d.Amount AS Discount, d.DiscountId
+					FROM ' . TABLE_PREFIX . 'ProductsDiscountItems AS di
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsDiscounts AS d ON (' . implode(') AND (', $join_clause) . ')
+					WHERE d.DiscountId IS NOT NULL';
+			$pricing = $this->Conn->GetCol($sql, 'DiscountId');
+
+			if (!$pricing) {
+				return 0;
+			}
+
+			$discounted_price = max($pricing);
+			$pricing = array_flip($pricing);
+			$discount_id = $pricing[$discounted_price];
+
+			return max($discounted_price, 0);
+		}
+
+		public function getCouponDiscountedPrice($product_id, $price)
+		{
+			if ( !$this->getCoupon() ) {
+				return $price;
+			}
+
+			$join_clause = Array (
+				'c.CouponId = ci.CouponId',
+				'ci.ItemType = ' . CouponItemType::PRODUCT . ' OR (ci.ItemType = ' . CouponItemType::WHOLE_ORDER . ' AND c.Type = ' . CouponType::PERCENT . ')',
+			);
+
+			$sql = 'SELECT
+						MIN(
+							ROUND(CASE c.Type
+								WHEN ' . CouponType::FLAT . ' THEN ' . $price . ' - c.Amount
+								WHEN ' . CouponType::PERCENT . ' THEN ' . $price . ' * (1 - c.Amount / 100)
+								ELSE ' . $price . '
+							END, 4)
+						)
+					FROM ' . TABLE_PREFIX . 'Products AS p
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsCouponItems AS ci ON (ci.ItemResourceId = p.ResourceId) OR (ci.ItemType = ' . CouponItemType::WHOLE_ORDER . ')
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsCoupons AS c ON (' . implode(') AND (', $join_clause) . ')
+					WHERE p.ProductId = ' . $product_id . ' AND ci.CouponId = ' . $this->getCoupon() . '
+					GROUP BY p.ProductId';
+
+			$coupon_price = $this->Conn->GetOne($sql);
+
+			if ($coupon_price === false) {
+				return $price;
+			}
+
+			return max( min($price, $coupon_price), 0 );
+		}
+
+		public function getWholeOrderCouponDiscount()
+		{
+			if ( !$this->getCoupon() ) {
+				return 0;
+			}
+
+			$where_clause = Array (
+				'ci.CouponId = ' . $this->getCoupon(),
+				'ci.ItemType = ' . CouponItemType::WHOLE_ORDER,
+				'c.Type = ' . CouponType::FLAT,
+			);
+
+			$sql = 'SELECT Amount
+					FROM ' . TABLE_PREFIX . 'ProductsCouponItems AS ci
+					LEFT JOIN ' . TABLE_PREFIX . 'ProductsCoupons AS c ON c.CouponId = ci.CouponId
+					WHERE (' . implode(') AND (', $where_clause) . ')';
+
+			return $this->Conn->GetOne($sql);
+		}
+
+		protected function getCoupon()
+		{
+			return $this->getOrder()->GetDBField('CouponId');
+		}
+
+		/**
+		 * Returns primary group of given user
+		 *
+		 * @param int $user_id
+		 * @return int
+		 */
+		protected function getUserPrimaryGroup($user_id)
+		{
+			if ($user_id > 0) {
+				$sql = 'SELECT PrimaryGroupId
+						FROM ' . TABLE_PREFIX . 'Users
+						WHERE PortalUserId = ' . $user_id;
+				return $this->Conn->GetOne($sql);
+			}
+
+			return $this->Application->ConfigValue('User_LoggedInGroup');
+		}
+
+		/**
+		 * Returns ItemData associated with given order item
+		 *
+		 * @param Array $item
+		 * @return Array
+		 */
+		protected function getItemData($item)
+		{
+			$item_data = $item['ItemData'];
+
+			if ( is_array($item_data) ) {
+				return $item_data;
+			}
+
+			return $item_data ? unserialize($item_data) : Array ();
+		}
+
+		/**
+		 * Sets ItemData according to product
+		 *
+		 * @param Array $item
+		 * @param kCatDBItem $product
+		 */
+		protected function updateItemDataFromProduct(&$item, &$product)
+		{
+			$item_data = $this->getItemData($item);
+			$item_data['IsRecurringBilling'] = $product->GetDBField('IsRecurringBilling');
+
+			// it item is processed in order using new style, then put such mark in orderitem record
+			$processing_data = $product->GetDBField('ProcessingData');
+
+			if ($processing_data) {
+				$processing_data = unserialize($processing_data);
+
+				if ( isset($processing_data['HasNewProcessing']) ) {
+					$item_data['HasNewProcessing'] = 1;
+				}
+			}
+
+			$item['ItemData'] = serialize($item_data);
+		}
+
+		/**
+		 * Returns table name according to order temp mode
+		 *
+		 * @param string $prefix
+		 * @return string
+		 */
+		protected function getTable($prefix)
+		{
+			return $this->manager->getTable($prefix);
+		}
+	}

Property changes on: releases/5.2.2-B2/units/orders/order_calculator.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/order_manager.php
===================================================================
--- releases/5.2.2-B2/units/orders/order_manager.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/order_manager.php	(revision 16630)
@@ -0,0 +1,486 @@
+<?php
+/**
+* @version   $Id$
+* @package   In-Commerce
+* @copyright   Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license   Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	/**
+	 * Manages order contents
+	 *
+	 */
+	class OrderManager extends kBase {
+
+		protected $errorMessages = Array (
+            1 => 'state_changed',
+            2 => 'qty_unavailable',
+            3 => 'outofstock',
+            4 => 'invalid_code',
+            5 => 'code_expired',
+            6 => 'min_qty',
+            7 => 'code_removed',
+            8 => 'code_removed_automatically',
+            9 => 'changed_after_login',
+            10 => 'coupon_applied',
+            104 => 'invalid_gc_code',
+            105 => 'gc_code_expired',
+            107 => 'gc_code_removed',
+            108 => 'gc_code_removed_automatically',
+            110 => 'gift_certificate_applied',
+         );
+
+		/**
+		 * Order, used in calculator
+		 *
+		 * @var OrdersItem
+		 */
+		protected $order = null;
+
+		/**
+		 * Order calculator instance
+		 *
+		 * @var OrderCalculator
+		 */
+		protected $calculator = null;
+
+		/**
+		 * Operations to be performed on order items later
+		 *
+		 * @var Array
+		 */
+		protected $operations = Array ();
+
+		/**
+		 * Totals override
+		 *
+		 * @var Array
+		 */
+		protected $totalsOverride = Array ();
+
+		public function __construct()
+		{
+			parent::__construct();
+
+			$this->calculator = $this->Application->makeClass('OrderCalculator');
+			$this->calculator->setManager($this);
+
+			$this->reset();
+		}
+
+		/**
+		 * Sets order to be used in calculator
+		 *
+		 * @param OrdersItem $order
+		 */
+		public function setOrder(&$order)
+		{
+			$this->order =& $order;
+
+			$this->reset();
+		}
+
+		function reset()
+		{
+			$this->operations = Array ();
+			$this->totalsOverride = Array ();
+
+			$this->calculator->reset();
+		}
+
+		public function resetOperationTotals()
+		{
+			$this->totalsOverride = Array ();
+		}
+
+		/**
+		 * Sets checkout error
+		 *
+		 * @param int $error_type = {product,coupon,gc}
+		 * @param int $error_code
+		 * @param int $product_id - {ProductId}:{OptionsSalt}:{BackOrderFlag}:{FieldName}
+		 * @return void
+		 * @access public
+		 */
+		public function setError($error_type, $error_code, $product_id = null)
+		{
+			$this->order->setCheckoutError($error_type, $error_code, $product_id);
+		}
+
+		/**
+		 * Gets error count
+		 *
+		 * @return int
+		 * @access public
+		 */
+		public function getErrorCount()
+		{
+			$errors = $this->Application->RecallVar('checkout_errors');
+
+			if ( !$errors ) {
+				return 0;
+			}
+
+			return count( unserialize($errors) );
+		}
+
+		/**
+		 * Returns order object reference
+		 *
+		 * @return OrdersItem
+		 */
+		public function &getOrder()
+		{
+			return $this->order;
+		}
+
+		/**
+		 * Calculates given order
+		 *
+		 */
+		public function calculate()
+		{
+			$this->calculator->calculate();
+
+			$changed = $this->applyOperations() || ($this->getErrorCount() > 0);
+			$this->setOrderTotals();
+
+			return $changed;
+		}
+
+		public function addOperation($item, $backorder_flag, $qty, $price, $cost, $discount_info, $order_item_id = 0)
+		{
+			$operation = Array (
+				'ProductId' => $item['ProductId'],
+				'BackOrderFlag' => $backorder_flag,
+				'Quantity' => $qty,
+				'Price' => $price,
+				'Cost' => $cost,
+				'DiscountInfo' => $discount_info,
+				'OrderItemId' => $order_item_id,
+				'OptionsSalt' => $item['OptionsSalt'],
+				'ItemData' => $item['ItemData'],
+				'PackageNum' => array_key_exists('PackageNum', $item) ? $item['PackageNum'] : 1,
+			);
+
+			$this->operations[] = $operation;
+		}
+
+		/**
+		 * Returns total based on added operations
+		 *
+		 * @param string $type
+		 * @return float
+		 */
+		public function getOperationTotal($type)
+		{
+			if ( isset($this->totalsOverride[$type]) ) {
+				return $this->totalsOverride[$type];
+			}
+
+			$ret = 0;
+
+			foreach ($this->operations as $operation) {
+				if ($type == 'SubTotalFlat') {
+					$ret += $operation['Quantity'] * $operation['Price'];
+				}
+				elseif ($type == 'CostTotal') {
+					$ret += $operation['Quantity'] * $operation['Cost'];
+				}
+				elseif ($type == 'SubTotal') {
+					$ret += $operation['Quantity'] * $operation['DiscountInfo'][2]; // discounted price
+				}
+				elseif ($type == 'CouponDiscount') {
+					$ret += $operation['DiscountInfo'][3];
+				}
+			}
+
+			return $ret;
+		}
+
+		public function setOperationTotal($type, $value)
+		{
+			$this->totalsOverride[$type] = $value;
+		}
+
+		/**
+		 * Apply scheduled operations
+		 *
+		 */
+		public function applyOperations()
+		{
+			$ret = false;
+
+			/** @var kDBItem $order_item */
+			$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+
+			foreach ($this->operations as $operation) {
+				$item = $this->getOrderItemByOperation($operation);
+				$item_id = $item['OrderItemId'];
+
+				if ($item_id) { // if Product already exists in the order
+					if ( $this->noChangeRequired($item, $operation) ) {
+						continue;
+					}
+
+					$order_item->Load($item_id);
+
+					if ($operation['Quantity'] > 0) { // Update Price by _TOTAL_ qty
+						$item_data = $order_item->GetDBField('ItemData');
+						$item_data = $item_data ? unserialize($item_data) : Array ();
+						$item_data['DiscountId'] = $operation['DiscountInfo'][0];
+						$item_data['DiscountType'] = $operation['DiscountInfo'][1];
+
+
+						$fields_hash = Array (
+							'Quantity' => $operation['Quantity'],
+							'FlatPrice' => $operation['Price'],
+							'Price' => $operation['DiscountInfo'][2],
+							'Cost' => $operation['Cost'],
+							'ItemData' => serialize($item_data),
+						);
+
+						$order_item->SetDBFieldsFromHash($fields_hash);
+						$order_item->Update();
+					}
+					else { // delete products with 0 qty
+						$order_item->Delete();
+					}
+				}
+				elseif ($operation['Quantity'] > 0) {
+					// if we are adding product
+					// discounts are saved from OrdersEvetnHandler::AddItemToOrder method
+					$item_data = $operation['ItemData'];
+					$item_data = $item_data ? unserialize($item_data) : Array ();
+					$item_data['DiscountId'] = $operation['DiscountInfo'][0];
+					$item_data['DiscountType'] = $operation['DiscountInfo'][1];
+
+					$fields_hash = Array (
+						'ProductId' => $operation['ProductId'],
+						'ProductName' => $this->getProductField( $operation['ProductId'], 'Name' ),
+						'Quantity' => $operation['Quantity'],
+						'FlatPrice' => $operation['Price'],
+						'Price' => $operation['DiscountInfo'][2],
+						'Cost' => $operation['Cost'],
+						'Weight' => $this->getProductField( $operation['ProductId'], 'Weight' ),
+						'OrderId' => $this->order->GetID(),
+						'BackOrderFlag' => $operation['BackOrderFlag'],
+						'ItemData' => serialize($item_data),
+						'PackageNum' => $operation['PackageNum'],
+						'OptionsSalt' => $operation['OptionsSalt'],
+					);
+
+					$order_item->SetDBFieldsFromHash($fields_hash);
+					$order_item->Create();
+				}
+				else {
+					// item requiring to set qty to 0, meaning already does not exist
+					continue;
+				}
+
+				$ret = true;
+			}
+
+			return $ret;
+		}
+
+		/**
+		 * Sets order fields, containing total values
+		 *
+		 */
+		public function setOrderTotals()
+		{
+			$sub_total = $this->getOperationTotal('SubTotal');
+			$this->order->SetDBField('SubTotal', $sub_total);
+
+			$cost_total = $this->getOperationTotal('CostTotal');
+			$this->order->SetDBField('CostTotal', $cost_total);
+
+			$sub_total_flat = $this->getOperationTotal('SubTotalFlat');
+			$this->order->SetDBField('DiscountTotal', $sub_total_flat - $sub_total);
+
+			$coupon_discount = $this->getOperationTotal('CouponDiscount');
+			$this->order->SetDBField('CouponDiscount', $coupon_discount);
+		}
+
+		/**
+		 * Returns exising order item data, based on operation details
+		 *
+		 * @param Array $operation
+		 * @return Array
+		 */
+		protected function getOrderItemByOperation($operation)
+		{
+			if ( $operation['OrderItemId'] ) {
+				$where_clause = Array (
+					'OrderItemId = ' . $operation['OrderItemId'],
+				);
+			}
+			else {
+				$where_clause = Array (
+					'OrderId = ' . $this->order->GetID(),
+					'ProductId = ' . $operation['ProductId'],
+					'BackOrderFlag ' . ($operation['BackOrderFlag'] ? ' >= 1' : ' = 0'),
+					'OptionsSalt = ' . $operation['OptionsSalt'],
+				);
+			}
+
+			$sql = 'SELECT OrderItemId, Quantity, FlatPrice, Price, BackOrderFlag, ItemData
+					FROM ' . $this->getTable('orditems') . '
+					WHERE (' . implode(') AND (', $where_clause) . ')';
+
+			return $this->Conn->GetRow($sql);
+		}
+
+		/**
+		 * Checks, that there are no database changes required to order item from operation
+		 *
+		 * @param Array $item
+		 * @param Array $operation
+		 * @return bool
+		 */
+		protected function noChangeRequired($item, $operation)
+		{
+			$item_data = $item['ItemData'] ? unserialize( $item['ItemData'] ) : Array ();
+
+			$conditions = Array (
+				$operation['Quantity'] > 0,
+				$item['Quantity'] == $operation['Quantity'],
+				round($item['FlatPrice'], 3) == round($operation['Price'], 3),
+				round($item['Price'], 3) == round($operation['DiscountInfo'][2], 3),
+				(string)getArrayValue($item_data, 'DiscountType') == $operation['DiscountInfo'][1],
+				(int)getArrayValue($item_data, 'DiscountId') == $operation['DiscountInfo'][0],
+			);
+
+			foreach ($conditions as $condition) {
+				if (!$condition) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		/**
+		 * Returns product name by id
+		 *
+		 * @param int $product_id
+		 * @param string $field
+		 * @return string
+		 */
+		protected function getProductField($product_id, $field)
+		{
+			/** @var kCatDBItem $product */
+			$product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
+
+			if ( !$product->isLoaded() || ($product->GetID() != $product_id) ) {
+				$product->Load($product_id);
+			}
+
+			return $field == 'Name' ? $product->GetField($field) : $product->GetDBField($field);
+		}
+
+		/**
+		 * Returns table name according to order temp mode
+		 *
+		 * @param string $prefix
+		 * @return string
+		 */
+		public function getTable($prefix)
+		{
+			$table_name = $this->Application->getUnitOption($prefix, 'TableName');
+
+			if ( $this->order->IsTempTable() ) {
+				return $this->Application->GetTempName($table_name, 'prefix:' . $this->order->Prefix);
+			}
+
+			return $table_name;
+		}
+
+		/**
+		 * Adds product to order
+		 *
+		 * @param kCatDBItem $product
+		 * @param string $item_data
+		 * @param int $qty
+		 * @param int $package_num
+		 */
+		public function addProduct(&$product, $item_data, $qty = null, $package_num = null)
+		{
+			if ( !isset($qty) ) {
+				$qty = 1;
+			}
+
+			$item = $this->getItemFromProduct($product, $item_data);
+			$order_item = $this->getOrderItem($item);
+
+			if ( $this->calculator->canBeGrouped($item, $item) && $order_item ) {
+				$qty += $order_item['Quantity'];
+			}
+
+			$item['OrderItemId'] = $order_item ? $order_item['OrderItemId'] : 0;
+
+			if ( isset($package_num) ) {
+				$item['PackageNum'] = $package_num;
+			}
+
+			$this->calculator->addProduct($item, $product, $qty);
+			$this->applyOperations();
+		}
+
+		/**
+		 * Returns virtual $item based on given product
+		 *
+		 * @param kCatDBItem $product
+		 * @param string $item_data
+		 * @return Array
+		 */
+		protected function getItemFromProduct(&$product, $item_data)
+		{
+			$item_data_array = unserialize($item_data);
+
+			$options = isset($item_data_array['Options']) ? $item_data_array['Options'] : false;
+			$options_salt = $options ? $this->calculator->generateOptionsSalt($options) : 0;
+
+			$item = Array (
+				'ProductId' => $product->GetID(),
+				'OptionsSalt' => $options_salt,
+				'ItemData' => $item_data,
+				'Type' => $product->GetDBField('Type'),
+				'OrderItemId' => 0,
+			);
+
+			return $item;
+		}
+
+		/**
+		 * Returns OrderItem formed from $item
+		 *
+		 * @param Array $item
+		 * @return Array
+		 */
+		protected function getOrderItem($item)
+		{
+			$where_clause = Array (
+				'OrderId = ' . $this->order->GetID(),
+				'ProductId = ' . $item['ProductId'],
+			);
+
+			if ( $item['OptionsSalt'] ) {
+				$where_clause[] = 'OptionsSalt = ' . $item['OptionsSalt'];
+			}
+
+			$sql = 'SELECT Quantity, OrderItemId
+					FROM ' . $this->getTable('orditems') . '
+					WHERE (' . implode(') AND (', $where_clause) . ')';
+
+			return $this->Conn->GetRow($sql);
+		}
+	}

Property changes on: releases/5.2.2-B2/units/orders/order_manager.php
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/orders/orders_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/orders/orders_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/orders/orders_tag_processor.php	(revision 16630)
@@ -0,0 +1,1692 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class OrdersTagProcessor extends kDBTagProcessor
+	{
+
+		/**
+		 * Print location using only filled in fields
+		 *
+		 * @param Array $params
+		 * @access public
+		 */
+		function PrintLocation($params)
+		{
+			$object = $this->getObject($params);
+
+			$type = getArrayValue($params,'type');
+			if($type == 'Company')
+			{
+				return $this->PrintCompanyLocation($params);
+			}
+			$fields = Array('City','State','Zip','Country');
+
+			$ret = '';
+			foreach($fields as $field)
+			{
+				$value = $object->GetField($type.$field);
+				if ($field == 'Country' && $value) $ret .= '<br/>';
+				if($value) $ret .= $value.', ';
+			}
+			return rtrim($ret,', ');
+		}
+
+		function PrintCompanyLocation($params)
+		{
+			$ret = '';
+			$fields = Array ('City','State','ZIP','Country');
+
+			foreach ($fields as $field) {
+				$value = $this->Application->ConfigValue('Comm_'.$field);
+				if ($field == 'Country') {
+					$current_language = $this->Application->GetVar('m_lang');
+					$primary_language = $this->Application->GetDefaultLanguageId();
+
+					$sql = 'SELECT IF(l' . $current_language . '_Name = "", l' . $primary_language . '_Name, l' . $current_language . '_Name)
+							FROM ' . TABLE_PREFIX . 'CountryStates
+							WHERE IsoCode = ' . $this->Conn->qstr($value);
+					$value = $this->Conn->GetOne($sql);
+				}
+
+				if ($field == 'Country' && $value) {
+					$ret .= '<br/>';
+				}
+
+				if ($value) {
+					$ret .= $value.', ';
+				}
+			}
+
+			return rtrim($ret,', ');
+		}
+
+		function Orditems_LinkRemoveFromCart($params)
+		{
+			$params['m_cat_id'] = 0;
+			$params['ord_event'] = 'OnRemoveFromCart';
+
+			if ( !isset($params['pass']) ) {
+				$params['pass'] = 'm,orditems,ord';
+			}
+
+			// Remove parameters, that indicate from where this aggregated tag was called.
+			unset($params['PrefixSpecial'], $params['original_tag']);
+
+			return $this->Application->ProcessParsedTag('m', 'Link', $params);
+		}
+
+		function Orderitems_ProductLink($params)
+		{
+			$object = $this->Application->recallObject('orditems');
+
+			$url_params = Array (
+				'p_id' =>  $object->GetDBField('ProductId'),
+				'pass' => 'm,p',
+			);
+
+			return $this->Application->HREF($params['template'], '', $url_params);
+		}
+
+		function Orderitems_ProductExists($params)
+		{
+			$object = $this->Application->recallObject('orditems');
+			return $object->GetDBField('ProductId') > 0;
+		}
+
+		function PrintCart($params)
+		{
+			$o = '';
+
+			$params['render_as'] = $params['item_render_as'];
+			$tag_params = array_merge($params, Array ('per_page' => -1));
+
+			$o_items = $this->Application->ProcessParsedTag(rtrim('orditems.' . $this->Special, '.'), 'PrintList', $tag_params);
+
+			if ( $o_items ) {
+				if ( isset($params['header_render_as']) ) {
+					$cart_params = array ('name' => $params['header_render_as']);
+					$o .= $this->Application->ParseBlock($cart_params);
+				}
+
+				$o .= $o_items;
+
+				if ( isset($params['footer_render_as']) ) {
+					$cart_params = array ('name' => $params['footer_render_as']);
+					$o .= $this->Application->ParseBlock($cart_params);
+				}
+			}
+			elseif ( isset($params['empty_cart_render_as']) ) {
+				$cart_params = array ('name' => $params['empty_cart_render_as']);
+				$o = $this->Application->ParseBlock($cart_params);
+			}
+
+			return $o;
+		}
+
+		function ShopCartForm($params)
+		{
+			return $this->Application->ProcessParsedTag('m', 'ParseBlock', 	array_merge($params, Array(
+					'name' => 'kernel_form', 'PrefixSpecial'=>'ord'
+			)) );
+		}
+
+		function BackOrderFlag($params)
+		{
+			$object = $this->Application->recallObject('orditems');
+			return $object->GetDBField('BackOrderFlag');
+		}
+
+		function OrderIcon($params)
+		{
+			$object = $this->Application->recallObject('orditems');
+			if ($object->GetDBField('BackOrderFlag') == 0) {
+				return $params['ordericon'];
+			} else {
+				return $params['backordericon'];
+			}
+		}
+
+		function Status($params)
+		{
+			$status_map = Array(
+				'incomplete' => ORDER_STATUS_INCOMPLETE,
+				'pending' => ORDER_STATUS_PENDING,
+				'backorder' => ORDER_STATUS_BACKORDERS,
+				'toship' => ORDER_STATUS_TOSHIP,
+				'processed' => ORDER_STATUS_PROCESSED,
+				'denied' => ORDER_STATUS_DENIED,
+				'archived' => ORDER_STATUS_ARCHIVED,
+			);
+
+			$object = $this->getObject($params);
+			$status = $object->GetDBField('Status');
+
+			$result = true;
+			if (isset($params['is'])) {
+				$result = $result && ($status == $status_map[$params['is']]);
+			}
+			if (isset($params['is_not'])) {
+				$result = $result && ($status != $status_map[$params['is_not']]);
+			}
+			return $result;
+		}
+
+		function ItemsInCart($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			if ( $object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID ) {
+				return 0;
+			}
+
+			/** @var kDBList $object */
+			$object = $this->Application->recallObject('orditems', 'orditems_List');
+
+			$object->Query();
+
+			return array_sum($object->GetCol('Quantity')); // $object->GetRecordsCount();
+		}
+
+		function CartNotEmpty($params)
+		{
+			$object = $this->getObject($params);
+
+			if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID) {
+				return 0;
+			}
+
+			$order_id = $this->Application->RecallVar('ord_id');
+			if ($order_id) {
+				$sql = 'SELECT COUNT(*)
+						FROM ' . TABLE_PREFIX . 'OrderItems
+						WHERE OrderId = ' . $order_id;
+				return $this->Conn->GetOne($sql);
+			}
+
+			return 0;
+		}
+
+		function CartIsEmpty($params)
+		{
+			return $this->CartNotEmpty($params) ? false : true;
+		}
+
+		function CartHasBackorders($params = Array ())
+		{
+			$object = $this->getObject($params);
+
+			$sql = 'SELECT COUNT(*)
+					FROM ' . TABLE_PREFIX . 'OrderItems
+					WHERE OrderId = ' . $object->GetID() . '
+					GROUP BY BackOrderFlag';
+			$different_types = $this->Conn->GetCol($sql);
+
+			return count($different_types) > 1;
+		}
+
+		function PrintShippings($params)
+		{
+			$o = '';
+			$limitations_cache = Array ();
+
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$ord_id = $object->GetID();
+			$oi_table = $this->Application->getUnitOption('orditems', 'TableName');
+
+			if ( $object->IsTempTable() ) {
+				$oi_table = $this->Application->GetTempName($oi_table, 'prefix:' . $object->Prefix);
+			}
+
+			list ($split_shipments, $limit_types) = $this->GetShippingLimitations($ord_id);
+
+			foreach ($split_shipments as $group => $data) {
+				$sql = 'UPDATE ' . $oi_table . '
+						SET SplitShippingGroup = ' . $group . '
+						WHERE ProductId IN (' . implode(',', $data['Products']) . ')';
+				$this->Conn->Query($sql);
+
+				$limitations_cache[$group] = $data['Types'];
+			}
+
+
+			$shipping_group_option = $object->GetDBField('ShippingGroupOption');
+			$shipping_group_select = $shipping_group_option == ORDER_GROUP_SHIPPMENTS_AUTO ? '0' : 'oi.SplitShippingGroup';
+
+			if ( count($split_shipments) > 1 ) {
+				// different shipping limitations apply
+				$this->Application->SetVar('shipping_limitations_apply', 1);
+
+				if ( $limit_types == 'NONE' ) {
+					// order can't be shipped with single shipping type
+					$shipping_group_option = ORDER_GROUP_SHIPPMENTS_MANUAL;
+					$shipping_group_select = 'oi.SplitShippingGroup';
+					$this->Application->SetVar('shipping_limitations_apply', 2);
+				}
+			}
+			else {
+				$this->Application->SetVar('shipping_limitations_apply', 0);
+			}
+
+
+
+
+			$shipping_option = $object->GetDBField('ShippingOption');
+
+			$weight_sql = 'IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity)';
+
+			$sql = 'SELECT
+						' . ($shipping_option == ORDER_SHIP_ALL_TOGETHER ? '0' : 'oi.BackOrderFlag') . ' AS BackOrderFlagCalc,
+						oi.ProductName,
+						oi.ShippingTypeId,
+
+						SUM(oi.Quantity) AS TotalItems,
+						SUM(' . $weight_sql . ') AS TotalWeight,
+						SUM(oi.Price * oi.Quantity) AS TotalAmount,
+
+						SUM(oi.Quantity) - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, oi.Quantity, 0)) AS TotalItemsPromo,
+						SUM(' . $weight_sql . ') - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, ' . $weight_sql . ', 0)) AS TotalWeightPromo,
+						SUM(oi.Price * oi.Quantity) - SUM(IF(p.MinQtyFreePromoShipping > 0 AND p.MinQtyFreePromoShipping <= oi.Quantity, oi.Price * oi.Quantity, 0)) AS TotalAmountPromo,
+
+						' . $shipping_group_select . ' AS SplitShippingGroupCalc
+					FROM ' . $oi_table . ' oi
+					LEFT JOIN ' . TABLE_PREFIX . 'Products p ON oi.ProductId = p.ProductId
+					WHERE oi.OrderId = ' . $ord_id . ' AND p.Type = ' . PRODUCT_TYPE_TANGIBLE . '
+					GROUP BY BackOrderFlagCalc, SplitShippingGroupCalc
+					ORDER BY BackOrderFlagCalc ASC, SplitShippingGroupCalc ASC';
+			$shipments = $this->Conn->Query($sql);
+
+
+
+
+
+
+			$block_params = Array ();
+			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
+			$block_params['user_country_id'] = $object->GetDBField('ShippingCountry');
+			$block_params['user_state_id'] = $object->GetDBField('ShippingState');
+			$block_params['user_zip'] = $object->GetDBField('ShippingZip');
+			$block_params['user_city'] = $object->GetDBField('ShippingCity');
+			$block_params['user_addr1'] = $object->GetDBField('ShippingAddress1');
+			$block_params['user_addr2'] = $object->GetDBField('ShippingAddress2');
+			$block_params['user_name'] = $object->GetDBField('ShippingTo');
+
+			$group = 1;
+			foreach ($shipments as $shipment) {
+				$where = Array ('OrderId = ' . $ord_id);
+
+				if ( $shipping_group_option == ORDER_GROUP_SHIPPMENTS_MANUAL ) {
+					$where[] = 'SplitShippingGroup = ' . $shipment['SplitShippingGroupCalc'];
+				}
+
+				if ( $shipping_option != ORDER_SHIP_ALL_TOGETHER ) {
+					$where[] = 'BackOrderFlag = ' . $shipment['BackOrderFlagCalc'];
+				}
+
+				$sql = 'UPDATE ' . $oi_table . '
+						SET PackageNum = ' . $group . '
+						WHERE ' . implode(' AND ', $where);
+				$this->Conn->Query($sql);
+
+				$group++;
+			}
+
+
+			$group = 1;
+			$this->Application->RemoveVar('LastShippings');
+			$this->Application->SetVar('ShipmentsExists', 1);
+
+			foreach ($shipments as $shipment) {
+				$block_params['package_num'] = $group;
+				$block_params['limit_types'] = $shipping_group_option == ORDER_GROUP_SHIPPMENTS_AUTO ? $limit_types : $limitations_cache[ $shipment['SplitShippingGroupCalc'] ];
+
+				$this->Application->SetVar('ItemShipmentsExists', 1); // also set from Order_PrintShippingTypes tag
+
+				switch ( $shipment['BackOrderFlagCalc'] ) {
+					case 0:
+						if ( $this->CartHasBackOrders() && $shipping_option == ORDER_SHIP_ALL_TOGETHER ) {
+							$block_params['shipment'] = $this->Application->Phrase('lu_all_available_backordered');
+						}
+						else {
+							$block_params['shipment'] = $this->Application->Phrase('lu_ship_all_available');;
+						}
+						break;
+
+					case 1:
+						$block_params['shipment'] = $this->Application->Phrase('lu_ship_all_backordered');;
+						break;
+
+					default:
+						$block_params['shipment'] = $this->Application->Phrase('lu_ship_backordered');
+						break;
+				}
+
+				$block_params['promo_weight_metric'] = $shipment['TotalWeightPromo'];
+				$block_params['promo_amount'] = $shipment['TotalAmountPromo'];
+				$block_params['promo_items'] = $shipment['TotalItemsPromo'];
+
+				$block_params['weight_metric'] = $shipment['TotalWeight'];
+				$block_params['weight'] = $shipment['TotalWeight'];
+
+				if ( $block_params['weight_metric'] == '' ) {
+					$block_params['weight'] = $this->Application->Phrase('lu_NotAvailable');
+				}
+				else {
+					$block_params['weight'] = $this->_formatWeight( $block_params['weight'] );
+				}
+
+
+				$block_params['items'] = $shipment['TotalItems'];
+
+				$amount = $this->ConvertCurrency($shipment['TotalAmount'], $this->GetISO( $params['currency'] ));
+				$amount = sprintf("%.2f", $amount);
+
+				$block_params['amount'] = $shipment['TotalAmount'];
+				$block_params['field_name'] = $this->InputName( Array('field' => 'ShippingTypeId') ) . '[' . $group . ']';
+
+				$parsed_block = $this->Application->ParseBlock($block_params);
+
+				if ( $this->Application->GetVar('ItemShipmentsExists') ) {
+					$o .= $parsed_block;
+				}
+				else {
+					$this->Application->SetVar('ShipmentsExists', 0);
+
+					if ( getArrayValue($params, 'no_shipments_render_as') ) {
+						$block_params['name'] = $params['no_shipments_render_as'];
+
+						return $this->Application->ParseBlock($block_params);
+					}
+				}
+
+				$group++;
+			}
+
+			if ( getArrayValue($params, 'table_header_render_as') ) {
+				$o = $this->Application->ParseBlock(Array ('name' => $params['table_header_render_as'])) . $o;
+			}
+
+			if ( getArrayValue($params, 'table_footer_render_as') ) {
+				$o .= $this->Application->ParseBlock(Array ('name' => $params['table_footer_render_as']));
+			}
+
+			return $o;
+		}
+
+		/**
+		 * Checks, that all given address fields are valid
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function AddressValid($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$address_type = isset($params['type']) ? strtolower($params['type']) : 'shipping';
+			$address_type = ucfirst($address_type);
+
+			$check_fields = Array ('Address1', 'City', 'Zip', 'Country');
+
+			foreach ($check_fields as $check_field) {
+				if ( $object->GetDBField($address_type . $check_field) == '' ) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		function GetShippingLimitations($ord_id)
+		{
+			$limit_types = false;
+			$types_index = $split_shipments = $cat_limitations = Array ();
+
+			$sql = 'SELECT p.ShippingLimitation, p.ShippingMode, oi.ProductId AS ProductId
+					FROM ' . TABLE_PREFIX . 'Products p
+					LEFT JOIN ' . TABLE_PREFIX . 'OrderItems AS oi ON oi.ProductId = p.ProductId
+					WHERE oi.OrderId = ' . $ord_id . ' AND p.Type = ' . PRODUCT_TYPE_TANGIBLE;
+			$limitations = $this->Conn->Query($sql, 'ProductId');
+
+			// group products by shipping type range and calculate intersection of all types available for ALL products
+			// the intersection calculation is needed to determine if the order can be shipped with single type or not
+
+			if ($limitations) {
+				foreach ($limitations as $product_id => $row) {
+					// if shipping types are limited - get the types
+					$types = $row['ShippingLimitation'] != '' ? explode('|', substr($row['ShippingLimitation'], 1, -1)) : Array ('ANY');
+
+					// if shipping is NOT limited to selected types (default - so products with no limitations at all also counts)
+					if ($row['ShippingMode'] == PRODUCT_SHIPPING_MODE_ANY_AND_SELECTED) {
+						array_push($types, 'ANY'); // can be shipped with ANY (literally) type
+						$types = array_unique($types);
+					}
+
+					//adding product id to split_shipments group by types range
+					$i = array_search(serialize($types), $types_index);
+					if ($i === false) {
+						$types_index[] = serialize($types);
+						$i = count($types_index) - 1;
+					}
+
+					$split_shipments[$i]['Products'][] = $product_id;
+					$split_shipments[$i]['Types'] = serialize($types);
+
+					if ($limit_types === false) {
+						// it is false only when we process first item with limitations
+						$limit_types = $types; // initial scope
+					}
+
+					// this is to avoid ANY intersect CUST_1 = (), but allows ANY intersect CUST_1,ANY = (ANY)
+					if ( in_array('ANY', $limit_types) && !in_array('ANY', $types) ) {
+						array_splice($limit_types, array_search('ANY', $limit_types), 1, $types);
+					}
+
+					// this is to avoid CUST_1 intersect ANY = (), but allows CUST_1 intersect CUST_1,ANY = (ANY)
+					if ( !in_array('ANY', $limit_types) && in_array('ANY', $types) ) {
+						array_splice($types, array_search('ANY', $types), 1, $limit_types);
+					}
+
+					$limit_types = array_intersect($limit_types, $types);
+				}
+
+				$limit_types = count($limit_types) > 0 ? serialize(array_unique($limit_types)) : 'NONE';
+			}
+
+			return Array ($split_shipments, $limit_types);
+		}
+
+		function PaymentTypeForm($params)
+		{
+			$object = $this->getObject($params);
+
+			$payment_type_id = $object->GetDBField('PaymentType');
+			if($payment_type_id)
+			{
+				$this->Application->SetVar('pt_id', $payment_type_id);
+				$block_params['name'] = $this->SelectParam($params, $this->UsingCreditCard($params) ? 'cc_render_as,block_cc' : 'default_render_as,block_default' );
+				return $this->Application->ParseBlock($block_params);
+			}
+			return '';
+		}
+
+		/**
+		 * Returns true in case if credit card was used as payment type for order.
+		 *
+		 * @param array $params Tag params.
+		 *
+		 * @return boolean
+		 * @throws Exception When payment type not found.
+		 */
+		protected function UsingCreditCard(array $params)
+		{
+			static $payment_types;
+
+			if ( !isset($payment_types) ) {
+				$pt_table = $this->Application->getUnitOption('pt', 'TableName');
+				$sql = 'SELECT g.RequireCCFields, pt.PaymentTypeId
+					FROM ' . $pt_table . ' pt
+					JOIN ' . TABLE_PREFIX . 'Gateways g ON g.GatewayId = pt.GatewayId';
+
+				$payment_types = $this->Conn->GetCol($sql, 'PaymentTypeId');
+			}
+
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+			$payment_type = $object->GetDBField('PaymentType');
+
+			if ( !$payment_type ) {
+				$payment_type = $this->getPrimaryPaymentType();
+				$object->SetDBField('PaymentType', $payment_type);
+			}
+
+			if ( !isset($payment_types[$payment_type]) ) {
+				throw new Exception('Unknown payment type: ' . $payment_type);
+			}
+
+			return $payment_types[$payment_type];
+		}
+
+		/**
+		 * Get primary payment type.
+		 *
+		 * @return string
+		 */
+		protected function getPrimaryPaymentType()
+		{
+			static $primary_payment_type;
+
+			if ( !isset($primary_payment_type) ) {
+				$pt_table = $this->Application->getUnitOption('pt', 'TableName');
+				$sql = 'SELECT PaymentTypeId FROM ' . $pt_table . ' WHERE IsPrimary = 1';
+				$primary_payment_type = $this->Conn->GetOne($sql);
+			}
+
+			return $primary_payment_type;
+		}
+
+		function PaymentTypeDescription($params)
+		{
+			return $this->Application->ProcessParsedTag('pt', 'Field', 	array_merge($params, Array(
+					'field' => 'Description'
+			)) );
+		}
+
+		function PaymentTypeInstructions($params)
+		{
+			return $this->Application->ProcessParsedTag('pt', 'Field', 	array_merge($params, Array(
+					'field' => 'Instructions'
+			)) );
+		}
+
+		function PrintMonthOptions($params)
+		{
+			$object = $this->getObject($params);
+
+			$date = explode('/', $object->GetDBField($params['date_field_name']));
+			if (!$date || sizeof($date) != 2) {
+				$date=array("", "");
+			}
+			$o = '';
+			$params['name'] = $params['block'];
+			for ($i = 1; $i <= 12; $i++) {
+				$month_str = str_pad($i, 2, "0", STR_PAD_LEFT);
+				if ($date[0] == $month_str) {
+					$params['selected'] = ' selected';
+				}else {
+					$params['selected'] = '';
+				}
+
+				$params['mm'] = $month_str;
+				$o .= $this->Application->ParseBlock($params);
+			}
+			return $o;
+		}
+
+		function PrintYearOptions($params)
+		{
+			$object = $this->getObject($params);
+			$value = $object->GetDBField( $params['field'] );
+
+			$block_params = $this->prepareTagParams($params);
+			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
+
+			$o = '';
+			$this_year = adodb_date('y');
+
+			for($i = $this_year; $i <= $this_year + 10; $i++)
+			{
+				$year_str = str_pad($i, 2, '0', STR_PAD_LEFT);
+				$block_params['selected'] = ($value == $year_str) ? $params['selected'] : '';
+				$block_params['key'] = $year_str;
+				$block_params['option'] = $year_str;
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+			return $o;
+		}
+
+		function PrintMyOrders($params)
+		{
+
+		}
+
+		/**
+		 * Checks, that order data can be editied based on it's status
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function OrderEditable($params)
+		{
+			$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
+			$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+			if ($this->Application->IsTempMode($this->Prefix, $this->Special)) {
+				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+			}
+
+			// use direct select here (not $this->getObject) because this tag is
+			// used even before "combined_header" block is used (on "orders_edit_items" template)
+			$sql = 'SELECT Status, PaymentType
+					FROM ' . $table_name . '
+					WHERE ' . $id_field . ' = ' . $this->Application->GetVar( $this->getPrefixSpecial() . '_id' );
+			$order_data = $this->Conn->GetRow($sql);
+
+			if (!$order_data) {
+				// new order adding, when even not in database
+				return true;
+			}
+
+			switch ($order_data['Status']) {
+				case ORDER_STATUS_INCOMPLETE:
+					$ret = true;
+					break;
+
+				case ORDER_STATUS_PENDING:
+				case ORDER_STATUS_BACKORDERS:
+					$sql = 'SELECT PlacedOrdersEdit
+							FROM ' . $this->Application->getUnitOption('pt', 'TableName') . '
+							WHERE ' . $this->Application->getUnitOption('pt', 'IDField') . ' = ' . $order_data['PaymentType'];
+					$ret = $this->Conn->GetOne($sql);
+					break;
+
+				default:
+					$ret = false;
+					break;
+			}
+
+			return $ret;
+		}
+
+		function CheckoutSteps($params)
+		{
+			$steps = explode(',', $params['steps']);
+			foreach ($steps as $key => $item)
+			{
+				$templates[$key] = trim($item);
+			}
+
+			$templates = explode(',', $params['templates']);
+			foreach ($templates as $key => $item)
+			{
+				$templates[$key] = trim($item);
+			}
+			$total_steps = count($templates);
+			$t = $this->Application->GetVar('t');
+
+			$o = '';
+			$block_params = array();
+			$i = 0;
+			$passed_current = preg_match("/".preg_quote($templates[count($templates)-1], '/')."/", $t);
+			foreach ($steps as $step => $name)
+			{
+				if (preg_match("/".preg_quote($templates[$step], '/')."/", $t)) {
+					$block_params['name'] = $this->SelectParam($params, 'current_step_render_as,block_current_step');
+					$passed_current = true;
+				}
+				else {
+					$block_params['name'] = $passed_current ? $this->SelectParam($params, 'render_as,block') : $this->SelectParam($params, 'passed_step_render_as,block_passed_step');
+				}
+				$block_params['title'] = $this->Application->Phrase($name);
+				$block_params['template'] = $templates[$i];
+				$block_params['template_link'] = $this->Application->HREF($templates[$step], '', Array('pass'=>'m'));
+				$block_params['next_step_template'] = isset($templates[$i + 1]) ? $templates[$i + 1] : '';
+				$block_params['number'] = $i + 1;
+				$i++;
+				$o.= $this->Application->ParseBlock($block_params, 1);
+			}
+			return $o;
+		}
+
+		function ShowOrder($params)
+		{
+
+			$order_params = $this->prepareTagParams($params);
+//			$order_params['Special'] = 'myorders';
+//			$order_params['PrefixSpecial'] = 'ord.myorders';
+			$order_params['name'] = $this->SelectParam($order_params, 'render_as,block');
+//			$this->Application->SetVar('ord.myorders_id', $this->Application->GetVar('ord_id'));
+
+			$object = $this->getObject($params);
+			if (!$object->GetDBField('OrderId')) {
+				return;
+			}
+			return $this->Application->ParseBlock($order_params);
+		}
+
+		function BuildListSpecial($params)
+		{
+			if ($this->Special != '') {
+				return $this->Special;
+			}
+
+			$list_unique_key = $this->getUniqueListKey($params);
+			if ($list_unique_key == '') {
+				return parent::BuildListSpecial($params);
+			}
+
+			return crc32($list_unique_key);
+		}
+
+		function ListOrders($params)
+		{
+			$o = '';
+			$params['render_as'] = $params['item_render_as'];
+
+			$o_orders = $this->PrintList2($params);
+
+			if ($o_orders) {
+				$orders_params = array('name' => $params['header_render_as']);
+				$o  = $this->Application->ParseBlock($orders_params);
+				$o .= $o_orders;
+
+			} else {
+				$orders_params = array('name' => $params['empty_myorders_render_as']);
+				$o = $this->Application->ParseBlock($orders_params);
+			}
+
+			return $o;
+
+		}
+
+		function HasRecentOrders($params)
+		{
+			$per_page = $this->SelectParam($params, 'per_page,max_items');
+			if ($per_page !== false) {
+				$params['per_page'] = $per_page;
+			}
+
+			return (int)$this->TotalRecords($params) > 0 ? 1 : 0;
+		}
+
+		function ListOrderItems($params)
+		{
+			$prefix_special = rtrim('orditems.'.$this->Special, '.');
+			return $this->Application->ProcessParsedTag($prefix_special, 'PrintList', 	array_merge($params, Array(
+					'per_page' => -1
+			)) );
+		}
+
+
+		function OrdersLink(){
+			$params['pass']='m,ord';
+			$main_processor = $this->Application->recallObject('m_TagProcessor');
+			return $main_processor->Link($params);
+		}
+
+
+
+		function PrintAddresses($params)
+		{
+			$object = $this->getObject($params);
+
+			$address_list = $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
+			$address_list->Query();
+
+			$address_id = $this->Application->GetVar($params['type'].'_address_id');
+			if (!$address_id) {
+				$sql = 'SELECT '.$address_list->IDField.'
+						FROM '.$address_list->TableName.'
+						WHERE PortalUserId = '.$object->GetDBField('PortalUserId').' AND LastUsedAs'.ucfirst($params['type']).' = 1';
+				$address_id = (int)$this->Conn->GetOne($sql);
+			}
+
+			$ret = '';
+			$block_params = $this->prepareTagParams($params);
+			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
+
+			$address_list->GoFirst();
+			while (!$address_list->EOL()) {
+
+				$selected = ($address_list->GetID() == $address_id);
+				if ($selected && $address_list->GetDBField('IsProfileAddress')) {
+					$this->Application->SetVar($this->Prefix.'_IsProfileAddress', true);
+				}
+
+				$block_params['key'] = $address_list->GetID();
+				$block_params['value'] = $address_list->GetDBField('ShortAddress');
+				$block_params['selected'] = $selected ? ' selected="selected"' : '';
+
+				$ret .= $this->Application->ParseBlock($block_params, 1);
+				$address_list->GoNext();
+			}
+
+			return $ret;
+		}
+
+		function PrefillRegistrationFields($params)
+		{
+			if ( $this->Application->GetVar('fields_prefilled') ) {
+				return false;
+			}
+
+			if ( isset($params['user_prefix']) ) {
+				/** @var kDBItem $user */
+				$user = $this->Application->recallObject($params['user_prefix']);
+			}
+			else {
+				/** @var kDBItem $user */
+				$user = $this->Application->recallObject('u', null, Array ('skip_autoload' => true));
+			}
+
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject($this->Prefix . '.last');
+
+			/** @var OrderHelper $order_helper */
+			$order_helper = $this->Application->recallObject('OrderHelper');
+
+			$user_fields = $order_helper->getUserFields($order, $params['type'] == 'billing' ? 'Billing' : 'Shipping');
+
+			foreach ($user_fields as $field => $value) {
+				if ( !$user->GetDBField($field) ) {
+					$user->SetDBField($field, $value);
+				}
+			}
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$cs_helper->PopulateStates(new kEvent('u:OnBuild'), 'State', 'Country');
+		}
+
+		function UserLink($params)
+		{
+			$object = $this->getObject($params);
+			$user_id = $object->GetDBField( $params['user_field'] );
+
+			if ($user_id) {
+				$url_params =  Array (
+					'm_opener' => 'd',
+					'u_mode' => 't',
+					'u_event' => 'OnEdit',
+					'u_id' => $user_id,
+					'pass' => 'all,u',
+					'no_pass_through' => 1,
+				);
+
+				return $this->Application->HREF($params['edit_template'], '', $url_params);
+			}
+		}
+
+		function UserFound($params)
+		{
+			$virtual_users = Array(USER_ROOT, USER_GUEST, 0);
+			$object = $this->getObject($params);
+			return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users );
+		}
+
+		/**
+		 * Returns a link for editing order
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function OrderLink($params)
+		{
+			$object = $this->getObject($params);
+
+			$url_params = Array (
+				'm_opener' => 'd',
+				$this->Prefix.'_mode' => 't',
+				$this->Prefix.'_event' => 'OnEdit',
+				$this->Prefix.'_id' => $object->GetID(),
+				'pass' => 'all,'.$this->Prefix,
+				'no_pass_through' => 1,
+			);
+
+			return $this->Application->HREF($params['edit_template'], '', $url_params);
+		}
+
+		function HasOriginalAmount($params)
+		{
+			$object = $this->getObject($params);
+			$original_amount = $object->GetDBField('OriginalAmount');
+			return $original_amount && ($original_amount != $object->GetDBField('TotalAmount') );
+		}
+
+		/**
+		 * Returns true, when order has tangible items
+		 *
+		 * @param Array $params
+		 * @return bool
+		 *
+		 * @todo This is copy from OrdersItem::HasTangibleItems. Copy to helper (and create it) and use here.
+		 */
+		function OrderHasTangibleItems($params)
+		{
+			$object = $this->getObject($params);
+			if ($object->GetID() == FAKE_ORDER_ID) {
+				return false;
+			}
+
+			$sql = 'SELECT COUNT(*)
+					FROM '.TABLE_PREFIX.'OrderItems orditems
+					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = orditems.ProductId
+					WHERE (orditems.OrderId = '.$object->GetID().') AND (p.Type = '.PRODUCT_TYPE_TANGIBLE.')';
+			return $this->Conn->GetOne($sql) ? true : false;
+		}
+
+		function ShipmentsExists($params)
+		{
+			return $this->Application->GetVar('ShipmentsExists') ? 1 : 0;
+		}
+
+		function Field($params)
+		{
+			$value = parent::Field($params);
+			$field = $this->SelectParam($params,'name,field');
+			if( ($field == 'PaymentAccount') && getArrayValue($params,'masked') )
+			{
+				$value = str_repeat('X',12).substr($value,-4);
+			}
+			return $value;
+		}
+
+		function CartHasError($params)
+		{
+			return $this->Application->RecallVar('checkout_errors');
+		}
+
+		function CheckoutError($params)
+		{
+			$errors = $this->Application->RecallVar('checkout_errors');
+
+			if ( !$errors ) {
+				return '';
+			}
+
+			$this->Application->RemoveVar('checkout_errors');
+			$errors = unserialize($errors);
+
+			if ( isset($errors[OrderCheckoutErrorType::COUPON]) ) {
+				$mapping = Array (
+					OrderCheckoutError::COUPON_APPLIED => 'coupon_applied',
+					OrderCheckoutError::COUPON_REMOVED => 'code_removed',
+					OrderCheckoutError::COUPON_REMOVED_AUTOMATICALLY => 'code_removed_automatically',
+					OrderCheckoutError::COUPON_CODE_INVALID => 'invalid_code',
+					OrderCheckoutError::COUPON_CODE_EXPIRED => 'code_expired',
+				);
+
+				$error_phrase = $mapping[ $errors[OrderCheckoutErrorType::COUPON] ];
+			}
+			elseif ( isset($errors[OrderCheckoutErrorType::GIFT_CERTIFICATE]) ) {
+				$mapping = Array (
+					OrderCheckoutError::GC_APPLIED => 'gift_certificate_applied',
+					OrderCheckoutError::GC_REMOVED => 'gc_code_removed',
+					OrderCheckoutError::GC_REMOVED_AUTOMATICALLY => 'gc_code_removed_automatically',
+					OrderCheckoutError::GC_CODE_INVALID => 'invalid_gc_code',
+					OrderCheckoutError::GC_CODE_EXPIRED => 'gc_code_expired',
+
+				);
+
+				$error_phrase = $mapping[ $errors[OrderCheckoutErrorType::GIFT_CERTIFICATE] ];
+			}
+			else {
+				$mapping = Array (
+					OrderCheckoutError::QTY_UNAVAILABLE => 'qty_unavailable',
+					OrderCheckoutError::QTY_OUT_OF_STOCK => 'outofstock',
+					OrderCheckoutError::QTY_CHANGED_TO_MINIMAL => 'min_qty',
+				);
+
+				foreach ($errors as $error_type => $error_code) {
+					if ( isset($mapping[$error_code]) ) {
+						$error_phrase = $mapping[$error_code];
+						break;
+					}
+				}
+
+				if ( !isset($error_phrase) ) {
+					$error_phrase = 'state_changed'; // 'changed_after_login'
+				}
+			}
+
+			return $this->Application->Phrase( $params[$error_phrase] );
+		}
+
+		/**
+		 * Returns checkout errors in JSON format
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function PrintOrderInfo($params)
+		{
+			/** @var OrderHelper $order_helper */
+			$order_helper = $this->Application->recallObject('OrderHelper');
+
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$currency = isset($params['currency']) ? $params['currency'] : 'selected';
+
+			return json_encode( $order_helper->getOrderInfo($object, $currency) );
+		}
+
+		/**
+		 * Returns currency mark (%s is $amount placemark)
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function CurrencyMask($params)
+		{
+			$iso = $this->GetISO( $params['currency'] );
+
+			return $this->AddCurrencySymbol('%s', $iso);
+		}
+
+		function CheckoutErrorNew($params)
+		{
+			$errors = $this->Application->RecallVar('checkout_errors');
+
+			if ( !$errors ) {
+				return '';
+			}
+
+//			$this->Application->RemoveVar('checkout_errors');
+			$errors = unserialize($errors);
+
+			$reflection = new ReflectionClass('OrderCheckoutErrorType');
+			$error_types = $reflection->getConstants();
+
+			$reflection = new ReflectionClass('OrderCheckoutError');
+			$error_codes = $reflection->getConstants();
+
+			$ret = Array ();
+
+			foreach ($errors as $error_type => $error_code) {
+				$error_type = explode(':', $error_type);
+
+				$error_explained = '<strong>' . array_search($error_type[0], $error_types) . '</strong>';
+
+				if ( $error_type[0] == OrderCheckoutErrorType::PRODUCT ) {
+					$error_explained .= ' (ProductId = <strong>' . $error_type[1] . '</strong>; OptionsSalt: <strong>' . $error_type[2] . '</strong>; BackOrderFlag: ' . $error_type[3] . '; Field: <strong>' . $error_type[4] . '</strong>)';
+				}
+
+				$error_explained .= ' - <strong>' . array_search($error_code, $error_codes) . '</strong>';
+				$ret[] = $error_explained;
+			}
+
+			return implode('<br/>', $ret);
+		}
+
+		function GetFormAction($params)
+		{
+			/** @var OrdersItem $object */
+			$object = $this->getObject($params);
+
+			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
+
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+			return $gateway_object->getFormAction($gw_data['gw_params']);
+		}
+
+		function GetFormHiddenFields($params)
+		{
+			/** @var OrdersItem $object */
+			$object = $this->getObject($params);
+
+			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
+
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+			$tpl = '<input type="hidden" name="%s" value="%s" />'."\n";
+			$hidden_fields = $gateway_object->getHiddenFields($object->GetFieldValues(), $params, $gw_data['gw_params']);
+
+			if ( !is_array($hidden_fields) ) {
+				return $hidden_fields;
+			}
+
+			$ret = '';
+
+			foreach ($hidden_fields as $hidden_name => $hidden_value) {
+				$ret .= sprintf($tpl, $hidden_name, $hidden_value);
+			}
+
+			return $ret;
+		}
+
+		function NeedsPlaceButton($params)
+		{
+			/** @var OrdersItem $object */
+			$object = $this->getObject($params);
+
+			$gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null );
+
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+			return $gateway_object->NeedPlaceButton($object->GetFieldValues(), $params, $gw_data['gw_params']);
+		}
+
+		function HasGatewayError($params)
+		{
+			return $this->Application->RecallVar('gw_error');
+		}
+
+		function ShowGatewayError($params)
+		{
+			$ret = $this->Application->RecallVar('gw_error');
+			$this->Application->RemoveVar('gw_error');
+			return $ret;
+		}
+
+		function ShippingType($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$shipping_info = unserialize($object->GetDBField('ShippingInfo'));
+
+			if ( count($shipping_info) > 1 ) {
+				return $this->Application->Phrase('lu_MultipleShippingTypes');
+			}
+
+			if ( $shipping_info ) {
+				$shipping_info = array_shift($shipping_info);
+
+				return $shipping_info['ShippingName'];
+			}
+
+			return '';
+		}
+
+		function DiscountHelpLink($params)
+		{
+			$params['pass'] = 'all,orditems';
+			$params['m_cat_id'] = 0;
+			$m_tag_processor = $this->Application->recallObject('m_TagProcessor');
+			return $m_tag_processor->Link($params);
+		}
+
+		function DiscountField($params)
+		{
+			$orditems = $this->Application->recallObject( 'orditems' );
+			$item_data = $orditems->GetDBField('ItemData');
+			if(!$item_data) return '';
+			$item_data = unserialize($item_data);
+			$discount_prefix = ($item_data['DiscountType'] == 'coupon') ? 'coup' : 'd';
+
+			$discount = $this->Application->recallObject($discount_prefix, null, Array('skip_autoload' => true));
+			if(!$discount->isLoaded())
+			{
+				$discount->Load($item_data['DiscountId']);
+			}
+			return $discount->GetField( $this->SelectParam($params, 'field,name') );
+		}
+
+		function HasDiscount($params)
+		{
+			$object = $this->getObject($params);
+			return (float)$object->GetDBField('DiscountTotal') ? 1 : 0;
+		}
+
+		/**
+		 * Allows to check if required product types are present in order
+		 *
+		 * @param Array $params
+		 */
+		function HasProductType($params)
+		{
+			$product_types = Array('tangible' => 1, 'subscription' => 2, 'service' => 3, 'downloadable' => 4, 'package' => 5, 'gift' => 6);
+			$object = $this->getObject($params);
+
+			$sql = 'SELECT COUNT(*)
+					FROM '.TABLE_PREFIX.'OrderItems oi
+					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
+					WHERE (oi.OrderId = '.$object->GetID().') AND (p.Type = '.$product_types[ $params['type'] ].')';
+			return $this->Conn->GetOne($sql);
+		}
+
+		function PrintSerializedFields($params)
+		{
+			$object = $this->getObject($params);
+			$field = $this->SelectParam($params, 'field');
+			if (!$field) $field = $this->Application->GetVar('field');
+			$data = unserialize($object->GetDBField($field));
+
+			$o = '';
+			$block_params['name'] = $params['render_as'];
+			foreach ($data as $field => $value) {
+				$block_params['field'] = $field;
+				$block_params['value'] = $value;
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+			return $o;
+		}
+
+		/**
+		 * Prints order totals
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function PrintTotals($params)
+		{
+			/** @var OrdersItem $object */
+			$object = $this->getObject($params);
+
+			if ( isset($params['element_order']) ) {
+				// TODO: implement
+			}
+			else {
+				// default element order
+				$element_order = Array (
+					'products' => 1, 'return' => 4, 'sub_total' => 5, 'discount' => 6,
+					'vat' => 7, 'shipping' => 8, 'processing' => 9,
+				);
+
+				// show shipping & processing costs before tax, when they are taxable
+				if ( $object->GetDBField('ShippingTaxable') ) {
+					$element_order['shipping'] = 2;
+				}
+
+				if ( $object->GetDBField('ProcessingTaxable') ) {
+					$element_order['processing'] = 3;
+				}
+			}
+
+			$totals = Array ();
+
+			if ( abs($object->GetDBField('SubTotal') - $object->GetDBField('AmountWithoutVAT')) > 0.01 ) {
+				$totals[] = 'products';
+			}
+
+			if ( $this->OrderHasTangibleItems($params) ) {
+				$totals[] = 'shipping';
+			}
+
+			if ( $object->GetDBField('ProcessingFee') > 0 ) {
+				$totals[] = 'processing';
+			}
+
+			if ( $object->GetDBField('ReturnTotal') > 0 ) {
+				$totals[] = 'return';
+			}
+
+			if ( $this->HasDiscount($params) ) {
+				$totals[] = 'discount';
+			}
+
+			$totals[] = 'sub_total';
+
+			if ( $object->GetDBField('VAT') > 0 ) {
+				$totals[] = 'vat';
+			}
+
+			$o = '';
+			asort($element_order, SORT_NUMERIC);
+
+			$block_params = $this->prepareTagParams($params);
+
+			foreach ($element_order as $type => $order) {
+				$element = getArrayValue($params, $type . '_render_as');
+
+				if ( !in_array($type, $totals) || !$element ) {
+					continue;
+				}
+
+				$block_params['name'] = $element;
+
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+
+			return $o;
+		}
+
+		function ShowDefaultAddress($params)
+		{
+			$address_type = ucfirst($params['type']);
+			if ($this->Application->GetVar('check_'.strtolower($address_type).'_address')) {
+				// form type doesn't match check type, e.g. shipping check on billing form
+				return '';
+			}
+
+			// for required field highlighting on form when no submit made
+			$this->Application->SetVar('check_'.strtolower($address_type).'_address', 'true');
+			/*if ((strtolower($address_type) == 'billing') && $this->UsingCreditCard($params)) {
+				$this->Application->SetVar('check_credit_card', 'true');
+			}*/
+
+			$this->Application->HandleEvent(new kEvent('ord:SetStepRequiredFields'));
+
+			$user_id = $this->Application->RecallVar('user_id');
+			$sql = 'SELECT AddressId
+					FROM '.TABLE_PREFIX.'Addresses
+					WHERE PortalUserId = '.$user_id.' AND LastUsedAs'.$address_type.' = 1';
+			$address_id = $this->Conn->GetOne($sql);
+			if (!$address_id) {
+				return '';
+			}
+
+			$addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
+			$addr_list->Query();
+
+			$object = $this->getObject();
+			if (!$addr_list->CheckAddress($object->GetFieldValues(), $address_type)) {
+				$addr_list->CopyAddress($address_id, $address_type);
+			}
+		}
+
+		function IsProfileAddress($params)
+		{
+			$object = $this->getObject($params);
+			$address_type = ucfirst($params['type']);
+			return $object->IsProfileAddress($address_type);
+		}
+
+		function HasPayPalSubscription($params)
+		{
+			$object = $this->getObject($params);
+
+			$sql = 'SELECT COUNT(*)
+					FROM '.TABLE_PREFIX.'OrderItems oi
+					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
+					WHERE (oi.OrderId = '.$object->GetID().') AND (p.PayPalRecurring = 1)';
+			return $this->Conn->GetOne($sql);
+
+		}
+
+		function GetPayPalSubscriptionForm($params)
+		{
+			$object = $this->getObject($params);
+			$gw_data = $object->getGatewayData($params['payment_type_id']);
+
+			/** @var kGWBase $gateway_object */
+			$gateway_object = $this->Application->recallObject($gw_data['ClassName']);
+
+			$sql = 'SELECT oi.*
+					FROM '.TABLE_PREFIX.'OrderItems oi
+					LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
+					WHERE (oi.OrderId = '.$object->GetID().') AND (p.PayPalRecurring = 1)';
+			$order_item = $this->Conn->GetRow($sql);
+			$order_item_data =  unserialize($order_item['ItemData']);
+
+			$cycle = ceil($order_item_data['Duration'] / 86400);
+			$cycle_units = 'D';
+
+			$item_data = $object->GetFieldValues();
+			$item_data['item_name'] = $order_item['ProductName'];
+			$item_data['item_number'] = $order_item['OrderItemId'];
+			$item_data['custom'] = $order_item['OrderId'];
+			$item_data['a1'] = '';
+			$item_data['p1'] = '';
+			$item_data['t1'] = '';
+			$item_data['a2'] = '';
+			$item_data['p2'] = '';
+			$item_data['t2'] = '';
+			$item_data['a3'] = $order_item['Price']; //rate
+			$item_data['p3'] = $cycle; //cycle
+			$item_data['t3'] = $cycle_units; //cycle units D (days), W (weeks), M (months), Y (years)
+			$item_data['src'] = '1'; // Recurring payments. If set to 1, the payment will recur unless your customer cancels the subscription before the end of the billing cycle.
+			$item_data['sra'] = '1'; // Reattempt on failure. If set to 1, and the payment fails, the payment will be reattempted two more times. After the third failure, the subscription will be cancelled.
+			$item_data['srt'] = ''; // Recurring Times. This is the number of payments which will occur at the regular rate.
+
+			$hidden_fields = $gateway_object->getSubscriptionFields($item_data, $params, $gw_data['gw_params']);
+
+			$ret = '';
+			if (!is_array($hidden_fields)) {
+				return $hidden_fields;
+			}
+			$tpl = '<input type="hidden" name="%s" value="%s" />'."\n";
+			foreach($hidden_fields as $hidden_name => $hidden_value)
+			{
+				$ret .= sprintf($tpl, $hidden_name, $hidden_value);
+			}
+			return $ret;
+		}
+
+		function UserHasPendingOrders($params)
+		{
+			$sql = 'SELECT OrderId FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').'
+							WHERE PortalUserId = '.$this->Application->RecallVar('user_id').'
+							AND Status = '.ORDER_STATUS_PENDING;
+			return $this->Conn->GetOne($sql) ? 1 : 0;
+		}
+
+		function AllowAddAddress($params)
+		{
+			$user = $this->Application->recallObject('u.current');
+
+			if ($user->GetDBField('cust_shipping_addr_block')) return false;
+
+			$address_list = $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
+			$address_list->Query();
+
+			$max = $this->Application->ConfigValue('MaxAddresses');
+
+			return $max <= 0 ? true : $address_list->GetRecordsCount() < $max;
+		}
+
+		/**
+		 * Creates link for removing coupon or gift certificate
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function RemoveCouponLink($params)
+		{
+			if ( !isset($params['pass']) ) {
+				$params['pass'] = 'm,ord';
+			}
+
+			$params['m_cat_id'] = 0;
+
+			$link_type = $params['type'];
+			unset($params['type']);
+
+			$params['ord_event'] = strtolower($link_type) == 'coupon' ? 'OnRemoveCoupon' : 'OnRemoveGiftCertificate';
+
+			return $this->ItemLink($params);
+		}
+
+		/**
+		 * Calculates total weight of items in shopping cart
+		 *
+		 * @param Array $params
+		 * @return float
+		 */
+		function TotalOrderWeight($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$sql = 'SELECT SUM( IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity) )
+					FROM '.TABLE_PREFIX.'OrderItems oi
+					WHERE oi.OrderId = '.$object->GetID();
+			$total_weight = $this->Conn->GetOne($sql);
+
+			if ($total_weight == '') {
+				// zero weight -> return text about it
+				return $this->Application->Phrase('lu_NotAvailable');
+			}
+
+			return $this->_formatWeight($total_weight);
+		}
+
+		function _formatWeight($weight)
+		{
+			/** @var kDBItem $regional */
+			$regional = $this->Application->recallObject('lang.current');
+
+			switch ( $regional->GetDBField('UnitSystem') ) {
+				case 1:
+					// metric system -> add kg sign
+					$weight .= ' ' . $this->Application->Phrase('lu_kg');
+					break;
+
+				case 2:
+					// uk system -> convert to pounds
+					list ($pounds, $ounces) = kUtil::Kg2Pounds($weight);
+
+					$weight = $pounds . ' ' . $this->Application->Phrase('lu_pounds') . ' ' . $ounces . ' ' . $this->Application->Phrase('lu_ounces');
+					break;
+			}
+
+			return $weight;
+		}
+
+		function InitCatalogTab($params)
+		{
+			$tab_params['mode'] = $this->Application->GetVar('tm'); // single/multi selection possible
+			$tab_params['special'] = $this->Application->GetVar('ts'); // use special for this tab
+			$tab_params['dependant'] = $this->Application->GetVar('td'); // is grid dependant on categories grid
+
+			// set default params (same as in catalog)
+			if ($tab_params['mode'] === false) $tab_params['mode'] = 'multi';
+			if ($tab_params['special'] === false) $tab_params['special'] = '';
+			if ($tab_params['dependant'] === false) $tab_params['dependant'] = 'yes';
+
+			// pass params to block with tab content
+			$params['name'] = $params['render_as'];
+			$params['prefix'] = trim($this->Prefix.'.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
+			$params['cat_prefix'] = trim('c.'.($tab_params['special'] ? $tab_params['special'] : $this->Special), '.');
+			$params['tab_mode'] = $tab_params['mode'];
+			$params['grid_name'] = ($tab_params['mode'] == 'multi') ? $params['default_grid'] : $params['radio_grid'];
+			$params['tab_dependant'] = $tab_params['dependant'];
+			$params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name
+
+			// use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag
+			return $this->Application->ParseBlock($params, 1);
+		}
+
+		/**
+		 * Checks if required payment method is available
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function HasPaymentGateway($params)
+		{
+			static $payment_types = Array ();
+
+			$gw_name = $params['name'];
+			if (!array_key_exists($gw_name, $payment_types)) {
+				$sql = 'SELECT pt.PaymentTypeId, pt.PortalGroups
+						FROM '.TABLE_PREFIX.'PaymentTypes pt
+						LEFT JOIN '.TABLE_PREFIX.'Gateways g ON pt.GatewayId = g.GatewayId
+						WHERE (g.Name = '.$this->Conn->qstr($params['name']).') AND (pt.Status = '.STATUS_ACTIVE.')';
+				$payment_types[$gw_name] = $this->Conn->GetRow($sql);
+			}
+
+			if (!$payment_types[$gw_name]) {
+				return false;
+			}
+
+			$pt_groups = explode(',', substr($payment_types[$gw_name]['PortalGroups'], 1, -1));
+			$user_groups = explode(',', $this->Application->RecallVar('UserGroups'));
+
+			return array_intersect($user_groups, $pt_groups) ? $payment_types[$gw_name]['PaymentTypeId'] : false;
+		}
+
+		function DisplayPaymentGateway($params)
+		{
+			$payment_type_id = $this->HasPaymentGateway($params);
+			if (!$payment_type_id) {
+				return '';
+			}
+
+			/** @var OrdersItem $object */
+			$object = $this->getObject($params);
+
+			$gw_data = $object->getGatewayData($payment_type_id);
+
+			$block_params = $gw_data['gw_params'];
+			$block_params['name'] = $params['render_as'];
+			$block_params['payment_type_id'] = $payment_type_id;
+
+			return $this->Application->ParseBlock($block_params);
+		}
+
+		/**
+		 * Checks, that USPS returned valid label
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function USPSLabelFound($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$full_path = USPS_LABEL_FOLDER . $object->GetDBField( $params['field'] ) . '.pdf';
+
+			return file_exists($full_path) && is_file($full_path);
+		}
+
+		/**
+		 * Prints SQE errors from session
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function PrintSQEErrors($params)
+		{
+			$sqe_errors = $this->Application->RecallVar('sqe_errors');
+
+			if (!$sqe_errors) {
+				return '';
+			}
+
+			$o = '';
+			$block_params = $this->prepareTagParams($params);
+			$block_params['name'] = $params['render_as'];
+			$sqe_errors = unserialize($sqe_errors);
+
+			foreach ($sqe_errors as $order_number => $error_description) {
+				$block_params['order_number'] = $order_number;
+				$block_params['error_description'] = $error_description;
+
+				$o .= $this->Application->ParseBlock($block_params);
+			}
+
+			$this->Application->RemoveVar('sqe_errors');
+
+			return $o;
+		}
+
+		/**
+		 * Creates a continue shopping link
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function ContinueShoppingLink($params)
+		{
+			/** @var OrderHelper $order_helper */
+			$order_helper = $this->Application->recallObject('OrderHelper');
+
+			if ( isset($params['template']) ) {
+				$template = $params['template'];
+				unset($params['template']);
+			}
+			else {
+				$template = '';
+			}
+
+			return $this->Application->HREF($order_helper->getContinueShoppingTemplate($template), '', $params);
+		}
+
+		/**
+		 * Checks that billing address and shipping address are the same
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function AddressesTheSame($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$address_fields = Array ('To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip');
+
+			foreach ($address_fields as $address_field) {
+				if ( $object->GetDBField('Shipping' . $address_field) != $object->GetDBField('Billing' . $address_field) ) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}

Property changes on: releases/5.2.2-B2/units/orders/orders_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.53.2.21
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php	(revision 16630)
@@ -0,0 +1,105 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePlansBracketsTagProcessor extends kDBTagProcessor {
+
+
+		/*function Product_ListPriceBrackets($params)
+		{
+			return $this->PrintList2($params);
+		}*/
+
+		function Field($params)
+		{
+			$value = parent::Field($params);
+			if ( ($params['field'] == 'FromAmount' || $params['name'] == 'ToAmount') && $value == -1)
+				$value = '&infin;';
+			return $value;
+		}
+
+		function ShowPricingForm($params)
+		{
+			/** @var kDBItem $br_object */
+			$br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
+
+			$br_data = $this->Application->GetVar( $this->getPrefixSpecial(true) );
+			$linked_info = $br_object->getLinkedInfo($this->Special);
+
+			if(!$br_data)
+			{
+				$sql = 	'SELECT * FROM '.$br_object->TableName.' WHERE '.$linked_info['ParentTableKey'].' = '.$linked_info['ParentId'];
+				$brackets = $this->Conn->Query($sql, $br_object->IDField);
+
+				usort($brackets, 'ap_bracket_comp');
+
+				$br_data = $brackets;
+				$this->Application->SetVar($this->getPrefixSpecial(true), $brackets);
+			}
+			else
+			{
+				usort($br_data , 'ap_bracket_comp');
+			}
+
+			$ret = '';
+			if( is_array($br_data) )
+			{
+
+				$block_params = $this->prepareTagParams($params);
+				$block_params['IdField'] = $br_object->IDField;
+				$block_params['name'] = $params['block'];
+				$first = true;
+
+				$main_object = $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
+				$plan_type = $main_object->GetDBField('PlanType');
+				$limits_format = ($plan_type == 2) ? '%d' : $br_object->GetFieldOption('FromAmount', 'format');
+
+				// this is needed to find next id
+				$br_data_copy = $br_data;
+				foreach($br_data as $id => $values)
+				{
+
+					foreach($values as $value_key => $value_val)
+					{
+						$block_params[$value_key] = $value_val;
+					}
+					reset($values);
+
+					next($br_data_copy);
+					$next_bracket = current($br_data_copy);
+
+					$values['FromAmount'] = sprintf($limits_format, $values['FromAmount']);
+					$values['ToAmount'] = sprintf($limits_format, $values['ToAmount']);
+
+					$block_params['id']	= $values[$br_object->IDField];
+					$block_params['min'] = ($id == -1) ? ($values['FromAmount'] ? $values['FromAmount'] : 0) : $values['FromAmount'];
+					$block_params['max'] = ($values['ToAmount'] == -1) ? '&infin;' : $values['ToAmount'];
+					$block_params['next_min_id'] = $next_bracket[$br_object->IDField];
+
+					if($first)
+					{
+						$block_params['first'] = 1;
+						$first = false;
+					}
+					else
+					{
+						$block_params['first'] = 0;
+					}
+					$ret .= $this->Application->ParseBlock($block_params, 1);
+				}
+			}
+			return $ret;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(revision 16630)
@@ -0,0 +1,123 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatePlansBracketsEventHandler extends kDBEventHandler {
+
+		/**
+		 * Allows to override standard permission mapping
+		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
+		 */
+		protected function mapPermissions()
+		{
+			parent::mapPermissions();
+
+			$permissions = Array (
+				'OnMoreBrackets' => Array ('subitem' => 'add|edit'),
+				'OnInfinity' => Array ('subitem' => 'add|edit'),
+				'OnArrange' => Array ('subitem' => 'add|edit'),
+			);
+
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
+
+		/**
+		 * Adds additional 5 empty brackets
+		 *
+		 * @param kEvent $event
+		 */
+		function OnMoreBrackets($event)
+		{
+			$event->redirect = false;
+
+			$brackets_helper = $this->Application->recallObject('BracketsHelper');
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
+			$brackets_helper->OnMoreBrackets($event);
+		}
+
+		/**
+		 * Arrange brackets
+		 *
+		 * @param kEvent $event
+		 */
+		function OnArrange($event)
+		{
+			$event->redirect = false;
+			$brackets_helper = $this->Application->recallObject('BracketsHelper');
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
+
+			$brackets_helper->arrangeBrackets($event);
+			$event->CallSubEvent('OnPreSaveBrackets');
+		}
+
+		/**
+		 * Arrange infinity brackets
+		 *
+		 * @param kEvent $event
+		 */
+		function OnInfinity($event)
+		{
+			$event->redirect = false;
+			$brackets_helper = $this->Application->recallObject('BracketsHelper');
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
+			$brackets_helper->arrangeBrackets($event);
+
+			$event->CallSubEvent('OnPreSaveBrackets');
+
+			$brackets_helper->OnInfinity($event);
+
+			$event->CallSubEvent('OnPreSaveBrackets');
+		}
+
+		/**
+		 * Occurs before updating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$linked_info = $object->getLinkedInfo();
+			$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
+
+			/** @var kBracketsHelper $brackets_helper */
+			$brackets_helper = $this->Application->recallObject('BracketsHelper');
+
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array ('Percent' => ''));
+			$brackets_helper->replaceInfinity($event);
+		}
+
+		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnPreSaveBrackets($event)
+		{
+			/** @var kBracketsHelper $brackets_helper */
+			$brackets_helper = $this->Application->recallObject('BracketsHelper');
+
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
+			$brackets_helper->OnPreSaveBrackets($event);
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php	(revision 16630)
@@ -0,0 +1,65 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'apbrackets',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatePlansBracketsEventHandler', 'file' => 'affiliate_plans_brackets_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AffiliatePlansBracketsTagProcessor', 'file' => 'affiliate_plans_brackets_tag_processor.php', 'build_event' => 'OnBuild'),
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => true,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnPreSave'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnArrange',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+	'IDField' => 'AffiliateBracketId',
+
+	'TableName' => TABLE_PREFIX.'AffiliatePlansBrackets',
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s'
+	),
+
+	'ForeignKey' => 'AffiliatePlanId',
+	'ParentTableKey' => 'AffiliatePlanId',
+	'ParentPrefix' => 'ap',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'Fields' => Array (
+		'AffiliateBracketId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'AffiliatePlanId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'FromAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0'),
+		'ToAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0'),
+		'Percent' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0.00'),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/affiliate_plans_brackets/affiliate_plans_brackets_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/currencies/currencies_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/currencies/currencies_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/currencies/currencies_tag_processor.php	(revision 16630)
@@ -0,0 +1,99 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CurrenciesTagProcessor extends kDBTagProcessor {
+
+	function DisableUnusedWarning($params)
+	{
+		$saved_ids = $this->Application->RecallVar('saved_curr_ids');			// when saving currency(-ies)
+		$check_all = $this->Application->RecallVar('check_unused_currencies');	// when saving payment type
+		$ret = '';
+		if($saved_ids || $check_all)
+		{
+			$sql = 'SELECT DISTINCT CurrencyId FROM '.$this->Application->getUnitOption('ptc', 'TableName');
+			$used_ids = $this->Conn->GetCol($sql);
+			if($check_all)
+			{
+				$sql = 'SELECT DISTINCT CurrencyId FROM '.$this->Application->getUnitOption('curr', 'TableName');
+				$all_ids = $this->Conn->GetCol($sql);
+				$unused_ids = implode(',', array_diff($all_ids, $used_ids) );
+				$this->Application->RemoveVar('check_unused_currencies');
+			}
+			else
+			{
+				$saved_ids = explode(',', $saved_ids);
+				$unused_ids = implode(',', array_diff($saved_ids, $used_ids) );
+				$this->Application->RemoveVar('saved_curr_ids');
+			}
+
+			if ( $unused_ids ) {
+				$this->Application->SetVar('unused_ids', $unused_ids);
+				$sql = 'SELECT ISO
+						FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').'
+						WHERE CurrencyId IN('.$unused_ids.') AND Status = 1';
+				$params['unused_iso'] = implode(', ', $this->Conn->GetCol($sql));
+
+				if ( $params['unused_iso'] ) {
+					$params['unused_ids'] = $unused_ids;
+					$params['name'] = $params['block'];
+					$ret = $this->Application->ParseBlock($params);
+				}
+			}
+		}
+		return $ret;
+	}
+
+	function ListCurrencies($params)
+	{
+		return $this->PrintList2($params);
+	}
+
+	function CurrencyLink($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$params['pass'] = 'm,curr';
+		$params['curr_event'] = 'OnChangeCurrency';
+		$params['curr_iso'] = $object->GetDBField('ISO');
+
+		return $this->Application->ProcessParsedTag('m', 'Link', $params);
+	}
+
+	function SelectedCurrency($params)
+	{
+		$object = $this->Application->recallObject($this->getPrefixSpecial());
+
+		return $object->GetDBField('ISO') == $this->Application->RecallVar('curr_iso');
+	}
+
+	function PrimaryCurrencyISO($params)
+	{
+		$sql = 'SELECT ISO
+				FROM ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
+				WHERE IsPrimary = 1';
+
+		return $this->Conn->GetOne($sql);
+	}
+
+	function PrimaryCurrencyName($params)
+	{
+		$sql = 'SELECT Name
+				FROM ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
+				WHERE IsPrimary = 1';
+
+		return $this->Application->Phrase( $this->Conn->GetOne($sql) );
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/currencies/currencies_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/currencies/currencies_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/currencies/currencies_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/currencies/currencies_event_handler.php	(revision 16630)
@@ -0,0 +1,324 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CurrenciesEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			// admin
+			'OnUpdateRate' => Array ('self' => 'add|edit'),
+			'OnUpdateRates' => Array ('self' => 'advanced:update_rate|add|edit'),
+			'OnDisableUnused' => Array ('self' => 'edit'),
+
+			// front
+			'OnChangeCurrency' => Array ('self' => true),
+			'OnItemBuild' => Array ('self' => true),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Returns ID of current item to be edited
+	 * by checking ID passed in get/post as prefix_id
+	 * or by looking at first from selected ids, stored.
+	 * Returned id is also stored in Session in case
+	 * it was explicitly passed as get/post
+	 *
+	 * @param kEvent $event
+	 * @return int
+	 * @access public
+	 */
+	public function getPassedID(kEvent $event)
+	{
+		if ( $event->Special == 'current' ) {
+			return Array ('ISO' => $this->Application->RecallVar('curr_iso'));
+		}
+
+		return parent::getPassedID($event);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSetPrimary($event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->SetDBField('IsPrimary', 1);
+		$object->Update();
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
+			$sql = 'UPDATE ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
+					SET IsPrimary = 0
+					WHERE CurrencyId <> ' . $object->GetDBField('CurrencyId');
+			$this->Conn->Query($sql);
+
+			$object->SetDBField('Status', 1);
+		}
+
+		$object->SetDBField('Modified_date', adodb_mktime());
+		$object->SetDBField('Modified_time', adodb_mktime());
+
+		if ( $object->GetDBField('Status') == 0 ) {
+			$sql = 'DELETE FROM ' . $this->Application->getUnitOption('ptc', 'TableName') . '
+					WHERE CurrencyId = ' . $object->GetDBField('CurrencyId');
+			$this->Conn->Query($sql);
+		}
+	}
+
+	/**
+	 * Apply any custom changes to list's sql query
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
+	 */
+	protected function SetCustomQuery(kEvent $event)
+	{
+		parent::SetCustomQuery($event);
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		if ( $event->Special == 'active' ) {
+			$object->addFilter('status_filter', '%1$s.Status = 1');
+		}
+
+		if ( !$this->Application->isAdminUser ) {
+			$object->addFilter('status_filter', $object->TableName . '.Status = 1');
+		}
+
+		// site domain currency picker
+		if ( $event->Special == 'selected' || $event->Special == 'available' ) {
+			/** @var EditPickerHelper $edit_picker_helper */
+			$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
+
+			$edit_picker_helper->applyFilter($event, 'Currencies');
+			$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
+		}
+
+		// apply domain-based currency filtering
+		$currencies = $this->Application->siteDomainField('Currencies');
+
+		if ( strlen($currencies) ) {
+			$currencies = explode('|', substr($currencies, 1, -1));
+			$object->addFilter('domain_filter', '%1$s.CurrencyId IN (' . implode(',', $currencies) . ')');
+		}
+	}
+
+	/**
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		$this->Application->StoreVar('saved_curr_ids', $this->Application->RecallVar($event->Prefix . '_selected_ids'));
+
+		parent::OnSave($event);
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDisableUnused($event)
+	{
+		$unused_ids = $this->Application->GetVar('unused_ids');
+
+		if ( $unused_ids ) {
+			$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+					SET Status = 0
+					WHERE CurrencyId IN(' . $unused_ids . ') AND IsPrimary <> 1';
+			$this->Conn->Query($sql);
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnUpdateRate($event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		$event->CallSubEvent('OnPreSave');
+		$rate_source = $this->Application->ConfigValue('Comm_ExchangeRateSource');
+		$rate_source_classes = Array(	2 => 'FRNYCurrencyRates',
+										3 => 'ECBCurrencyRates',
+										1 => 'BankLVCurrencyRates'
+									);
+		$rates_class = $rate_source_classes[$rate_source];
+		$rates = $this->Application->recallObject($rates_class);
+
+		$rates->GetRatesData();
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$iso = $object->GetDBField('ISO');
+		$rates->StoreRates($iso);
+		if($rates->GetRate($iso, 'PRIMARY'))
+		{
+			$event->status=kEvent::erSUCCESS;
+		}
+		else
+		{
+			$event->status=kEvent::erFAIL;
+			$event->redirect=false;
+			$object->SetError('RateToPrimary', 'couldnt_retrieve_rate', 'la_couldnt_retrieve_rate');
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnUpdateRates($event)
+	{
+		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			$event->status = kEvent::erFAIL;
+			return;
+		}
+
+		$ids = $this->StoreSelectedIDs($event);
+		$event->setEventParam('ids', $ids);
+		$ids = $event->getEventParam('ids');
+
+		if ( $ids ) {
+			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$sql = 'SELECT ISO FROM ' . $table_name . ' WHERE CurrencyId IN (' . implode(',', $ids) . ')';
+			$iso_list = $this->Conn->GetCol($sql);
+		}
+		else {
+			$iso_list = array();
+		}
+
+		$rate_source = $this->Application->ConfigValue('Comm_ExchangeRateSource');
+		$rate_source_classes = Array(	2 => 'FRNYCurrencyRates',
+										3 => 'ECBCurrencyRates',
+										1 => 'BankLVCurrencyRates'
+									);
+		$rates_class = $rate_source_classes[$rate_source];
+		$rates = $this->Application->recallObject($rates_class);
+
+		$rates->GetRatesData();
+
+		if($iso_list)
+		{
+			$rates->StoreRates($iso_list);
+		}
+		else
+		{
+			$rates->StoreRates();
+		}
+	}
+
+	/**
+	 * Allows to change currency to given one
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnChangeCurrency($event)
+	{
+		$currency_iso = $this->Application->GetVar('curr_iso');
+		$available_currencies = $this->Application->siteDomainField('Currencies');
+
+		if ($available_currencies) {
+			if (strpos($available_currencies, '|' . $currency_iso . '|') === false) {
+				// currency isn't allowed in site domain
+				return ;
+			}
+		}
+
+		$this->Application->StoreVar('curr_iso', $currency_iso);
+
+		$passed = explode(',', $this->Application->GetVar('passed'));
+		$prefix_index = array_search($event->getPrefixSpecial(), $passed);
+
+		if ( $prefix_index !== false ) {
+			unset($passed[$prefix_index]);
+			$this->Application->SetVar('passed', implode(',', $passed));
+		}
+	}
+
+	/**
+	 * Changes default module to custom (when available)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		// make sure, that currency Translation is on current language
+		$language_id = $this->Application->GetVar('m_lang');
+		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+
+		foreach ($calculated_fields[''] as $field_name => $field_expression) {
+			$calculated_fields[''][$field_name] = str_replace('%4$s', $language_id, $field_expression);
+		}
+
+		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+	}
+}

Property changes on: releases/5.2.2-B2/units/currencies/currencies_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/currencies/currencies_config.php
===================================================================
--- releases/5.2.2-B2/units/currencies/currencies_config.php	(revision 0)
+++ releases/5.2.2-B2/units/currencies/currencies_config.php	(revision 16630)
@@ -0,0 +1,138 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config =	Array (
+	'Prefix' => 'curr',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'CurrenciesEventHandler', 'file' => 'currencies_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'CurrenciesTagProcessor', 'file' => 'currencies_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'CurrencyId',
+	'StatusField' => Array ('Status', 'IsPrimary'),
+	'TitleField' => 'ISO',
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('curr' => '!la_title_AddingCurrency!'),
+			'edit_status_labels' => Array ('curr' => '!la_title_EditingCurrency!'),
+			'new_titlefield' => Array ('curr' => '!la_title_NewCurrency!'),
+		),
+		'currencies_list' =>Array (
+			'prefixes' => Array ('curr_List'), 'format' => "!la_title_Currencies!",
+		),
+		'currencies_edit' =>Array (
+			'prefixes' => Array ('curr'),
+			'new_titlefield' => Array ('curr' => '!la_title_NewCurrency!'),
+			'format' => "#curr_status# '#curr_titlefield#' - !la_title_General!",
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:currencies'),
+
+	'Sections' => Array (
+		'in-commerce:currencies' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_currencies',
+			'label' => 'la_tab_Currencies',
+			'url' => Array ('t' => 'in-commerce/currencies/currencies_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:move_up', 'advanced:move_down', 'advanced:update_rate', 'advanced:set_primary'),
+			'priority' => 3,
+			'type' => stTREE,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'Currencies',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'SubItems' => Array (),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'LanguageLabels phr ON %1$s.Name = phr.Phrase'
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'Translation' => 'phr.l%4$s_Translation',
+		),
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc', 'Status' => 'desc'),
+			'Sorting' => Array ('ISO' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'CurrencyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ISO' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'Symbol' => Array ('type' => 'string', 'default' => null),
+		'SymbolPosition' => Array ('type' => 'int', 'default' => null, 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Left', 1 => 'la_Right'), 'use_phrases' => '1'),
+		'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'RateToPrimary' => Array ('type' => 'float', 'not_null' => 1, 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.4f', 'default' => 1),
+		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 1,
+		),
+		'IsPrimary' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+	),
+
+	'VirtualFields' => Array (
+		'Translation' => Array ('type' => 'string', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				'0_0' => 'icon16_disabled.png',
+				'0_1' => 'icon16_disabled.png',
+				'1_0' => 'icon16_item.png',
+				'1_1' => 'icon16_primary.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+				'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
+				'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+				'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+				'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/currencies/currencies_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/products/products_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/products/products_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/products/products_tag_processor.php	(revision 16630)
@@ -0,0 +1,863 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ProductsTagProcessor extends kCatDBTagProcessor {
+
+	function Rating($params)
+	{
+		$object = $this->getObject($params);
+		$rating = round($object->GetDBField('CachedRating') );
+
+		$o = '';
+		for ($i = 0; $i < $rating; $i++) {
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'star_on_render_as,block_star_on')) );
+		}
+
+		for ($i = 0; $i < 5 - $rating; $i++) {
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'star_off_render_as,block_star_off')) );
+		}
+
+		return $o;
+	}
+
+	function NewMark($params)
+	{
+		$object = $this->getObject($params);
+		$o = '';
+		if($object->GetDBField('IsNew'))
+		{
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
+		}
+		return $o;
+	}
+
+	function HotMark($params)
+	{
+		$object = $this->getObject($params);
+		$o = '';
+		if($object->GetDBField('IsHot'))
+		{
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
+		}
+		return $o;
+	}
+
+	function TopSellerMark($params)
+	{
+		return $this->HotMark($params);
+	}
+
+	function PopMark($params)
+	{
+		$object = $this->getObject($params);
+		$o = '';
+		if($object->GetDBField('IsPop'))
+		{
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
+		}
+		return $o;
+	}
+
+	function EdPickMark($params)
+	{
+		$object = $this->getObject($params);
+		$o = '';
+		if($object->GetDBField('EditorsPick'))
+		{
+			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
+		}
+		return $o;
+	}
+
+	/**
+	 * Parses block only if item is favorite
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @deprecated used only in default,onlinestore
+	 */
+	function FavoriteMark($params)
+	{
+		if ($this->IsFavorite($params)) {
+			return $this->Application->ParseBlock( Array( 'name' => $this->SelectParam($params, 'render_as,block') ) );
+		}
+
+		return '';
+	}
+
+	function CurrentCategory($params)
+	{
+		$sql = "SELECT Name
+				FROM " . TABLE_PREFIX . "Categories
+				WHERE CategoryId=" . $this->Application->GetVar("m_cat_id");
+
+		return $this->Conn->GetOne($sql);
+	}
+
+	function RateForm($params)
+	{
+		$params['name'] = $this->SelectParam($params, 'render_as,block');
+		$labels = explode(',', $params['labels']);
+		$o = '';
+		$star_block = $this->SelectParam($params, 'star_render_as,star_block');
+		for($i = 5; $i >= 0; $i--)
+		{
+			$params['rating'] = $i;
+			$params['label'] = $this->Application->Phrase($labels[5 - $i]);
+			$params['stars'] = '';
+			for($j = $i; $j > 0; $j--)
+			{
+				$params['stars'] .= $this->Application->ParseBlock(Array('name' => $star_block));
+			}
+			$o .= $this->Application->ParseBlock($params);
+		}
+		return $o;
+	}
+
+	/**
+	 * Parses block for changing favorite status
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @deprecated used only in default,onlinestore
+	 */
+	function FavoriteToggle($params)
+	{
+		$block_params = Array ();
+		$block_names = $this->IsFavorite($params) ? 'remove_favorite_render_as,block_remove_favorite' : 'add_favorite_render_as,block_add_favorite';
+		$block_params['name'] = $this->SelectParam($params, $block_names);
+		$params['template'] = $params[$this->IsFavorite($params) ? 'template_on_remove' : 'template_on_add'];
+
+		$remove_params = Array (
+			'remove_favorite_render_as', 'block_remove_favorite', 'add_to_wish_list_render_as', 'block_add_to_wish_list',
+			'add_favorite_render_as', 'block_add_favorite', 'remove_from_wish_list_render_as', 'block_remove_from_wish_list',
+			'template_on_remove', 'template_on_add'
+		);
+
+		foreach ($params as $param_name => $param_value) {
+			if (in_array($param_name, $remove_params)) {
+				unset($params[$param_name]);
+			}
+		}
+
+		$block_params['wish_list_toggle_link'] = $this->FavoriteToggleLink($params);
+		return $this->Application->ParseBlock($block_params);
+	}
+
+	function WishListToggleLink($params)
+	{
+		$params['block_add_favorite'] = $this->SelectParam($params, 'add_to_wish_list_render_as,block_add_to_wish_list');
+		$params['block_remove_favorite'] = $this->SelectParam($params, 'remove_from_wish_list_render_as,block_remove_from_wish_list');
+
+		return $this->FavoriteToggle($params);
+	}
+
+	function AddReviewLink($params)
+	{
+		$o = $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
+		return $o;
+	}
+
+	function ListProducts($params)
+	{
+		return $this->PrintList2($params);
+	}
+
+	function ListRelatedProducts($params)
+	{
+//		$related = $this->Application->recallObject('rel');
+
+		return $this->PrintList2($params);
+	}
+
+	function BuildListSpecial($params)
+	{
+		if ($this->Special != '') return $this->Special;
+		if ( isset($params['parent_cat_id']) ) {
+			$parent_cat_id = $params['parent_cat_id'];
+		}
+		else {
+			$parent_cat_id = $this->Application->GetVar('c_id');
+			if (!$parent_cat_id) {
+				$parent_cat_id = $this->Application->GetVar('m_cat_id');
+			}
+		}
+
+		if ( isset($params['manufacturer']) ) {
+			$manufacturer = $params['manufacturer'];
+		}
+		else {
+			$manufacturer = $this->Application->GetVar('manuf_id');
+		}
+
+		$recursive = isset($params['recursive']);
+
+		$list_unique_key = $this->getUniqueListKey($params).$recursive;
+		if ($list_unique_key == '') {
+			return parent::BuildListSpecial($params);
+		}
+
+		return crc32($parent_cat_id.$list_unique_key.$manufacturer);
+	}
+
+	function ProductList($params)
+	{
+		if($params['shortlist'])
+		{
+			$params['per_page'] = $this->Application->ConfigValue('Comm_Perpage_Products_Short');
+		}
+		$object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
+
+		switch($params['ListType'])
+		{
+			case 'favorites':
+				return $this->PrintList($params);
+				break;
+			case 'search':
+
+			default:
+				if(isset($params['block']))
+				{
+					return $this->PrintList($params);
+				}
+				else
+				{
+					$params['block'] = $params['block_main'];
+					$params['row_start_block'] = $params['block_row_start'];
+					$params['row_end_block'] = $params['block_row_end'];
+					return $this->PrintList2($params);
+				}
+		}
+	}
+
+	/**
+	 * Adds product to recently viewed list (only in case, when not already there)
+	 *
+	 * @param Array $params
+	 */
+	function AddToRecent($params)
+	{
+		$recent_products = $this->Application->RecallVar('recent_products');
+		if (!$recent_products) {
+			$recent_products = Array();
+		}
+		else {
+			$recent_products = unserialize($recent_products);
+		}
+
+		$product_id = $this->Application->GetVar('p_id');
+		if (!in_array($product_id, $recent_products)) {
+			array_push($recent_products, $product_id);
+			$this->Application->StoreVar('recent_products', serialize($recent_products));
+		}
+	}
+
+	function SearchMoreLink($params)
+	{
+		$object =& $this->GetList($params);
+		$o = '';
+		if($object->GetPerPage() < $this->SearchResultsCount())
+		{
+			$o = $this->Application->ParseBlock( Array('name' => $params['block']) );
+		}
+		return $o;
+	}
+
+	function AddToCartLink($params)
+	{
+		$object = $this->getObject($params);
+
+		if ($object->GetDBField('HasRequiredOptions')) {
+			$t = $params['product_template'];
+			if (!$t) {
+				$theme = $this->Application->recallObject('theme.current');
+				if ($theme->GetDBField('Name') == 'onlinestore') {
+					$t = 'in-commerce/product/details';
+				}
+				elseif ($theme->GetDBField('Name') == 'default') {
+					$t = 'in-commerce/product';
+				}
+			}
+			$link_params = Array('m_cat_id' => $object->GetDBField('CategoryId'), 'pass' => 'm,p');
+		}
+		else {
+			$t = $params['template'];
+			$link_params = Array('m_cat_id' => $object->GetDBField('CategoryId'), 'pass' => 'm,p,ord', 'ord_event' => 'OnAddToCart');
+		}
+
+		$this->Application->SetVar('p_id', $this->Application->GetVar($this->getPrefixSpecial().'_id'));
+		return $this->Application->HREF($t, '', $link_params);
+	}
+
+	function SearchResultsCount($params)
+	{
+		/** @var kSearchHelper $search_helper */
+		$search_helper = $this->Application->recallObject('SearchHelper');
+
+		$sql = '	SELECT COUNT(ResourceId)
+					FROM ' . $search_helper->getSearchTable() . '
+					WHERE ItemType=11';
+
+		return $this->Conn->GetOne($sql);
+	}
+
+	function DetailsLink($params)
+	{
+		$this->Application->SetVar( $this->Prefix.'_id', $this->Application->GetVar($this->getPrefixSpecial().'_id') );
+		$ret = $this->Application->HREF('in-commerce/details', '', Array('pass' => 'all,p'));
+		return $ret;
+	}
+
+	function ProductLink($params)
+	{
+		return $this->ItemLink($params, 'product');
+	}
+
+	function ProductFileLink($params)
+	{
+		// 'p_id'=>'0',  ??
+		$params = array_merge($params,  Array('pass'=>'all,m,p,file.downl'));
+		$product_id = getArrayValue($params,'product_id');
+		if (!$product_id) {
+			$product_id = $this->Application->GetVar($this->Prefix.'_id');
+		}
+		$params['p_id'] = $product_id;
+
+		$product = $this->Application->recallObject($this->getPrefixSpecial());
+		$params['m_cat_id'] = $product->GetDBField('CategoryId');
+
+		$main_processor = $this->Application->recallObject('m_TagProcessor');
+		return $main_processor->T($params);
+	}
+
+	function GetMarkedVal($params)
+	{
+		$list =& $this->GetList($params);
+
+		return $this->Application->RecallVar($list->getPrefixSpecial().$params['name']);
+	}
+
+	function SortingOptions($params)
+	{
+		$list =& $this->GetList($params);
+
+		$sorting_field_selected = $this->Application->RecallVar($list->getPrefixSpecial() . $params['sorting_select_name']);
+
+		if ( !$sorting_field_selected ) {
+			$sorting_field_selected = $this->Application->ConfigValue('product_OrderProductsBy');
+		}
+
+		$sql = 'SELECT ValueList
+				FROM ' . TABLE_PREFIX . 'SystemSettings
+				WHERE VariableName = "product_OrderProductsBy"';
+		$field_list_plain = $this->Conn->GetOne($sql);
+
+		$field_list = explode(',', $field_list_plain);
+
+		$o = '';
+		$option_params = $this->prepareTagParams($params);
+
+		foreach ($field_list as $field) {
+			list($fieldname, $fieldlabel) = explode('=', $field);
+
+			$option_params['fieldname'] = $fieldname;
+			$option_params['fieldlabel'] = $this->Application->Phrase($fieldlabel);
+			$option_params['name'] = $params['block_options'];
+			$option_params['selected'] = $fieldname == $sorting_field_selected ? 'selected' : '';
+
+			$o .= $this->Application->ParseBlock($option_params);
+		}
+
+		return $o;
+	}
+
+	function SortingDirectionOptions($params)
+	{
+		$list =& $this->GetList($params);
+
+		$sorting_dir_selected = $this->Application->RecallVar($list->getPrefixSpecial() . $params['sorting_select_name']);
+
+		if ( !$sorting_dir_selected ) {
+			$sorting_dir_selected = $this->Application->ConfigValue('product_OrderProductsByDir');
+		}
+
+		$o = '';
+
+		$field_list = array ('asc' => 'lu_Ascending', 'desc' => 'lu_Descending');
+		$option_params = $this->prepareTagParams($params);
+
+		foreach ($field_list as $fieldname => $fieldlabel) {
+			$option_params['fieldname'] = $fieldname;
+			$option_params['fieldlabel'] = $this->Application->Phrase($fieldlabel);
+			$option_params['name'] = $params['block_options'];
+			$option_params['selected'] = $fieldname == $sorting_dir_selected ? 'selected' : '';
+
+			$o .= $this->Application->ParseBlock($option_params);
+		}
+
+		return $o;
+	}
+
+	function ErrorMessage($params)
+	{
+		if( $this->Application->GetVar('keywords_too_short') )
+		{
+			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'keywords_too_short_render_as,block_keywords_too_short')));
+		}
+		elseif( $this->Application->GetVar('adv_search_error') )
+		{
+			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'adv_search_error_render_as,block_adv_search_error')));
+		}
+		else
+		{
+			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'no_found_render_as,block_no_found')));
+		}
+		return $ret;
+	}
+
+	function ListReviews($params)
+	{
+		$review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
+		return $review_tag_processor->PrintList($params);
+	}
+
+	function ReviewCount($params)
+	{
+		$review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
+		return $review_tag_processor->TotalRecords($params);
+	}
+
+	function InitList($params){
+
+		$passed_manuf_id = $this->Application->GetVar('manuf_id');
+		if ($passed_manuf_id && !isset($params['manufacturer'])){
+			$params['manufacturer'] = $passed_manuf_id;
+		}
+		parent::InitList($params);
+
+	}
+
+	/**
+	 * Builds link to manufacturer page
+	 *
+	 * @param Array $params
+	 * @return string
+	 */
+	function ManufacturerLink($params)
+	{
+		if ( array_key_exists('manufacturer_id', $params) ) {
+			// use direct manufacturer from tag
+			$params['manuf_id'] = $params['manufacturer_id'];
+			unset($params['manufacturer_id']);
+		}
+		else {
+			// use product's manufacturer
+			$object = $this->getObject($params);
+			$item_manufacturer_id = $object->GetDBField('ManufacturerId');
+
+			if ($item_manufacturer_id){
+				$params['manuf_id'] = $item_manufacturer_id;
+			}
+		}
+
+		$params['pass'] = 'm,manuf';
+		$params['m_cat_id'] = 0;
+		return $this->Application->ProcessParsedTag('m', 'Link', $params);
+	}
+
+	function AlreadyReviewed($params)
+	{
+		$rev_tag_processor = $this->Application->recallObject('rev_TagProcessor');
+		return $rev_tag_processor->AlreadyReviewed($params);
+	}
+
+	function PrepareSearchResults($params)
+	{
+		if ( $this->Application->GetVar('search_type') == 'advanced'
+			|| !getArrayValue($this->nameToSpecialMapping, 'search_results')
+		) {
+			$params = Array('list_name'		=>	'search_results',
+							'types'			=>	'search',
+							'parent_cat_id'	=>	'any',
+							'recursive'		=>	'true',
+							'per_page'		=>	'short_list'
+						);
+			$this->InitList($params);
+		}
+		return '';
+	}
+
+	function Available($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		if ( !$object->GetDBField('InventoryStatus') ) {
+			return true;
+		}
+
+		$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
+
+		if ( $object->GetDBField('InventoryStatus') == 2 ) {
+			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+			$sql = 'SELECT SUM(IF(QtyInStock > ' . $object->GetDBField('QtyInStockMin') . ', 1, 0))
+					FROM ' . $poc_table . '
+					WHERE (ProductId = ' . $object->GetID() . ') AND (Availability = 1)';
+			$stock_available = $this->Conn->GetOne($sql) > 0; // at least one option combination present
+		}
+		else {
+			$stock_available = $object->GetDBField('QtyInStock') > $object->GetDBField('QtyInStockMin');
+		}
+
+		$prod_backordering = $object->GetDBField('BackOrder');
+
+		if ( $stock_available ) {
+			return true;
+		}
+
+		// stock is NOT available:
+		if ( !$backordering || $prod_backordering == 0 ) {
+			// if backordering is generaly disabled or disabled for product (Never)
+			return false;
+		}
+
+		// backordering enabled; (auto or always mode)
+		return true;
+	}
+
+	function IsSubscription($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return ($object->GetDBField('Type') == 2);
+	}
+
+	function IsTangible($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return ($object->GetDBField('Type') == 1);
+	}
+
+	function HasFiles($params)
+	{
+		$sql = 'SELECT COUNT(FileId) FROM '.$this->Application->getUnitOption('file', 'TableName').'
+				WHERE ProductId = '.$this->Application->GetVar('p_id').' AND Status = 1';
+		return $this->Conn->GetOne($sql) ? 1 : 0;
+	}
+
+	function UniqueFileName($params)
+	{
+		$file_object = $this->Application->recallObject('file.downl');
+		return ($file_object->GetDBField('Name') &&
+				$file_object->GetDBField('Name') != $file_object->GetDBField('FilePath'))
+			? 1 : 0;
+	}
+
+	function FileDownload($params)
+	{
+		$file_id = $this->Application->GetVar('file.downl_id');
+		$product_id =	$file_id ? $this->Conn->GetOne('SELECT ProductId
+														FROM '.$this->Application->getUnitOption('file', 'TableName').'
+														WHERE FileId = '.$file_id) :
+						$this->Application->GetVar($this->getPrefixSpecial().'_id');
+
+		$download_helper_class = $this->Application->getUnitOption($this->Prefix, 'DownloadHelperClass');
+
+		if (!$download_helper_class) {
+			$download_helper_class = 'DownloadHelper';
+		}
+		$download_helper = $this->Application->recallObject($download_helper_class);
+		if (!$download_helper->CheckAccess($file_id, $product_id)) {
+			$this->Application->ApplicationDie('File Access permission check failed!');
+		}
+		$file_info = $download_helper->SendFile($file_id, $product_id);
+		$download_helper->LogDownload($product_id, $file_info);
+
+		define('DBG_SKIP_REPORTING', 1);
+		$this->Application->ApplicationDie();
+	}
+
+	function PictureLink($params)
+	{
+		if (getArrayValue($params, 'picture_list')) {
+			$params['img_id'] = $this->Application->GetVar('img_id');
+			$params['pass'] = 'all,p,img';
+			unset($params['picture_list']);
+		}
+		else {
+			$params['pass'] = 'all,p';
+		}
+		return $this->Application->ProcessParsedTag('m', 'Link', $params);
+	}
+
+	function ShouldListOptions($params)
+	{
+		$object = $this->getObject($params);
+
+		$req_filter = '';
+		if (getArrayValue($params, 'required_only')) {
+			$req_filter = ' AND Required = 1';
+		}
+
+		$query = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$object->GetID().$req_filter;
+		$res = $this->Conn->GetOne($query);
+		return $res > 0;
+	}
+
+	function CountOptions($params)
+	{
+		$object = $this->getObject($params);
+
+		$query = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$object->GetID();
+		$res = $this->Conn->GetOne($query);
+
+		$max = $this->SelectParam($params, 'greater');
+		if (!$max) $max = 0;
+
+		return $res > $max;
+	}
+
+	function OptionsUpdateMode($params)
+	{
+		return $this->Application->GetVar('orditems_id') !== false;
+	}
+
+	function OptionsHaveError($params)
+	{
+		return $this->Application->GetVar('opt_error') > 0;
+	}
+
+	function OptionsError($params)
+	{
+		switch ($this->Application->GetVar('opt_error')) {
+			case 1:
+				return $this->Application->Phrase($params['required']);
+			case 2:
+				return $this->Application->Phrase($params['not_available']);
+		}
+	}
+
+	function ListShippingTypes($params)
+	{
+		/** @var ShippingQuoteCollector $quote_engine_collector */
+		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
+
+		$types = $quote_engine_collector->GetAvailableShippingTypes();
+
+		$object = $this->getObject($params);
+		$selected = $object->GetDBField('ShippingLimitation');
+		$selected = explode('|', substr($selected, 1, -1));
+
+		$o = '';
+		foreach ($types as $a_type)
+		{
+			$is_selected = in_array($a_type['_Id'], $selected);
+			$continue = $params['mode'] == 'selected' ? !$is_selected : $is_selected;
+			if ($continue) continue;
+			$block_params = $a_type;
+			$block_params['name']	= $params['render_as'];
+			$o .= $this->Application->ParseBlock($block_params);
+		}
+		return $o;
+	}
+
+	function PageLink($params)
+	{
+		$manufacturer_id = $this->Application->GetVar('manuf_id');
+		if ($manufacturer_id) {
+			$params['pass'] = 'm,'.$this->getPrefixSpecial().',manuf';
+		}
+
+		return parent::PageLink($params);
+	}
+
+	/**
+	 * Calculate savings based on price & market price relationship
+	 *
+	 * @param Array $params
+	 * @return int
+	 */
+	function Savings($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$price = $object->GetDBField('Price');
+		$msrp = $object->GetDBField('MSRP');
+
+		$value = 0;
+		if (isset($params['type']) && ($params['type'] == 'percent')) {
+			if ($msrp > 0) {
+				return 100 - round($price * 100 / $msrp);
+			}
+		}
+		else {
+			if ($msrp > $price) {
+				$value = $msrp - $price;
+			}
+		}
+
+		if (isset($params['currency'])) {
+			/** @var LanguagesItem $lang */
+			$lang = $this->Application->recallObject('lang.current');
+
+			$iso = $this->GetISO($params['currency']);
+			$value = $this->ConvertCurrency($value, $iso);
+			$value = $lang->formatNumber( sprintf('%.2f', $value) );
+			$value = $this->AddCurrencySymbol($value, $iso);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Hides permission tab, when it's not allowed by configuration settings
+	 *
+	 * @param Array $params
+	 */
+	function ModifyUnitConfig($params)
+	{
+		$edit_tab_presets = $this->Application->getUnitOption($this->Prefix, 'EditTabPresets');
+		$edit_tab_preset = $edit_tab_presets['Default'];
+
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$product_type = $object->GetDBField('Type');
+
+		if ($product_type != PRODUCT_TYPE_TANGIBLE) {
+			unset($edit_tab_preset['inventory']);
+		}
+
+		if ($product_type == PRODUCT_TYPE_SUBSCRIPTION) {
+			unset($edit_tab_preset['options']);
+		}
+		else {
+			unset($edit_tab_preset['access_and_pricing']);
+		}
+
+		if ($product_type != PRODUCT_TYPE_TANGIBLE && $product_type != PRODUCT_TYPE_PACKAGE) {
+			unset($edit_tab_preset['pricing']);
+		}
+		else {
+			unset($edit_tab_preset['pricing2']);
+		}
+
+		if ($product_type != PRODUCT_TYPE_DOWNLOADABLE) {
+			unset($edit_tab_preset['files_and_pricing']);
+		}
+
+		if ($product_type != PRODUCT_TYPE_PACKAGE) {
+			unset($edit_tab_preset['package_content']);
+		}
+
+		$edit_tab_presets['Default'] = $edit_tab_preset;
+		$this->Application->setUnitOption($this->Prefix, 'EditTabPresets', $edit_tab_presets);
+	}
+
+	/**
+	 * Checks, that current product is in compare products list
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function InCompare($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
+		$products = $products ? explode('|', $products) : Array ();
+
+		return in_array($object->GetID(), $products);
+	}
+
+	/**
+	 * Checks, that one more product can be added to comparison list
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function ComparePossible($params)
+	{
+		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
+		$products = $products ? explode('|', $products) : Array ();
+
+		return count($products) < $this->Application->ConfigValue('MaxCompareProducts');
+	}
+
+	/**
+	 * Checks if given field is filled for at least one product in comparison page
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function HasCompareField($params)
+	{
+		$object =& $this->GetList($params);
+
+		$object->GoFirst();
+		$field = $this->SelectParam($params, 'name,field');
+
+		while ( !$object->EOL() ) {
+			if ( $object->GetField($field) ) {
+				// don't use GetCol, since it fails to process ML fields
+				return true;
+			}
+
+			$object->GoNext();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Builds link to product compare page
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function CompareLink($params)
+	{
+		$params['continue'] = $this->Application->HREF('__default__', '', Array ('pass_category' => 1));
+
+		return $this->Application->ProcessParsedTag('m', 'Link', $params);
+	}
+
+	/**
+	 * Builds link to continue website browsing from compare products page
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function ContinueLink($params)
+	{
+		$url = $this->Application->GetVar('continue');
+
+		if ( isset($params['redirect']) && $params['redirect'] ) {
+			$this->Application->Redirect('external:' . $url);
+		}
+
+		return $url;
+	}
+}

Property changes on: releases/5.2.2-B2/units/products/products_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.49.2.11
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/products/products_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/products/products_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/products/products_event_handler.php	(revision 16630)
@@ -0,0 +1,1600 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class ProductsEventHandler extends kCatDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array(
+			// front
+			'OnCancelAction'		=>	Array('self' => true),
+			'OnRateProduct'			=>	Array('self' => true),
+			'OnClearRecent'			=>	Array('self' => true),
+			'OnRecommendProduct'	=>	Array('self' => true),
+			'OnAddToCompare'		=>	Array('self' => true),
+			'OnRemoveFromCompare'	=>	Array('self' => true),
+			'OnCancelCompare'		=>	Array('self' => true),
+
+			// admin
+			'OnQtyAdd'			=>	Array('self' => 'add|edit'),
+			'OnQtyRemove'		=>	Array('self' => 'add|edit'),
+			'OnQtyOrder'		=>	Array('self' => 'add|edit'),
+			'OnQtyReceiveOrder'	=>	Array('self' => 'add|edit'),
+			'OnQtyCancelOrder'	=>	Array('self' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
+	{
+		parent::mapEvents();	// ensure auto-adding of approve/decine and so on events
+
+		$product_events = Array (
+			'OnQtyAdd'=>'InventoryAction',
+			'OnQtyRemove'=>'InventoryAction',
+			'OnQtyOrder'=>'InventoryAction',
+			'OnQtyReceiveOrder'=>'InventoryAction',
+			'OnQtyCancelOrder'=>'InventoryAction',
+		);
+
+		$this->eventMethods = array_merge($this->eventMethods, $product_events);
+	}
+
+	/**
+	 * Sets default processing data for subscriptions
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$product_approve_events = Array (
+			2 => 'p:OnSubscriptionApprove',
+			4 => 'p:OnDownloadableApprove',
+			5 => 'p:OnPackageApprove'
+		);
+
+		$product_type = $object->GetDBField('Type');
+
+		$type_found = in_array($product_type, array_keys($product_approve_events));
+
+		if ( $type_found && !$object->GetDBField('ProcessingData') ) {
+			$processing_data = Array ('ApproveEvent' => $product_approve_events[$product_type]);
+			$object->SetDBField('ProcessingData', serialize($processing_data));
+		}
+	}
+
+	/**
+	 * Process product count manipulations
+	 *
+	 * @param kEvent $event
+	 * @access private
+	 */
+	function InventoryAction($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$field_values = $this->getSubmittedFields($event);
+		$object->SetFieldsFromHash($field_values);
+		$event->setEventParam('form_data', $field_values);
+
+		if ($object->GetDBField('InventoryStatus') == 2) {
+			// inventory by options (use first selected combination in grid)
+			$combinations = $this->Application->GetVar('poc_grid');
+			list ($combination_id, ) = each($combinations);
+		}
+		else {
+			// inventory by product
+			$combination_id = 0;
+		}
+
+		// save id of selected option combination & preselect it in grid
+		$this->Application->SetVar('combination_id', $combination_id);
+
+		$this->ScheduleInventoryAction($event->Name, $object->GetId(), $object->GetDBField('Qty'), $combination_id);
+
+		$object->Validate();
+
+		if ( !$object->GetErrorPseudo('Qty') ){
+			// only update, when no error on that field
+			$this->modifyInventory($event->Name, $object, $object->GetDBField('Qty'), $combination_id);
+		}
+
+		$object->SetDBField('Qty', null);
+		$event->redirect = false;
+	}
+
+	/**
+	 * Perform inventory action on supplied object
+	 *
+	 * @param string $action event name which is actually called by user
+	 * @param ProductsItem $product
+	 * @param int $qty
+	 * @param int $combination_id
+	 */
+	function modifyInventory($action, &$product, $qty, $combination_id)
+	{
+		if ($product->GetDBField('InventoryStatus') == 2) {
+			// save inventory changes to option combination instead of product
+			$object = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+			$object->Load($combination_id);
+		}
+		elseif ($combination_id > 0) {
+			// combination id present, but not inventory by combinations => skip
+			return false;
+		}
+		elseif ($product->GetDBField('InventoryStatus') == 1) {
+			// save inventory changes to product
+			$object =& $product;
+		}
+		else {
+			// product has inventory actions, but don't use inventory => skip
+			return false;
+		}
+
+		if (!$object->isLoaded()) {
+			// product/combination in action doesn't exist in database by now
+			return false;
+		}
+
+		switch ($action) {
+			case 'OnQtyAdd':
+				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') + $qty);
+				break;
+
+			case 'OnQtyRemove':
+				if ($object->GetDBField('QtyInStock') < $qty) {
+					$qty = $object->GetDBField('QtyInStock');
+				}
+				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') - $qty);
+				break;
+
+			case 'OnQtyOrder':
+				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') + $qty);
+				break;
+
+			case 'OnQtyReceiveOrder':
+				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') - $qty);
+				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') + $qty);
+				break;
+
+			case 'OnQtyCancelOrder':
+				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') - $qty);
+				break;
+		}
+
+		return $object->Update();
+	}
+
+	function ScheduleInventoryAction($action, $prod_id, $qty, $combination_id = 0)
+	{
+		$inv_actions = $this->Application->RecallVar('inventory_actions');
+		if (!$inv_actions) {
+			$inv_actions = Array();
+		}
+		else {
+			$inv_actions = unserialize($inv_actions);
+		}
+
+		array_push($inv_actions, Array('action' => $action, 'product_id' => $prod_id, 'combination_id' => $combination_id, 'qty' => $qty));
+
+		$this->Application->StoreVar('inventory_actions', serialize($inv_actions));
+	}
+
+	function RealInventoryAction($action, $prod_id, $qty, $combination_id)
+	{
+		$product = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
+		$product->SwitchToLive();
+		$product->Load($prod_id);
+
+		$this->modifyInventory($action, $product, $qty, $combination_id);
+	}
+
+	function RunScheduledInventoryActions($event)
+	{
+		$inv_actions = $this->Application->GetVar('inventory_actions');
+		if (!$inv_actions) {
+			return;
+		}
+		$inv_actions = unserialize($inv_actions);
+
+		$products = array();
+		foreach($inv_actions as $an_action) {
+			$this->RealInventoryAction($an_action['action'], $an_action['product_id'], $an_action['qty'], $an_action['combination_id']);
+			array_push($products, $an_action['product_id'].'_'.$an_action['combination_id']);
+		}
+
+		$products = array_unique($products);
+		if ($products) {
+			$product_obj = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
+			$product_obj->SwitchToLive();
+			foreach ($products as $product_key) {
+				list($prod_id, $combination_id) = explode('_', $product_key);
+			$product_obj->Load($prod_id);
+				$this->FullfillBackOrders($product_obj, $combination_id);
+			}
+		}
+	}
+
+	/**
+	 * In case if products arrived into inventory and they are required by old (non processed) orders, then use them (products) in that orders
+	 *
+	 * @param ProductsItem $product
+	 * @param int $combination_id
+	 */
+	function FullfillBackOrders(&$product, $combination_id)
+	{
+		if ( !$this->Application->ConfigValue('Comm_Process_Backorders_Auto') ) return;
+
+		if ($combination_id && ($product->GetDBField('InventoryStatus') == 2)) {
+			// if combination id present and inventory by combinations
+			$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
+			$poc_tablename = $this->Application->getUnitOption('poc', 'TableName');
+			$sql = 'SELECT QtyInStock
+					FROM '.$poc_tablename.'
+					WHERE '.$poc_idfield.' = '.$combination_id;
+			$stock_qty = $this->Conn->GetOne($sql);
+		}
+		else {
+			// inventory by product
+			$stock_qty = $product->GetDBField('QtyInStock');
+		}
+
+		$qty = (int) $stock_qty - $product->GetDBField('QtyInStockMin');
+		$prod_id = $product->GetID();
+		if ($prod_id <= 0 || !$prod_id || $qty <= 0) return;
+
+		//selecting up to $qty backorders with $prod_id where full qty is not reserved
+		$query = 'SELECT '.TABLE_PREFIX.'Orders.OrderId
+							FROM '.TABLE_PREFIX.'OrderItems
+					LEFT JOIN '.TABLE_PREFIX.'Orders ON '.TABLE_PREFIX.'Orders.OrderId = '.TABLE_PREFIX.'OrderItems.OrderId
+					WHERE (ProductId = '.$prod_id.') AND (Quantity > QuantityReserved) AND (Status = '.ORDER_STATUS_BACKORDERS.')
+							GROUP BY '.TABLE_PREFIX.'Orders.OrderId
+							ORDER BY OrderDate ASC
+							LIMIT 0,'.$qty; //assuming 1 item per order - minimum possible
+
+		$orders = $this->Conn->GetCol($query);
+
+		if ( !$orders ) {
+			return;
+		}
+
+		/** @var OrdersItem $order */
+		$order = $this->Application->recallObject('ord.-inv', null, array('skip_autoload' => true));
+
+		foreach ($orders as $ord_id) {
+			$order->Load($ord_id);
+
+			$this->Application->emailAdmin('BACKORDER.FULLFILL');
+
+			// Reserve what's possible in any case.
+			$reserve_event = new kEvent('ord:OnReserveItems');
+			$this->Application->HandleEvent($reserve_event);
+
+			// In case the order is ready to process - process it.
+			if ( $reserve_event->status == kEvent::erSUCCESS ) {
+				$this->Application->HandleEvent(new kEvent('ord:OnOrderProcess'));
+			}
+		}
+	}
+
+	/**
+	 * Occurs before an item is deleted from live table when copying from temp
+	 * (temp handler deleted all items from live and then copy over all items from temp)
+	 * Id of item being deleted is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeDeleteFromLive(kEvent $event)
+	{
+		parent::OnBeforeDeleteFromLive($event);
+
+		/** @var kCatDBItem $product */
+		$product = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
+
+		$product->SwitchToLive();
+		$id = $event->getEventParam('id');
+
+		if ( !$product->Load($id) ) {
+			// this will make sure New product will not be overwritten with empty data
+			return ;
+		}
+
+		/** @var kCatDBItem $temp */
+		$temp = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
+
+		$temp->SwitchToTemp();
+		$temp->Load($id);
+
+		$temp->SetDBFieldsFromHash($product->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
+		$temp->Update();
+	}
+
+	/**
+	 * Removes any information about current/selected ids
+	 * from Application variables and Session
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function clearSelectedIDs(kEvent $event)
+	{
+		parent::clearSelectedIDs($event);
+
+		$this->Application->SetVar('inventory_actions', $this->Application->RecallVar('inventory_actions'));
+		$this->Application->RemoveVar('inventory_actions');
+	}
+
+	/**
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		parent::OnSave($event);
+
+		if ( $event->status == kEvent::erSUCCESS ) {
+			$this->RunScheduledInventoryActions($event);
+		}
+	}
+
+	/**
+	 * Prepare temp tables for creating new item
+	 * but does not create it. Actual create is
+	 * done in OnPreSaveCreated
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreCreate(kEvent $event)
+	{
+		parent::onPreCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type'));
+	}
+
+	/**
+	 * Saves edited item in temp table and loads
+	 * item with passed id in current template
+	 * Used in Prev/Next buttons
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreSaveAndGo(kEvent $event)
+	{
+		$event->CallSubEvent('OnPreSave');
+		$this->LoadItem($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$from_type = $object->GetDBField('Type');
+		if ( $event->status == kEvent::erSUCCESS ) {
+			$this->Application->SetVar($event->getPrefixSpecial() . '_id', $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoId'));
+			$this->LoadItem($event);
+			$to_type = $object->GetDBField('Type');
+
+			if ( $from_type != $to_type ) {
+				$from_tabs = $this->GetTabs($from_type);
+				$from_tab_i = array_search($this->Application->GetVar('t'), $from_tabs);
+
+				$to_tabs = $this->GetTabs($to_type);
+				$to_tab = $this->Application->GetVar('t');
+
+				$found = false;
+				while (!isset($to_tabs[$from_tab_i]) && $from_tab_i < count($to_tabs)) {
+					$from_tab_i++;
+				}
+
+				if ( !isset($to_tabs[$from_tab_i]) ) {
+					$from_tab_i = 0;
+				}
+
+				$to_tab = $to_tabs[$from_tab_i];
+
+				$event->redirect = $to_tab;
+			}
+		}
+	}
+
+	function GetTabs($type)
+	{
+		switch($type)
+		{
+			case 1:
+				return Array(
+					0 => 'in-commerce/products/products_edit',
+					1 => 'in-commerce/products/products_inventory',
+					2 => 'in-commerce/products/products_pricing',
+					3 => 'in-commerce/products/products_categories',
+					4 => 'in-commerce/products/products_images',
+					5 => 'in-commerce/products/products_reviews',
+					6 => 'in-commerce/products/products_custom',
+				);
+
+			case 2:
+				return Array(
+					0 => 'in-commerce/products/products_edit',
+					1 => 'in-commerce/products/products_access',
+					/*2 => 'in-commerce/products/products_access_pricing',*/
+					3 => 'in-commerce/products/products_categories',
+					4 => 'in-commerce/products/products_images',
+					5 => 'in-commerce/products/products_reviews',
+					6 => 'in-commerce/products/products_custom',
+				);
+
+			case 3:
+				return Array(
+					0 => 'in-commerce/products/products_edit',
+
+					2 => 'in-commerce/products/products_access_pricing',
+					3 => 'in-commerce/products/products_categories',
+					4 => 'in-commerce/products/products_images',
+					5 => 'in-commerce/products/products_reviews',
+					6 => 'in-commerce/products/products_custom',
+				);
+
+			case 4:
+				return Array(
+					0 => 'in-commerce/products/products_edit',
+
+					2 => 'in-commerce/products/products_files',
+					3 => 'in-commerce/products/products_categories',
+					4 => 'in-commerce/products/products_images',
+					5 => 'in-commerce/products/products_reviews',
+					6 => 'in-commerce/products/products_custom',
+				);
+		}
+	}
+
+	/**
+	 * Return type clauses for list bulding on front
+	 *
+	 * @param kEvent $event
+	 * @return Array
+	 */
+	function getTypeClauses($event)
+	{
+		$types = $event->getEventParam('types');
+		$types = $types ? explode(',', $types) : Array ();
+
+		$except_types = $event->getEventParam('except');
+		$except_types = $except_types ? explode(',', $except_types) : Array ();
+
+		/** @var kDBList $object */
+		$object = $event->getObject();
+
+		$type_clauses = parent::getTypeClauses($event);
+
+		$type_clauses['featured']['include'] = '%1$s.Featured = 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
+		$type_clauses['featured']['except'] = '%1$s.Featured != 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
+		$type_clauses['featured']['having_filter'] = false;
+
+		$type_clauses['onsale']['include'] = '%1$s.OnSale = 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
+		$type_clauses['onsale']['except'] = '%1$s.OnSale != 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
+		$type_clauses['onsale']['having_filter'] = false;
+
+		// products from selected manufacturer: begin
+		$manufacturer = $event->getEventParam('manufacturer');
+		if ( !$manufacturer ) {
+			$manufacturer = $this->Application->GetVar('manuf_id');
+		}
+
+		if ( $manufacturer ) {
+			$type_clauses['manufacturer']['include'] = '%1$s.ManufacturerId = ' . $manufacturer . ' AND PrimaryCat = 1';
+			$type_clauses['manufacturer']['except'] = '%1$s.ManufacturerId != ' . $manufacturer . ' AND PrimaryCat = 1';
+			$type_clauses['manufacturer']['having_filter'] = false;
+		}
+		// products from selected manufacturer: end
+
+		// recent products: begin
+		$recent = $this->Application->RecallVar('recent_products');
+		if ( $recent ) {
+			$recent = unserialize($recent);
+			$type_clauses['recent']['include'] = '%1$s.ProductId IN (' . implode(',', $recent) . ') AND PrimaryCat = 1';
+			$type_clauses['recent']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $recent) . ') AND PrimaryCat = 1';
+		}
+		else {
+			$type_clauses['recent']['include'] = '0';
+			$type_clauses['recent']['except'] = '1';
+		}
+		$type_clauses['recent']['having_filter'] = false;
+		// recent products: end
+
+		// compare products: begin
+		if ( in_array('compare', $types) || in_array('compare', $except_types) ) {
+			$compare_products = $this->getCompareProducts();
+
+			if ( $compare_products ) {
+				$compare_products = $this->Conn->qstrArray($compare_products);
+				$type_clauses['compare']['include'] = '%1$s.ProductId IN (' . implode(',', $compare_products) . ') AND PrimaryCat = 1';
+				$type_clauses['compare']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $compare_products) . ') AND PrimaryCat = 1';
+			}
+			else {
+				$type_clauses['compare']['include'] = '0';
+				$type_clauses['compare']['except'] = '1';
+			}
+
+			$type_clauses['compare']['having_filter'] = false;
+
+			if ( $event->getEventParam('per_page') === false ) {
+				$event->setEventParam('per_page', $this->Application->ConfigValue('MaxCompareProducts'));
+			}
+		}
+		// compare products: end
+
+		// products already in shopping cart: begin
+		if ( in_array('in_cart', $types) || in_array('in_cart', $except_types) ) {
+			$order_id = $this->Application->RecallVar('ord_id');
+
+			if ( $order_id ) {
+				$sql = 'SELECT ProductId
+						FROM ' . TABLE_PREFIX . 'OrderItems
+						WHERE OrderId = ' . $order_id;
+				$in_cart = $this->Conn->GetCol($sql);
+
+				if ( $in_cart ) {
+					$type_clauses['in_cart']['include'] = '%1$s.ProductId IN (' . implode(',', $in_cart) . ') AND PrimaryCat = 1';
+					$type_clauses['in_cart']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $in_cart) . ') AND PrimaryCat = 1';
+				}
+				else {
+					$type_clauses['in_cart']['include'] = '0';
+					$type_clauses['in_cart']['except'] = '1';
+				}
+			}
+			else {
+				$type_clauses['in_cart']['include'] = '0';
+				$type_clauses['in_cart']['except'] = '1';
+			}
+
+			$type_clauses['in_cart']['having_filter'] = false;
+		}
+		// products already in shopping cart: end
+
+		// my downloadable products: begin
+		if ( in_array('my_downloads', $types) || in_array('my_downloads', $except_types) ) {
+			$user_id = $this->Application->RecallVar('user_id');
+
+			$sql = 'SELECT ProductId
+					FROM ' . TABLE_PREFIX . 'UserFileAccess
+					WHERE PortalUserId = ' . $user_id;
+			$my_downloads = $user_id > 0 ? $this->Conn->GetCol($sql) : false;
+
+			if ( $my_downloads ) {
+				$type_clauses['my_downloads']['include'] = '%1$s.ProductId IN (' . implode(',', $my_downloads) . ') AND PrimaryCat = 1';
+				$type_clauses['my_downloads']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $my_downloads) . ') AND PrimaryCat = 1';
+			}
+			else {
+				$type_clauses['my_downloads']['include'] = '0';
+				$type_clauses['my_downloads']['except'] = '1';
+			}
+
+			$type_clauses['my_downloads']['having_filter'] = false;
+		}
+		// my downloadable products: end
+
+		// my favorite products: begin
+		if ( in_array('wish_list', $types) || in_array('wish_list', $except_types) ) {
+			$sql = 'SELECT ResourceId
+					FROM ' . $this->Application->getUnitOption('fav', 'TableName') . '
+					WHERE PortalUserId = ' . (int)$this->Application->RecallVar('user_id');
+			$wishlist_ids = $this->Conn->GetCol($sql);
+
+			if ( $wishlist_ids ) {
+				$type_clauses['wish_list']['include'] = '%1$s.ResourceId IN (' . implode(',', $wishlist_ids) . ') AND PrimaryCat = 1';
+				$type_clauses['wish_list']['except'] = '%1$s.ResourceId NOT IN (' . implode(',', $wishlist_ids) . ') AND PrimaryCat = 1';
+			}
+			else {
+				$type_clauses['wish_list']['include'] = '0';
+				$type_clauses['wish_list']['except'] = '1';
+			}
+
+			$type_clauses['wish_list']['having_filter'] = false;
+		}
+		// my favorite products: end
+
+		// products from package: begin
+		if ( in_array('content', $types) || in_array('content', $except_types) ) {
+			$object->removeFilter('category_filter');
+			$object->AddGroupByField('%1$s.ProductId');
+
+			/** @var ProductsItem $object_product */
+			$object_product = $this->Application->recallObject($event->Prefix);
+
+			$content_ids_array = $object_product->GetPackageContentIds();
+
+			if ( sizeof($content_ids_array) == 0 ) {
+				$content_ids_array = array ('-1');
+			}
+
+			if ( sizeof($content_ids_array) > 0 ) {
+				$type_clauses['content']['include'] = '%1$s.ProductId IN (' . implode(',', $content_ids_array) . ')';
+			}
+			else {
+				$type_clauses['content']['include'] = '0';
+			}
+
+			$type_clauses['related']['having_filter'] = false;
+		}
+		// products from package: end
+
+		$object->addFilter('not_virtual', '%1$s.Virtual = 0');
+
+		if ( !$this->Application->isAdminUser ) {
+			$object->addFilter('expire_filter', '%1$s.Expire IS NULL OR %1$s.Expire > ' . adodb_mktime());
+		}
+
+		return $type_clauses;
+	}
+
+	function OnClearRecent($event)
+	{
+		$this->Application->RemoveVar('recent_products');
+	}
+
+	/**
+	 * Occurs, when user rates a product
+	 *
+	 * @param kEvent $event
+	 */
+	function OnRateProduct($event)
+	{
+		$event->SetRedirectParam('pass', 'all,p');
+		$event->redirect = $this->Application->GetVar('success_template');
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$user_id = $this->Application->RecallVar('user_id');
+
+		$sql = '	SELECT * FROM ' . TABLE_PREFIX . 'SpamControl
+					WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
+					AND IPaddress="' . $this->Application->getClientIp() . '"
+					AND PortalUserId=' . $user_id . '
+					AND DataType="Rating"';
+		$res = $this->Conn->GetRow($sql);
+
+		if ( $res && $res['Expire'] < adodb_mktime() ) {
+			$sql = '	DELETE FROM ' . TABLE_PREFIX . 'SpamControl
+						WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
+						AND IPaddress="' . $this->Application->getClientIp() . '"
+						AND PortalUserId=' . $user_id . '
+						AND DataType="Rating"';
+			$this->Conn->Query($sql);
+			unset($res);
+		}
+
+		$new_rating = $this->Application->GetVar('rating');
+
+		if ( $new_rating !== false && !$res ) {
+			$rating = $object->GetDBField('CachedRating');
+			$votes = $object->GetDBField('CachedVotesQty');
+			$new_votes = $votes + 1;
+
+			$rating = (($rating * $votes) + $new_rating) / $new_votes;
+			$object->SetDBField('CachedRating', $rating);
+			$object->SetDBField('CachedVotesQty', $new_votes);
+			$object->Update();
+
+			$expire = adodb_mktime() + $this->Application->ConfigValue('product_ReviewDelay_Value') * $this->Application->ConfigValue('product_ReviewDelay_Interval');
+			$sql = '	INSERT INTO ' . TABLE_PREFIX . 'SpamControl
+							(ItemResourceId, IPaddress, PortalUserId, DataType, Expire)
+						VALUES (' . $object->GetDBField('ResourceId') . ',
+								"' . $this->Application->getClientIp() . '",
+								' . $user_id . ',
+								"Rating",
+								' . $expire . ')';
+			$this->Conn->Query($sql);
+		}
+		else {
+			$event->status == kEvent::erFAIL;
+			$event->redirect = false;
+			$object->SetError('CachedRating', 'too_frequent', 'lu_ferror_rate_duplicate');
+		}
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnCancelAction($event)
+	{
+		$event->SetRedirectParam('pass', 'all,p');
+		$event->redirect = $this->Application->GetVar('cancel_template');
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+	function OnRecommendProduct($event)
+	{
+		// used for error reporting only -> rewrite code + theme (by Alex)
+		$object = $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too
+		/** @var kDBItem $object */
+
+		$friend_email = $this->Application->GetVar('friend_email');
+		$friend_name = $this->Application->GetVar('friend_name');
+		$my_email = $this->Application->GetVar('your_email');
+		$my_name = $this->Application->GetVar('your_name');
+		$my_message = $this->Application->GetVar('your_message');
+
+		$send_params = array();
+		$send_params['to_email']=$friend_email;
+		$send_params['to_name']=$friend_name;
+		$send_params['from_email']=$my_email;
+		$send_params['from_name']=$my_name;
+		$send_params['message']=$my_message;
+
+		if ( preg_match('/' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . '/', $friend_email) ) {
+			$user_id = $this->Application->RecallVar('user_id');
+			$email_sent = $this->Application->emailUser('PRODUCT.SUGGEST', $user_id, $send_params);
+			$this->Application->emailAdmin('PRODUCT.SUGGEST');
+
+			if ( $email_sent ) {
+				$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all'));
+				$event->redirect = $this->Application->GetVar('template_success');
+			}
+			else {
+//				$event->setRedirectParams(Array('opener' => 's', 'pass' => 'all'));
+//				$event->redirect = $this->Application->GetVar('template_fail');
+
+				$object->SetError('Email', 'send_error', 'lu_email_send_error');
+				$event->status = kEvent::erFAIL;
+			}
+		}
+		else {
+			$object->SetError('Email', 'invalid_email', 'lu_InvalidEmail');
+			$event->status = kEvent::erFAIL;
+		}
+	}
+
+	/**
+	 * Creates/updates virtual product based on listing type data
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSaveVirtualProduct($event)
+	{
+		$object = $event->getObject( Array('skip_autoload' => true) );
+		$listing_type = $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
+		$listing_type->Load($event->MasterEvent->getEventParam('id'));
+
+		$product_id = $listing_type->GetDBField('VirtualProductId');
+
+		if ($product_id) {
+			$object->Load($product_id);
+		}
+
+		if (!$listing_type->GetDBField('EnableBuying')) {
+			if ($product_id) {
+				// delete virtual product here
+				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+				$temp_handler->DeleteItems($event->Prefix, $event->Special, Array($product_id));
+
+				$listing_type->SetDBField('VirtualProductId', 0);
+				$listing_type->Update();
+			}
+			return true;
+		}
+
+		$ml_formatter = $this->Application->recallObject('kMultiLanguage');
+		$object->SetDBField($ml_formatter->LangFieldName('Name'), $listing_type->GetDBField('ShopCartName') );
+		$object->SetDBField($ml_formatter->LangFieldName('Description'), $listing_type->GetDBField('Description'));
+		$object->SetDBField('SKU', 'ENHANCE_LINK_'.abs( crc32( $listing_type->GetDBField('Name') ) ) );
+
+		if ($product_id) {
+			$object->Update();
+		}
+		else {
+			$object->SetDBField('Type', 2);
+			$object->SetDBField('Status', 1);
+			$object->SetDBField('HotItem', 0);
+			$object->SetDBField('PopItem', 0);
+			$object->SetDBField('NewItem', 0);
+			$object->SetDBField('Virtual', 1);
+
+//			$processing_data = Array('ApproveEvent' => 'ls:EnhanceLinkAfterOrderApprove', 'ExpireEvent' => 'ls:ExpireLink');
+			$processing_data = Array(	'ApproveEvent'			=>	'ls:EnhanceLinkAfterOrderApprove',
+										'DenyEvent'				=>	'ls:EnhanceLinkAfterOrderDeny',
+										'CompleteOrderEvent'	=>	'ls:EnhancedLinkOnCompleteOrder',
+										'ExpireEvent'			=>	'ls:ExpireLink',
+										'HasNewProcessing'		=>	1);
+			$object->SetDBField('ProcessingData', serialize($processing_data));
+			$object->Create();
+
+			$listing_type->SetDBField('VirtualProductId', $object->GetID());
+			$listing_type->Update();
+		}
+
+		$additiona_fields = Array(	'AccessDuration'	=>	$listing_type->GetDBField('Duration'),
+									'AccessUnit'		=>	$listing_type->GetDBField('DurationType'),
+							);
+		$this->setPrimaryPrice($object->GetID(), (double)$listing_type->GetDBField('Price'), $additiona_fields);
+	}
+
+	/**
+	 * [HOOK] Deletes virtual product when listing type is deleted
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDeleteListingType($event)
+	{
+		/** @var kDBItem $listing_type */
+		$listing_type = $event->MasterEvent->getObject();
+
+		$product_id = $listing_type->GetDBField('VirtualProductId');
+
+		if ( $product_id ) {
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($product_id));
+		}
+	}
+
+	/**
+	 * Extends user membership in group when his order is approved
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSubscriptionApprove($event)
+	{
+		$field_values = $event->getEventParam('field_values');
+		$item_data = unserialize($field_values['ItemData']);
+
+		if ( !getArrayValue($item_data,'PortalGroupId') ) {
+			// is subscription product, but no group defined in it's properties
+			trigger_error('Invalid product <b>'.$field_values['ProductName'].'</b> (id: '.$field_values['ProductId'].')', E_USER_WARNING);
+			return false;
+		}
+
+		$sql = 'SELECT PortalUserId
+				FROM ' . $this->Application->getUnitOption('ord', 'TableName') . '
+				WHERE ' . $this->Application->getUnitOption('ord', 'IDField') . ' = ' . $field_values['OrderId'];
+		$user_id = $this->Conn->GetOne($sql);
+
+		$group_id = $item_data['PortalGroupId'];
+		$duration = $item_data['Duration'];
+
+		$sql = 'SELECT *
+				FROM ' . TABLE_PREFIX . 'UserGroupRelations
+				WHERE PortalUserId = ' . $user_id;
+		$user_groups = $this->Conn->Query($sql, 'GroupId');
+
+		if ( !isset($user_groups[$group_id]) ) {
+			$expire = adodb_mktime() + $duration;
+		}
+		else {
+			$expire = $user_groups[$group_id]['MembershipExpires'];
+			$expire = $expire < adodb_mktime() ? adodb_mktime() + $duration : $expire + $duration;
+		}
+
+		/*// Customization healtheconomics.org
+		if ($item_data['DurationType'] == 2) {
+			$expire = $item_data['AccessExpiration'];
+		}
+		// Customization healtheconomics.org --*/
+
+		$fields_hash = Array (
+			'PortalUserId' => $user_id,
+			'GroupId' => $group_id,
+			'MembershipExpires' => $expire,
+		);
+
+		$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations', 'REPLACE');
+
+		$sub_order = $this->Application->recallObject('ord.-sub'.$event->getEventParam('next_sub_number'), 'ord');
+		$sub_order->SetDBField('IsRecurringBilling', getArrayValue($item_data, 'IsRecurringBilling') ? 1 : 0);
+		$sub_order->SetDBField('GroupId', $group_id);
+		$sub_order->SetDBField('NextCharge_date', $expire);
+		$sub_order->SetDBField('NextCharge_time', $expire);
+	}
+
+	function OnDownloadableApprove($event)
+	{
+		$field_values = $event->getEventParam('field_values');
+		$product_id = $field_values['ProductId'];
+		$sql = 'SELECT PortalUserId FROM '.$this->Application->getUnitOption('ord', 'TableName').'
+				WHERE OrderId = '.$field_values['OrderId'];
+		$user_id = $this->Conn->GetOne($sql);
+		$sql = 'INSERT INTO '.TABLE_PREFIX.'UserFileAccess VALUES("", '.$product_id.', '.$user_id.')';
+		$this->Conn->Query($sql);
+	}
+
+	protected function OnPackageApprove(kEvent $event)
+	{
+		$field_values = $event->getEventParam('field_values');
+		$item_data = unserialize($field_values['ItemData']);
+		$package_content_ids = $item_data['PackageContent'];
+
+		/** @var ProductsItem $object_item */
+		$object_item = $this->Application->recallObject('p.packageitem', null, array ('skip_autoload' => true));
+
+		foreach ($package_content_ids as $package_item_id) {
+			$object_field_values = array ();
+
+			// query processing data from product and run approve event
+			$sql = 'SELECT ProcessingData
+					FROM ' . TABLE_PREFIX . 'Products
+					WHERE ProductId = ' . $package_item_id;
+			$processing_data = $this->Conn->GetOne($sql);
+
+			if ( $processing_data ) {
+				$processing_data = unserialize($processing_data);
+				$approve_event = new kEvent($processing_data['ApproveEvent']);
+
+				//$order_item_fields = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$grouping_data[1]);
+				$object_item->Load($package_item_id);
+
+				$object_field_values['OrderId'] = $field_values['OrderId'];
+				$object_field_values['ProductId'] = $package_item_id;
+
+				$object_field_values['ItemData'] = serialize($item_data['PackageItemsItemData'][$package_item_id]);
+
+				$approve_event->setEventParam('field_values', $object_field_values);
+				$this->Application->HandleEvent($approve_event);
+			}
+		}
+	}
+
+	/**
+	 * Saves edited item into temp table
+	 * If there is no id, new item is created in temp table
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreSave(kEvent $event)
+	{
+		$this->CheckRequiredOptions($event);
+
+		parent::OnPreSave($event);
+	}
+
+	/**
+	 * Set new price to ProductsPricing
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemCreate(kEvent $event)
+	{
+		parent::OnAfterItemCreate($event);
+
+		$this->_updateProductPrice($event);
+	}
+
+	/**
+	 * Set new price to ProductsPricing
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemUpdate(kEvent $event)
+	{
+		parent::OnAfterItemUpdate($event);
+
+		$this->_updateProductPrice($event);
+	}
+
+	/**
+	 * Updates product's primary price based on Price virtual field value
+	 *
+	 * @param kEvent $event
+	 */
+	function _updateProductPrice($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$price = $object->GetDBField('Price');
+
+		// always create primary pricing, to show on Pricing tab (in admin) for tangible products
+		$force_create = ($object->GetDBField('Type') == PRODUCT_TYPE_TANGIBLE) && is_null($price);
+
+		if ($force_create || ($price != $object->GetOriginalField('Price'))) {
+			// new product OR price was changed in virtual field
+			$this->setPrimaryPrice($object->GetID(), (float)$price);
+		}
+	}
+
+	function CheckRequiredOptions($event)
+	{
+		$object = $event->getObject();
+		if ($object->GetDBField('ProductId') == '') return ; // if product does not have ID - it's not yet created
+		$opt_object = $this->Application->recallObject('po', null, Array('skip_autoload' => true) );
+		$has_required = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$opt_object->TableName.' WHERE Required = 1 AND ProductId = '.$object->GetDBField('ProductId'));
+		//we need to imitate data sumbit, as parent' PreSave sets object values from $items_info
+		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
+		$items_info[$object->GetDBField('ProductId')]['HasRequiredOptions'] = $has_required ? '1' : '0';
+		$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
+		$object->SetDBField('HasRequiredOptions', $has_required ? 1 : 0);
+	}
+
+	/**
+	 * Sets required price in primary price backed, if it's missing, then create it
+	 *
+	 * @param int $product_id
+	 * @param double $price
+	 * @param Array $additional_fields
+	 * @return bool
+	 */
+	function setPrimaryPrice($product_id, $price, $additional_fields = Array())
+	{
+		/** @var kDBItem $pr_object */
+		$pr_object = $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) );
+
+		$pr_object->Load( Array('ProductId' => $product_id, 'IsPrimary' => 1) );
+
+		$sql = 'SELECT COUNT(*) FROM '.$pr_object->TableName.' WHERE ProductId = '.$product_id;
+		$has_pricings = $this->Conn->GetOne($sql);
+
+		if ($additional_fields) {
+			$pr_object->SetDBFieldsFromHash($additional_fields);
+		}
+
+		if( ($price === false) && $has_pricings ) return false;
+
+		if( $pr_object->isLoaded() )
+		{
+			$pr_object->SetField('Price', $price);
+			return $pr_object->Update();
+		}
+		else
+		{
+			$group_id = $this->Application->ConfigValue('User_LoggedInGroup');
+			$field_values = Array('ProductId' => $product_id, 'IsPrimary' => 1, 'MinQty' => 1, 'MaxQty' => -1, 'GroupId'=>$group_id);
+			$pr_object->SetDBFieldsFromHash($field_values);
+			$pr_object->SetField('Price', $price);
+
+			return $pr_object->Create();
+		}
+	}
+
+	/**
+	 * Occurs after deleting item, id of deleted item
+	 * is stored as 'id' param of event
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemDelete(kEvent $event)
+	{
+		parent::OnAfterItemDelete($event);
+
+		$product_id = $event->getEventParam('id');
+		if ( !$product_id ) {
+			return;
+		}
+
+		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserFileAccess
+				WHERE ProductId = ' . $product_id;
+		$this->Conn->Query($sql);
+	}
+
+	/**
+	 * Load price from temp table if product mode is temp table
+	 *
+	 * @param kEvent $event
+	 */
+
+	/**
+	 * Load price from temp table if product mode is temp table
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(kEvent $event)
+	{
+		parent::OnAfterItemLoad($event);
+
+		/** @var ProductsItem $object */
+		$object = $event->getObject();
+
+		$a_pricing = $object->getPrimaryPricing();
+		if ( !$a_pricing ) {
+			// pricing doesn't exist for new products
+			$price = $cost = null;
+		}
+		else {
+			$price = (float)$a_pricing['Price'];
+			$cost = (float)$a_pricing['Cost'];
+		}
+
+		// set original fields to use them in OnAfterItemCreate/OnAfterItemUpdate later
+		$object->SetDBField('Price', $price);
+		$object->SetOriginalField('Price', $price);
+
+		$object->SetDBField('Cost', $cost);
+		$object->SetOriginalField('Cost', $cost);
+	}
+
+	/**
+	 * Allows to add products to package besides all that parent method does
+	 *
+	 * @param kEvent $event
+	 */
+	function OnProcessSelected($event)
+	{
+		$dst_field = $this->Application->RecallVar('dst_field');
+
+		if ($dst_field == 'PackageContent') {
+			$this->OnAddToPackage($event);
+		}
+		elseif ($dst_field == 'AssignedCoupon') {
+			$coupon_id = $this->Application->GetVar('selected_ids');
+			$object = $event->getObject();
+			$object->SetDBField('AssignedCoupon', $coupon_id);
+			$this->RemoveRequiredFields($object);
+			$object->Update();
+		}
+		else {
+			parent::OnProcessSelected($event);
+		}
+		$this->finalizePopup($event);
+	}
+
+	/**
+	 * Called when some products are selected in products selector for this prefix
+	 *
+	 * @param kEvent $event
+	 */
+	function OnAddToPackage($event)
+	{
+		$selected_ids = $this->Application->GetVar('selected_ids');
+
+		// update current package content with selected products
+
+		/** @var ProductsItem $object */
+		$object = $event->getObject();
+
+		$product_ids = $selected_ids['p'] ? explode(',', $selected_ids['p']) : Array();
+
+		if ($product_ids) {
+			$current_ids = $object->GetPackageContentIds();
+			$current_ids = array_unique(array_merge($current_ids, $product_ids));
+
+			// remove package product from selected list
+			$this_product = array_search($object->GetID(), $current_ids);
+			if ($this_product !== false) {
+				unset($current_ids[$this_product]);
+			}
+
+			$dst_field = $this->Application->RecallVar('dst_field');
+			$object->SetDBField($dst_field, '|'.implode('|', $current_ids).'|');
+
+			$object->Update();
+			$this->ProcessPackageItems($event);
+		}
+
+		$this->finalizePopup($event);
+	}
+
+
+	function ProcessPackageItems(kEvent $event)
+	{
+		//$this->Application->SetVar('p_mode', 't');
+
+		/** @var ProductsItem $object */
+		$object = $event->getObject();
+
+		$content_ids = $object->GetPackageContentIds();
+
+		if (sizeof($content_ids) > 0) {
+			$total_weight = $this->Conn->GetOne('SELECT SUM(Weight) FROM '.TABLE_PREFIX.'Products WHERE ProductId IN ('.implode(', ', $content_ids).') AND Type=1');
+
+			if (!$total_weight) $total_weight = 0;
+
+			$this->Conn->Query('UPDATE '.$object->TableName.' SET Weight='.$total_weight.' WHERE ProductId='.$object->GetID());
+		}
+
+		/*
+		$this->Application->SetVar('p_mode', false);
+
+		$list = $this->Application->recallObject('p.content', 'p_List', array('types'=>'content'));
+
+		$this->Application->SetVar('p_mode', 't');
+
+		$list->Query();
+
+		$total_weight_a = 0;
+		$total_weight_b = 0;
+
+		$list->GoFirst();
+
+		while (!$list->EOL())
+		{
+			if ($list->GetDBField('Type')==1){
+				$total_weight_a += $list->GetField('Weight_a');
+				$total_weight_b += $list->GetField('Weight_b');
+			}
+			$list->GoNext();
+		}
+
+		$object->SetField('Weight_a', $total_weight_a);
+		$object->SetField('Weight_b', $total_weight_b);
+		*/
+		//$object->Update();
+
+
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
+
+	function OnSaveItems($event)
+	{
+		//$event->CallSubEvent('OnUpdate');
+		$event->redirect = false;
+		//$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all,p'));
+	}
+
+	/**
+	 * Removes product from package
+	 *
+	 * @param kEvent $event
+	 */
+	function OnRemovePackageItem($event) {
+
+		$this->Application->SetVar('p_mode', 't');
+
+		$object = $event->getObject();
+
+		$items_info = $this->Application->GetVar('p_content');
+
+		if($items_info)
+		{
+			$product_ids = array_keys($items_info);
+
+			$current_ids = $object->GetPackageContentIds();
+
+			$current_ids_flip = array_flip($current_ids);
+			foreach($product_ids as $key=>$val){
+				unset($current_ids_flip[$val]);
+			}
+			$current_ids = array_keys($current_ids_flip);
+			$current_ids_str = '|'.implode('|', array_unique($current_ids)).'|';
+			$object->SetDBField('PackageContent', $current_ids_str);
+		}
+
+		$object->Update();
+		$this->ProcessPackageItems($event);
+	}
+
+	/**
+	 * Occurs before deleting item, id of item being
+	 * deleted is stored as 'id' event param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemDelete(kEvent $event)
+	{
+		parent::OnBeforeItemDelete($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$sql = 'SELECT COUNT(*)
+				FROM ' . TABLE_PREFIX . 'Products
+				WHERE PackageContent LIKE "%|' . $object->GetID() . '%"';
+		$product_includes_in = $this->Conn->GetOne($sql);
+
+		if ( $product_includes_in > 0 ) {
+			$event->status = kEvent::erFAIL;
+		}
+	}
+
+	/**
+	 * Returns specific to each item type columns only
+	 *
+	 * @param kEvent $event
+	 * @return Array
+	 * @access protected
+	 */
+	public function getCustomExportColumns(kEvent $event)
+	{
+		$columns = parent::getCustomExportColumns($event);
+
+		$new_columns = Array (
+			'__VIRTUAL__Price' => 'Price',
+			'__VIRTUAL__Cost' => 'Cost',
+		);
+
+		return array_merge($columns, $new_columns);
+	}
+
+/**
+	 * Sets non standart virtual fields (e.g. to other tables)
+	 *
+	 * @param kEvent $event
+	 */
+	function setCustomExportColumns($event)
+	{
+		parent::setCustomExportColumns($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->setPrimaryPrice($object->GetID(), (double)$object->GetDBField('Price'), Array ('Cost' => (double)$object->GetDBField('Cost')));
+	}
+
+	function OnPreSaveAndOpenPopup($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$this->RemoveRequiredFields($object);
+		$event->CallSubEvent('OnPreSave');
+
+		$event->redirect = $this->Application->GetVar('t');
+		// pass ID too, in case if product is created by OnPreSave call to ensure proper editing
+		$event->SetRedirectParam('pass', 'all');
+		$event->SetRedirectParam($event->getPrefixSpecial(true) . '_id', $object->GetID());
+	}
+
+
+	/**
+	 * Returns ID of current item to be edited
+	 * by checking ID passed in get/post as prefix_id
+	 * or by looking at first from selected ids, stored.
+	 * Returned id is also stored in Session in case
+	 * it was explicitly passed as get/post
+	 *
+	 * @param kEvent $event
+	 * @return int
+	 * @access public
+	 */
+	public function getPassedID(kEvent $event)
+	{
+		if ( $this->Application->isAdminUser ) {
+			$event->setEventParam('raise_warnings', 0);
+		}
+
+		$passed = parent::getPassedID($event);
+
+		if ( $passed ) {
+			return $passed;
+		}
+
+		if ( $this->Application->isAdminUser ) {
+			// we may get product id out of OrderItem, if it exists
+			/** @var OrdersItem $ord_item */
+			$ord_item = $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0));
+
+			if ( $ord_item->GetDBField('ProductId') ) {
+				$passed = $ord_item->GetDBField('ProductId');
+			}
+		}
+
+		return $passed;
+	}
+
+	/**
+	 * Occurs, when config was parsed, allows to change config data dynamically
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		if (!$this->Application->LoggedIn()) {
+			return ;
+		}
+
+		$user_id = $this->Application->RecallVar('user_id');
+
+		$sql = 'SELECT PrimaryGroupId
+				FROM ' . TABLE_PREFIX . 'Users
+				WHERE PortalUserId = ' . $user_id;
+		$primary_group_id = $this->Conn->GetOne($sql);
+
+		if (!$primary_group_id) {
+			return;
+		}
+
+		$sub_select = '	SELECT pp.Price
+						FROM ' . TABLE_PREFIX . 'ProductsPricing AS pp
+			 			WHERE pp.ProductId = %1$s.ProductId AND GroupId = ' . $primary_group_id . '
+			 			ORDER BY MinQty
+			 			LIMIT 0,1';
+
+		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+		$calculated_fields['']['Price'] = 'IFNULL((' . $sub_select . '), ' . $calculated_fields['']['Price'] . ')';
+		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+	}
+
+	/**
+	 * Starts product editing, remove any pending inventory actions
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnEdit(kEvent $event)
+	{
+		$this->Application->RemoveVar('inventory_actions');
+
+		parent::OnEdit($event);
+	}
+
+	/**
+	 * Adds "Shop Cart" tab on paid listing type editing tab
+	 *
+	 * @param kEvent $event
+	 */
+	function OnModifyPaidListingConfig($event)
+	{
+		$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
+		$edit_tab_presets['Default']['shopping_cart'] = Array ('title' => 'la_tab_ShopCartEntry', 't' => 'in-commerce/paid_listings/paid_listing_type_shopcart', 'priority' => 2);
+		$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
+	}
+
+	/**
+	 * [HOOK] Allows to add cloned subitem to given prefix
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCloneSubItem(kEvent $event)
+	{
+		parent::OnCloneSubItem($event);
+
+		if ( $event->MasterEvent->Prefix == 'rev' ) {
+			$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
+			$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
+
+			$clones[$subitem_prefix]['ConfigMapping'] = Array (
+				'PerPage'				=>	'Comm_Perpage_Reviews',
+
+				'ReviewDelayInterval'	=>	'product_ReviewDelay_Value',
+				'ReviewDelayValue'		=>	'product_ReviewDelay_Interval',
+			);
+
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones);
+		}
+	}
+
+	/**
+	 * Adds product to comparison list
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAddToCompare(kEvent $event)
+	{
+		$products = $this->getCompareProducts();
+		$product_id = (int)$this->Application->GetVar($event->Prefix . '_id');
+
+		if ( $product_id ) {
+			$max_products = $this->Application->ConfigValue('MaxCompareProducts');
+
+			if ( count($products) < $max_products ) {
+				$products[] = $product_id;
+				$this->Application->Session->SetCookie('compare_products', implode('|', array_unique($products)));
+
+				$event->SetRedirectParam('result', 'added');
+			}
+			else {
+				$event->SetRedirectParam('result', 'error');
+			}
+		}
+
+		$event->SetRedirectParam('pass', 'm,p');
+	}
+
+	/**
+	 * Adds product to comparison list
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnRemoveFromCompare(kEvent $event)
+	{
+		$products = $this->getCompareProducts();
+
+		$product_id = (int)$this->Application->GetVar($event->Prefix . '_id');
+
+		if ( $product_id && in_array($product_id, $products) ) {
+			$products = array_diff($products, Array ($product_id));
+			$this->Application->Session->SetCookie('compare_products', implode('|', array_unique($products)));
+
+			$event->SetRedirectParam('result', 'removed');
+		}
+
+		$event->SetRedirectParam('pass', 'm,p');
+	}
+
+	/**
+	 * Cancels product compare
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCancelCompare(kEvent $event)
+	{
+		$this->Application->Session->SetCookie('compare_products', '', -1);
+
+		$event->SetRedirectParam('result', 'all_removed');
+	}
+
+	/**
+	 * Returns products, that needs to be compared with each other
+	 *
+	 * @return Array
+	 * @access protected
+	 */
+	protected function getCompareProducts()
+	{
+		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
+		$products = $products ? explode('|', $products) : Array ();
+
+		return $products;
+	}
+}

Property changes on: releases/5.2.2-B2/units/products/products_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.84.2.6
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/products/products_item.php
===================================================================
--- releases/5.2.2-B2/units/products/products_item.php	(revision 0)
+++ releases/5.2.2-B2/units/products/products_item.php	(revision 16630)
@@ -0,0 +1,85 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class ProductsItem extends kCatDBItem
+	{
+		function GetPackageContentIds()
+		{
+			$ids_string = trim($this->GetDBField('PackageContent'), '|');
+			if ($ids_string) {
+				$ids_array = explode('|', $ids_string);
+				return $ids_array;
+			}
+			else {
+				return array();
+			}
+		}
+
+		/**
+		 * Returns field values from primary pricing for product
+		 *
+		 * @return array
+		 */
+		function getPrimaryPricing()
+		{
+			// product + pricing based
+			$cache_key = 'product_primary_pricing[%PIDSerial:' . $this->GetID() . '%][%PrIDSerial:ProductId:' . $this->GetID() . '%]';
+
+			if (!$this->Application->isAdmin && $this->Application->LoggedIn()) {
+				// also group based
+				$primary_group = (int)$this->Application->Session->GetField('GroupId');
+				$cache_key .= ':group=' . $primary_group;
+			}
+
+			// don't cache, while in temp table
+			$price_info = $this->IsTempTable() ? false : $this->Application->getCache($cache_key);
+
+			if ($price_info === false) {
+				if (!$this->Application->isAdmin && $this->Application->LoggedIn()) {
+					// logged in user on front-end
+					$this->Conn->nextQueryCachable = true;
+					$sql = 'SELECT Price, Cost
+							FROM ' . TABLE_PREFIX . 'ProductsPricing
+							WHERE (ProductId = ' . $this->GetID() . ') AND (GroupId = ' . $primary_group . ')
+							ORDER BY MinQty';
+					$price_info = $this->Conn->GetRow($sql);
+
+					if ($price_info !== false) {
+						$this->Application->setCache($cache_key, $price_info);
+
+						return $price_info;
+					}
+				}
+
+				// not logged-in user on front-end or in administrative console
+				$pr_table = $this->Application->getUnitOption('pr', 'TableName');
+
+				if ($this->IsTempTable()) {
+					$pr_table = $this->Application->GetTempName($pr_table, 'prefix:' . $this->Prefix);
+				}
+
+				$this->Conn->nextQueryCachable = true;
+				$sql = 'SELECT Price, Cost
+						FROM ' . $pr_table . '
+						WHERE (' . $this->IDField . ' = ' . $this->GetID() . ') AND (IsPrimary = 1)';
+				$price_info = $this->Conn->GetRow($sql);
+
+				$this->Application->setCache($cache_key, $price_info);
+			}
+
+			return $price_info;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/products/products_item.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/products/products_config.php
===================================================================
--- releases/5.2.2-B2/units/products/products_config.php	(revision 0)
+++ releases/5.2.2-B2/units/products/products_config.php	(revision 16630)
@@ -0,0 +1,701 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'p',
+	'ItemClass' => Array ('class' => 'ProductsItem', 'file' => 'products_item.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'ProductsEventHandler', 'file' => 'products_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'ProductsTagProcessor', 'file' => 'products_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'CatalogItem' => true,
+	'AdminTemplatePath' => 'products',
+	'AdminTemplatePrefix' => 'products_',
+
+	'SearchConfigPostfix' => 'products',
+
+	'ConfigPriority' => 0,
+
+	'RewritePriority' => 104,
+	'RewriteListener' => 'CategoryItemRewrite:RewriteListener',
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'lst',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnBeforeCopyToLive' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnSaveVirtualProduct',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'lst',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterItemDelete'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnDeleteListingType',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'lst',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnModifyPaidListingConfig',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'file',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnNew', 'OnEdit' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnPreSave',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => 'cdata',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnDefineCustomFields',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'rev',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnCloneSubItem',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'fav',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnCloneSubItem',
+		),
+
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => 'ci',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnCloneSubItem',
+		),
+	),
+
+	'IDField' => 'ProductId',
+	'StatusField' => Array ('Status'),	// field, that is affected by Approve/Decline events
+
+	'TitleField' => 'Name',		// field, used in bluebar when editing existing item
+	'ItemType' => 11,	// this is used when relation to product is added from in-portal and via-versa
+
+	'ViewMenuPhrase' => 'la_text_Products',
+	'CatalogTabIcon' => 'in-commerce:icon16_products.png',
+
+	'ItemPropertyMappings' => Array (
+		'NewDays' => 'Product_NewDays',		// number of days item to be NEW
+		'MinPopVotes' => 'Product_MinPopVotes',	// minimum number of votes for an item to be POP
+		'MinPopRating' => 'Product_MinPopRating',	// minimum rating for an item to be POP
+		'MaxHotNumber' => 'Product_MaxHotNumber',	// maximum number of HOT (top seller) items
+
+		'HotLimit' => 'Product_HotLimit',		// variable name in inp_Cache table
+		'ClickField' => 'Hits',					// item click count is stored here (in item table)
+	),
+
+	'TitlePhrase' => 'la_text_Product',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('p' => '!la_title_Adding_Product!'),
+			'edit_status_labels' => Array ('p' => '!la_title_Editing_Product!'),
+			'new_titlefield' => Array ('p' => '!la_title_NewProduct!'),
+		),
+		'product_list' =>Array (
+			'prefixes' => Array ('c_List', 'p_List'),
+			'tag_params' => Array ('c' => Array ('per_page' =>-1)),
+			'format' => "!la_title_Categories! (#c_recordcount#) - !la_title_Products! (#p_recordcount#)",
+		),
+		'products_edit' =>Array (
+			'prefixes' => Array ('p'),
+			'new_titlefield' => Array ('p' => '!la_title_NewProduct!'),
+			'format' => "#p_status# '#p_titlefield#' - !la_title_General!",
+		),
+		'inventory' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# - '#p_titlefield#' - !la_title_Product_Inventory!"),
+		'pricing' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Pricing!"),
+		'access_pricing' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_AccessPricing!"),
+		'access' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Access!"),
+		'files' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Files!"),
+		'options' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Options!"),
+		'categories' => Array ('prefixes' => Array ('p', 'p-ci_List'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Categories!"),
+		'relations' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Relations!"),
+		'content' => Array ('prefixes' => Array ('p', 'p.content_List'), 'tag_params' => Array ('p.content' => Array ('types' => 'content', 'live_table' =>true)), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_PackageContent!"),
+		'images' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Images!"),
+		'reviews' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Reviews!"),
+		'products_custom' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Custom!"),
+		'images_edit' => Array (
+			'prefixes' => Array ('p', 'img'),
+			'new_status_labels' => Array ('img' => '!la_title_Adding_Image!'),
+			'edit_status_labels' => Array ('img' => '!la_title_Editing_Image!'),
+			'new_titlefield' => Array ('img' => '!la_title_New_Image!'),
+			'format' => "#p_status# '#p_titlefield#' - #img_status# '#img_titlefield#'",
+		),
+		'pricing_edit' => Array (
+			'prefixes' => Array ('p', 'pr'),
+			'new_status_labels' => Array ('pr' =>"!la_title_Adding_PriceBracket! '!la_title_New_PriceBracket!'"),
+			'edit_status_labels' => Array ('pr' => '!la_title_Editing_PriceBracket!'),
+			'format' => "#p_status# '#p_titlefield#' - #pr_status#",
+		),
+		'options_edit' => Array (
+			'prefixes' => Array ('p', 'po'),
+			'new_status_labels' => Array ('po' =>"!la_title_Adding_Option!"),
+			'edit_status_labels' => Array ('po' => '!la_title_Editing_Option!'),
+			'new_titlefield' => Array ('po' => '!la_title_New_Option!'),
+			'format' => "#p_status# '#p_titlefield#' - #po_status# '#po_titlefield#'",
+		),
+
+		'options_combinations' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingOptionCombinations!"),
+		'shipping_options' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingShippingOptions!"),
+
+		'file_edit' => Array (
+			'prefixes' => Array ('p', 'file'),
+			'new_status_labels' => Array ('file' =>"!la_title_Adding_File!"),
+			'edit_status_labels' => Array ('file' => '!la_title_Editing_File!'),
+			'new_titlefield' => Array ('file' => '!la_title_New_File!'),
+			'format' => "#p_status# '#p_titlefield#' - #file_status# '#file_titlefield#'",
+		),
+		'relations_edit' => Array (
+			'prefixes' => Array ('p', 'rel'),
+			'new_status_labels' => Array ('rel' =>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"),
+			'edit_status_labels' => Array ('rel' => '!la_title_Editing_Relationship!'),
+			'format' => "#p_status# '#p_titlefield#' - #rel_status#",
+		),
+		'reviews_edit' => Array (
+			'prefixes' => Array ('p', 'rev'),
+			'new_status_labels' => Array ('rev' =>"!la_title_Adding_Review! '!la_title_New_Review!'"),
+			'edit_status_labels' => Array ('rev' => '!la_title_Editing_Review!'),
+			'format' => "#p_status# '#p_titlefield#' - #rev_status#",
+		),
+
+		'products_export' => Array ('format' => '!la_title_ProductsExport!'),
+
+		'products_import' => Array ('format' => '!la_title_ImportProducts!'),
+
+		'tree_in-commerce' => Array ('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-Commerce', 'Version')),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/products/products_edit', 'priority' => 1),
+			'inventory' => Array ('title' => 'la_tab_Inventory', 't' => 'in-commerce/products/products_inventory', 'priority' => 2),
+			'access_and_pricing' => Array ('title' => 'la_tab_AccessAndPricing', 't' => 'in-commerce/products/products_access', 'priority' => 3),
+			'pricing' => Array ('title' => 'la_tab_Pricing', 't' => 'in-commerce/products/products_pricing', 'priority' => 4),
+
+//			'pricing2' => Array ('title' => 'la_tab_Pricing', 't' => 'in-commerce/products/products_access_pricing', 'priority' => 5),
+
+			'files_and_pricing' => Array ('title' => 'la_tab_FilesAndPricing', 't' => 'in-commerce/products/products_files', 'priority' => 6),
+			'options' => Array ('title' => 'la_tab_Options', 't' => 'in-commerce/products/products_options', 'priority' => 7),
+			'categories' => Array ('title' => 'la_tab_Categories', 't' => 'in-commerce/products/products_categories', 'priority' => 8),
+			'relations' => Array ('title' => 'la_tab_Relations', 't' => 'in-commerce/products/products_relations', 'priority' => 9),
+			'package_content' => Array ('title' => 'la_tab_PackageContent', 't' => 'in-commerce/products/products_packagecontent', 'priority' => 10),
+			'images' => Array ('title' => 'la_tab_Images', 't' => 'in-commerce/products/products_images', 'priority' => 11),
+			'reviews' => Array ('title' => 'la_tab_Reviews', 't' => 'in-commerce/products/products_reviews', 'priority' => 12),
+			'custom' => Array ('title' => 'la_tab_Custom', 't' => 'in-commerce/products/products_custom', 'priority' => 13),
+		),
+	),
+
+	'PermItemPrefix' => 'PRODUCT',
+
+	'PermTabText' => 'In-Commerce',
+	'PermSection' => Array ('main' => 'CATEGORY:in-commerce:products_list', 'search' => 'in-commerce:search', 'custom' => 'in-commerce:configuration_custom'),
+
+	'Sections' => Array (
+		'in-commerce' => Array (
+			'parent' => 'in-portal:root',
+			'icon' => 'ecommerce',
+			'label' => 'la_title_In-Commerce',
+			'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view'),
+			'priority' => 2.1,
+			'container' => true,
+			'type' => stTREE,
+		),
+
+		'in-commerce:products' => Array (
+			'parent' => 'in-portal:site',
+			'icon' => 'products',
+			'label' => 'la_tab_Products',
+			'url' => Array ('t' => 'catalog/advanced_view', 'anchor' => 'tab-p.showall', 'pass' => 'm'),
+			'onclick' => 'setCatalogTab(\'p.showall\')',
+			'permissions' => Array ('view'),
+			'priority' => 3.2,
+			'type' => stTREE,
+		),
+
+		// product settings
+		'in-commerce:setting_folder' => Array (
+			'parent' => 'in-portal:system',
+			'icon' => 'conf_ecommerce',
+			'label' => 'la_title_In-Commerce',
+			'use_parent_header' => 1,
+			'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view'),
+			'priority' => 3.1,
+			'container' => true,
+			'type' => stTREE,
+		),
+
+		'in-commerce:general' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_ecommerce_general',
+			'label' => 'la_tab_GeneralSettings',
+			'url' => Array ('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit'),
+			'priority' => 1,
+			'type' => stTREE,
+		),
+
+		'in-commerce:output' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'core:conf_output',
+			'label' => 'la_tab_ConfigOutput',
+			'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit'),
+			'priority' => 2,
+			'type' => stTREE,
+		),
+
+		'in-commerce:search' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'core:conf_search',
+			'label' => 'la_tab_ConfigSearch',
+			'url' => Array ('t' => 'config/config_search', 'module_key' => 'products', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view', 'edit'),
+			'priority' => 7,
+			'type' => stTREE,
+		),
+
+		'in-commerce:configuration_custom' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'core:conf_customfields',
+			'label' => 'la_tab_ConfigCustom',
+			'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 11, 'pass_section' => true, 'pass' => 'm,cf'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete'),
+			'priority' => 8,
+			'type' => stTREE,
+		),
+
+		'in-commerce:contacts' => Array (
+			'parent' => 'in-commerce:setting_folder',
+			'icon' => 'conf_contact_info',
+			'label' => 'la_tab_ConfigContacts',
+			'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit'),
+			'priority' => 10,
+			'type' => stTREE,
+		),
+	),
+
+	'FilterMenu' => Array (
+		'Groups' => Array (
+			Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => kDBList::HAVING_FILTER),
+			Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => kDBList::HAVING_FILTER),
+			Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => kDBList::HAVING_FILTER),
+			Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => kDBList::WHERE_FILTER),
+		),
+		'Filters' => Array (
+			'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
+			'show_hot' => Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
+			'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
+			'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
+		)
+	),
+
+	'TableName' => TABLE_PREFIX . 'Products',
+	'CustomDataTableName' => TABLE_PREFIX . 'ProductsCustomData',
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'AltName' => 'img.AltName',
+			'SameImages' => 'img.SameImages',
+			'LocalThumb' => 'img.LocalThumb',
+			'ThumbPath' => 'img.ThumbPath',
+			'ThumbUrl' => 'img.ThumbUrl',
+			'LocalImage' => 'img.LocalImage',
+			'LocalPath' => 'img.LocalPath',
+			'FullUrl' => 'img.Url',
+
+			'Price' => 'COALESCE(pricing.Price, 0)',
+			'Cost' => 'COALESCE(pricing.Cost, 0)',
+			'PrimaryCat' => TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
+			'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
+			'ParentPath' => TABLE_PREFIX.'Categories.ParentPath',
+			'Manufacturer' => TABLE_PREFIX.'Manufacturers.Name',
+			'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
+			'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
+			'FileSize' => 'files.Size',
+			'FilePath' => 'files.FilePath',
+			'FileVersion' => 'files.Version',
+		),
+
+		'showall' => Array (
+			'Price' => 'COALESCE(pricing.Price, 0)',
+			'Manufacturer' => TABLE_PREFIX.'Manufacturers.Name',
+			'PrimaryCat' => TABLE_PREFIX.'%3$sCategoryItems.PrimaryCat',
+			'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
+			'FileSize' => 'files.Size',
+			'FilePath' => 'files.FilePath',
+			'FileVersion' => 'files.Version',
+			'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
+			'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
+		),
+	),
+
+	'CacheModRewrite' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+					FROM %1$s
+					LEFT JOIN '.TABLE_PREFIX.'UserGroups ON '.TABLE_PREFIX.'UserGroups.GroupId = %1$s.AccessGroupId
+					LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+					{PERM_JOIN}
+					LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+					LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+					LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
+
+		'showall' => 'SELECT %1$s.* %2$s FROM %1$s
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+					LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
+					LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+					{PERM_JOIN}
+					LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+					LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'ForcedSorting' => Array ('EditorsPick' => 'desc', 'Priority' => 'desc'),
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'ItemSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'UserGroups pg ON pg.GroupId = %1$s.AccessGroupId
+				LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
+				LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
+				LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+				LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+				LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+				LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
+				LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
+	),
+
+	'SubItems' => Array ('pr', 'rev', 'img', 'po', 'poc', 'p-ci', 'rel', 'file', 'p-cdata', 'p-fav'),
+
+	'Fields' => Array (
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'max_len' =>255, 'default' => ''),
+		'AutomaticFilename' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+		),
+		'SKU' => Array ('type' => 'string', 'required' => 1, 'max_len' =>255, 'error_msgs' => Array ('required' => 'Please fill in'), 'default' => NULL),
+		'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL),
+		'DescriptionExcerpt' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => NULL),
+		'Weight' => Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kUnitFormatter', 'format' => '%0.2f', 'default' => NULL),
+		'MSRP' => Array ('type' => 'float', 'min_value_inc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL),
+		'ManufacturerId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field' => 'ManufacturerId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'default' => 2, 'not_null' => 1,
+		),
+		'BackOrder' => Array ('type' => 'int', 'not_null' => 1, 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'default' => 2 ),
+		'BackOrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'error_msgs' => Array ('bad_date_format' => 'Please use the following date format: %s'), 'default' => NULL),
+		'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ),
+		'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ),
+		'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ),
+		'EditorsPick' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Featured' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'OnSale' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0,
+		),
+		'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'CachedRating' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kFormatter', 'default' => 0),
+		'CachedVotesQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Hits' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
+		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
+		'Type' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
+			'options' => Array (
+				PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
+				PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
+				PRODUCT_TYPE_SERVICE => 'la_product_service',
+				PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
+				/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
+			),
+			'not_null' => 1, 'default' => 1,
+		),
+		'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'ModifiedById' => Array ('type' => 'int', 'default' => NULL),
+		'CreatedById' => Array (
+			'type' => 'int',
+			'formatter' => 'kLEFTFormatter',
+			'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
+			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s',
+			'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD,
+			'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
+			'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
+		),
+		'ResourceId' => Array ('type' => 'int', 'default' => null),
+		'CachedReviewsQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0),
+		'InventoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0),
+		'QtyInStock' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'QtyInStockMin' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'QtyReserved' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'QtyBackOrdered' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'QtyOnOrder' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'InventoryComment' => Array ('type' => 'string', 'default' => null),
+		'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'error_msgs' => Array ('invalid_format' => '!la_invalid_integer!')),
+		'AccessGroupId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'UserGroups WHERE System!=1 AND Personal !=1 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', 'default' => NULL),
+		'AccessDuration' => Array ('type' => 'int', 'default' => NULL),
+		'AccessDurationType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year' ), 'default' => NULL,),
+		'AccessStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'AccessEnd' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL,),
+		'OptionsSelectionMode' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (0 => 'la_opt_Selection', 1 => 'la_opt_List'), 'default' => 0),
+		'HasRequiredOptions' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
+		'Virtual' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ProcessingData' => Array ('type' => 'string', 'default' => ''),
+		'PackageContent' => Array ('type' => 'string', 'default' => NULL),
+		'IsRecurringBilling' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+		),
+		//'PayPalRecurring' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'),
+		'ShippingMode' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (0 => 'la_shipping_AnyAndSelected', 1 => 'la_shipping_Limited'), 'not_null' => 1, 'default' =>0),
+
+		'ProcessingData' => Array ('type' => 'string', 'default' => null),
+
+		'ShippingLimitation' => Array ('type' => 'string', 'default' => NULL),
+		'AssignedCoupon' => Array (
+			'type' => 'int',
+			'formatter' => 'kLEFTFormatter', 'options' => Array (0 => 'None'),
+			'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'ProductsCoupons WHERE %s',
+			'left_key_field' => 'CouponId', 'left_title_field' => 'Name',
+			'not_null' => 1, 'default' => 0,
+		),
+		'MinQtyFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'MetaKeywords' => Array ('type' => 'string', 'default' => null),
+		'MetaDescription' => Array ('type' => 'string', 'default' => null),
+	),
+
+	'VirtualFields' => Array (
+		'Relevance' => Array ('type' => 'float', 'default' => 0),
+		'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'default' => 0),
+		'Price' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL),
+		'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL),
+		'CategoryFilename' => Array ('type' => 'string', 'default' => ''),
+		'PrimaryCat' => Array ('type' => 'int', 'default' => 0),
+		'IsHot' => Array ('type' => 'int', 'default' => 0),
+		'IsNew' => Array ('type' => 'int', 'default' => 0),
+		'IsPop' => Array ('type' => 'int', 'default' => 0),
+		'Manufacturer' => Array ('type' => 'string', 'default' => ''),
+
+		// export related fields: begin
+		'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0),
+		'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
+		'ExportFilename' => Array ('type' => 'string', 'default' => ''),
+		'FieldsSeparatedBy' => Array ('type' => 'string', 'default' => ', '),
+		'FieldsEnclosedBy' => Array ('type' => 'string', 'default' => '"'),
+		'LineEndings' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1),
+		'LineEndingsInside' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2),
+		'IncludeFieldTitles' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'default' => 1,
+		),
+		'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+		'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+		'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1),
+		'CategorySeparator' => Array ('type' => 'string', 'default' => ':'),
+		'IsBaseCategory' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
+			'use_phrases' => 1, 'default' => 0,
+		),
+		// export related fields: end
+
+		// import related fields: begin
+		'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1),
+		'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2),
+		'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => EXPORT_BASE_PATH . '/', 'default' => ''),
+		'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''),
+		'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1),
+		'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0),
+		'DuplicateCheckFields' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('Name' => 'NAME'), 'default' => '|Name|'),
+		'SkipFirstRow' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1),
+		// import related fields: end
+
+		'ThumbnailImage' => Array ('type' => 'string', 'default' => ''),
+		'FullImage' => Array ('type' => 'string', 'default' => ''),
+		'ImageAlt' => Array ('type' => 'string', 'default' => ''),
+
+		'Filename' => Array ('type' => 'string', 'default' => ''),
+		'CachedNavbar' => Array ('type' => 'string', 'default' => ''),
+		'ParentPath' => Array ('type' => 'string', 'default' => ''),
+
+		'FileSize' => Array ('type' => 'int', 'formatter' => 'kFilesizeFormatter', 'default' => 0),
+		'FilePath' => Array ('type' => 'string', 'default' => ''),
+		'FileVersion' => Array ('type' => 'string', 'default' => ''),
+
+		// for primary image
+		'AltName' => Array ('type' => 'string', 'default' => ''),
+		'SameImages' => Array ('type' => 'string', 'default' => ''),
+		'LocalThumb' => Array ('type' => 'string', 'default' => ''),
+		'ThumbPath' => Array ('type' => 'string', 'default' => ''),
+		'ThumbUrl' => Array ('type' => 'string', 'default' => ''),
+		'LocalImage' => Array ('type' => 'string', 'default' => ''),
+		'LocalPath' => Array ('type' => 'string', 'default' => ''),
+		'FullUrl' => Array ('type' => 'string', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+				'NEW' => 'icon16_product_new.png',
+			),
+			'Fields' => Array (
+				'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 65),
+				'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+				'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+				'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+				'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+				'OnSale' => Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+				/*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_range_filter', 'width' => 150, ),
+				'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
+				'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/
+			),
+		),
+
+		'Radio' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+				'NEW' => 'icon16_product_new.png',
+			),
+			'Selector' => 'radio',
+			'Fields' => Array (
+				'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+				'Priority' => Array ('filter_block' => 'grid_range_filter', 'width' => 65),
+				'Type' => Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+				'Manufacturer' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Price' => Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+				'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+				'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+
+			),
+		),
+	),
+
+	'ConfigMapping' => Array (
+		'PerPage' => 'Comm_Perpage_Products',
+		'ShortListPerPage' => 'Comm_Perpage_Products_Short',
+		'ForceEditorPick' => 'products_EditorPicksAboveRegular',
+		'DefaultSorting1Field' => 'product_OrderProductsBy',
+		'DefaultSorting2Field' => 'product_OrderProductsThenBy',
+		'DefaultSorting1Dir' => 'product_OrderProductsByDir',
+		'DefaultSorting2Dir' => 'product_OrderProductsThenByDir',
+
+		'RatingDelayValue' => 'product_RatingDelay_Value',
+		'RatingDelayInterval' => 'product_RatingDelay_Interval',
+	),
+);

Property changes on: releases/5.2.2-B2/units/products/products_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.99.2.27
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupon_items/coupon_items_config.php
===================================================================
--- releases/5.2.2-B2/units/coupon_items/coupon_items_config.php	(revision 0)
+++ releases/5.2.2-B2/units/coupon_items/coupon_items_config.php	(revision 16630)
@@ -0,0 +1,147 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'coupi',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'CouponItemsEventHandler', 'file' => 'coupon_items_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'CouponItemsTagProcessor', 'file' => 'coupon_items_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'p',
+			'HookToSpecial' => '-item',
+			'HookToEvent' => Array ('OnAfterItemDelete'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnDeleteCouponItem',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'CouponItemId',
+	'StatusField' => Array ('Status'),
+	'TableName' => TABLE_PREFIX . 'ProductsCouponItems',
+
+	'ForeignKey' => 'CouponId',
+	'ParentTableKey' => 'CouponId',
+	'ParentPrefix' => 'coup',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN ' . TABLE_PREFIX . 'Products p ON %1$s.ItemResourceId = p.ResourceId
+				LEFT JOIN ' . TABLE_PREFIX . 'Categories c ON %1$s.ItemResourceId = c.ResourceId',
+	),
+
+	/*'BelongsTo' => Array (
+		Array (
+			'prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'),
+	),*/
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('ItemName' => 'asc'),
+		),
+	),
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ProductId' => 'p.ProductId',
+			'ItemName' => 'IF(p.Name IS NULL,c.Name,p.l1_Name)',
+			'SKU' => 'p.SKU',
+			'Weight' => 'p.Weight',
+			'CreatedOn' => 'p.CreatedOn',
+			'BackOrderDate' => 'p.BackOrderDate',
+			'Status' => 'p.Status',
+			'CategoryId' => 'c.CategoryId',
+		),
+	),
+
+	'Fields' => Array (
+		'CouponItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'CouponId' => Array ('type' => 'int', 'default' => null, ),
+		'ItemResourceId' => Array ('type' => 'int', 'default' => null, ),
+		'ItemType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Product', 2 => 'la_Category', 0 => 'la_WholeOrder'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 1
+		),
+	),
+
+	'VirtualFields' => Array (
+		'ProductId' => Array ('type' => 'int', 'default' => 0),
+		'ItemName' => Array ('type' => 'string', 'default' => ''),
+		'SKU' => Array ('type' => 'string', 'default' => ''),
+		'Weight' => Array (
+			'type' => 'float',
+			'formatter' => 'kFormatter', 'format' => '%0.2f',
+			'min_value_exc' => 0, 'default' => NULL,
+		),
+		'CreatedOn' => Array (
+			'type' => 'int',
+			'formatter' => 'kDateFormatter',
+			'default' => '#NOW#',
+		),
+		'BackOrderDate' => Array (
+			'type' => 'int',
+			'formatter' => 'kDateFormatter',
+			'default' => NULL,
+		),
+		'Status' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
+			'default' => 2,
+		),
+		'CategoryId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array ('default' => 'icon16_entire_order.gif'),
+			'Fields' => Array (
+				'ItemType' => Array ( 'title' => 'la_col_ItemType', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_empty_filter', 'width' => 200, ),
+			),
+		),
+		'CouponItems' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+			),
+			'Fields' => Array (
+				'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'ItemName' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'ItemType' => Array ( 'title' => 'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/coupon_items/coupon_items_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupon_items/coupon_items_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/coupon_items/coupon_items_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/coupon_items/coupon_items_tag_processor.php	(revision 16630)
@@ -0,0 +1,48 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CouponItemsTagProcessor extends kDBTagProcessor  {
+
+	function IsEntireOrder($params)
+	{
+		$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+		if ($this->Application->IsTempMode($this->Prefix)) {
+			$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $this->Prefix);
+		}
+
+		$sql = 'SELECT COUNT(*)
+				FROM ' . $table_name . '
+				WHERE (ItemType = 0) AND (CouponId = ' . $this->Application->GetVar('coup_id') . ')';
+		return $this->Conn->GetOne($sql);
+	}
+
+	function ItemIcon($params)
+	{
+		/** @var kDBList $object */
+		$object = $this->getObject($params);
+
+		if ($object->GetDBField('ItemType') == 2) {
+			$cat_object = $this->Application->recallObject('c');
+			$cat_object->Load( $object->GetDBField('CategoryId') );
+			$cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
+
+			return $cat_tag_processor->ItemIcon();
+		}
+
+		return parent::ItemIcon($params);
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/coupon_items/coupon_items_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.8.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/coupon_items/coupon_items_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/coupon_items/coupon_items_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/coupon_items/coupon_items_event_handler.php	(revision 16630)
@@ -0,0 +1,111 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class CouponItemsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnEntireOrder' => Array ('subitem' => 'add|edit'),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Adds products from selected categories and their sub-categories and directly selected products to coupon items with duplicate checking
+	 *
+	 * @param kEvent $event
+	 */
+	function OnProcessSelected($event)
+	{
+		// uses another handler event, because does the same stuff but on different table
+		$di_handler = $this->Application->recallObject('di_EventHandler');
+		$di_handler->OnProcessSelected($event);
+	}
+
+	/**
+	 * Allows to set discount on entire order
+	 *
+	 * @param kEvent $event
+	 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
+	 * @access public
+	 */
+	function OnEntireOrder($event)
+	{
+		$object = $event->getObject();
+		$sql = 'DELETE FROM '.$object->TableName.' WHERE CouponId='.$this->Application->GetVar('coup_id');
+		$this->Conn->Query($sql);
+
+		$object->SetDBField('CouponId', $this->Application->GetVar('coup_id'));
+		$object->SetDBField('ItemResourceId', -1);
+		$object->SetDBField('ItemType', 0);
+
+		if ( $object->Create() ) {
+			$this->customProcessing($event, 'after');
+			$event->status = kEvent::erSUCCESS;
+			$event->SetRedirectParam('opener', 's'); //stay!
+		}
+		else {
+			$event->status = kEvent::erFAIL;
+			$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent','OnCreate');
+			$object->setID(0);
+		}
+	}
+
+	/**
+	 * Deletes discount items where hooked item (product) is used
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDeleteCouponItem($event)
+	{
+		$main_object = $event->MasterEvent->getObject();
+		$resource_id = $main_object->GetDBField('ResourceId');
+
+		$table = $this->Application->getUnitOption($event->Prefix,'TableName');
+		$sql = 'DELETE FROM '.$table.' WHERE ItemResourceId = '.$resource_id;
+		$this->Conn->Query($sql);
+	}
+
+	/**
+	 * Makes ItemName calculated field from primary language
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterConfigRead(kEvent $event)
+	{
+		parent::OnAfterConfigRead($event);
+
+		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
+
+		$language_id = $this->Application->GetVar('m_lang');
+		$primary_language_id = $this->Application->GetDefaultLanguageId();
+
+		$calculated_fields['']['ItemName'] = 'COALESCE(p.l' . $language_id . '_Name, p.l' . $primary_language_id . '_Name)';
+		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/coupon_items/coupon_items_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliates/affiliates_config.php
===================================================================
--- releases/5.2.2-B2/units/affiliates/affiliates_config.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliates/affiliates_config.php	(revision 16630)
@@ -0,0 +1,241 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'affil',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AffiliatesEventHandler', 'file' => 'affiliates_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AffiliatesTagProcessor', 'file' => 'affiliates_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => 'register',
+			'HookToEvent' => Array ('OnBeforeItemCreate', 'OnBeforeItemUpdate'),
+			'DoPrefix' => '',
+			'DoSpecial' => 'register',
+			'DoEvent' => 'OnValidateAffiliate',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'u',
+			'HookToSpecial' => 'register',
+			'HookToEvent' => Array ('OnCreate'),
+			'DoPrefix' => '',
+			'DoSpecial' => 'register',
+			'DoEvent' => 'OnRegisterAffiliate',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'adm',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnStartup'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnResetStatistics',
+		),
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => 'adm',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnStartup'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnStoreAffiliate',
+		),
+	),
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => 'u',
+			'AggregatedTagName' => 'IsAffiliate',
+			'LocalTagName' => 'User_IsAffiliate',
+		),
+		Array (
+			'AggregateTo' => 'u',
+			'AggregatedTagName' => 'AffiliateIsActive',
+			'LocalTagName' => 'User_AffiliateIsActive',
+		),
+		Array (
+			'AggregateTo' => 'u',
+			'AggregatedTagName' => 'AffiliateField',
+			'LocalTagName' => 'CurrentUserAffiliateField',
+		),
+		Array (
+			'AggregateTo' => 'u',
+			'AggregatedTagName' => 'IsAffiliateOrRegisterAsAffiliateAllowed',
+			'LocalTagName' => 'IsAffiliateOrRegisterAsAffiliateAllowed',
+		),
+		Array (
+			'AggregateTo' => 'm',
+			'AggregatedTagName' => 'RequireAffiliate',
+			'LocalTagName' => 'Main_RequireAffiliate',
+		),
+		Array (
+			'AggregateTo' => 'm',
+			'AggregatedTagName' => 'AllowAffiliateRegistration',
+			'LocalTagName' => 'AllowAffiliateRegistration',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'AffiliateId',
+	'StatusField' => Array ('Status'),	// field, that is affected by Approve/Decline events
+
+	'TitleField' => 'UserName',
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('affil' => '!la_title_Adding_Affiliate!'),
+			'edit_status_labels' => Array ('affil' => '!la_title_Editing_Affiliate!'),
+			'new_titlefield' => Array ('affil' => '!la_title_New_Affiliate!'),
+		),
+
+		'affiliates_list' => Array ('prefixes' => Array ('affil_List'), 'format' => "!la_title_Affiliates!"),
+		'affiliates_edit' => Array ('prefixes' => Array ('affil'), 'format' => "#affil_status# '#affil_titlefield#' - !la_title_General!"),
+		'affiliate_payments' => Array ('prefixes' => Array ('affil', 'apayments_List'), 'format' => "#affil_status# '#affil_titlefield#' - !la_title_Payments!"),
+		'affiliates_payout' => Array ('prefixes' => Array ('affil', 'apayments'), 'format' => "!la_title_PayOut_To! '#affil_titlefield#'"),
+	),
+
+	'Forms' => Array (
+		'registration' => Array (
+			'VirtualFields' => Array (
+				'TermsAccepted' => Array (
+					'type' => 'int',
+					'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+					'error_msgs' => Array ('required' => '!lu_comm_MustAgreeAffiliateTermsError!'),
+					'required' => 1, 'default' => NULL,
+				),
+			)
+		),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/affiliate_plans/affiliates_edit', 'priority' => 1),
+			'payments' => Array ('title' => 'la_tab_Payments', 't' => 'in-commerce/affiliate_plans/affiliate_edit_payments', 'priority' => 2),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:affiliates'),
+
+	'Sections' => Array (
+		'in-commerce:affiliates_folder' => Array (
+			'parent' => 'in-commerce',
+			'icon' => 'affiliates',
+			'label' => 'la_tab_Affiliates',
+			'use_parent_header' => 1,
+			'permissions' => Array (),
+			'priority' => 5,
+			'type' => stTREE,
+		),
+
+		'in-commerce:affiliates' => Array (
+			'parent' => 'in-commerce:affiliates_folder',
+			'icon' => 'affiliates',
+			'label' => 'la_tab_Affiliates',
+			'url' => Array ('t' => 'in-commerce/affiliate_plans/affiliates_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'),
+			'priority' => 5.1, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'TableName' => TABLE_PREFIX.'Affiliates',
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'UserId' => 'u.PortalUserId',
+			'UserName' => 'IF(u.Username = "", u.Email, u.Username)',
+			'PlanName' => 'ap.Name',
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId
+				LEFT JOIN '.TABLE_PREFIX.'AffiliatePlans ap ON %1$s.AffiliatePlanId = ap.AffiliatePlanId'
+	),
+
+	'SubItems' => Array ('apayments'),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('CreatedOn' => 'desc', 'UserName' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'AffiliateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PortalUserId' => Array ('type' => 'int',  'unique'=>Array (), 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!', 'unique' => '!la_affiliate_already_exists!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' => 1, 'default' => null),
+		'AffiliatePlanId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field' => 'AffiliatePlanId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+		'AccumulatedAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'),
+		'AmountToPay' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'),
+		'LastPaymentDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'LastOrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+		'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options'=>Array (1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1', 'default' => STATUS_PENDING),
+		'AffiliateCode' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'ItemsSold' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PaymentTypeId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => ''), 'options_sql' => 'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+		'SSN' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'required' => 1),
+		'Comments' => Array ('type' => 'string', 'default' => NULL),
+		'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+	),
+
+	'VirtualFields' => Array (
+		'UserName' => Array ('type' => 'string', 'default' => ''),
+		'PlanName' => Array ('type' => 'string', 'default' => ''),
+		'UserId' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				2 => 'icon16_pending.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'AffiliateId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'UserName' => Array ( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+				'PlanName' => Array ( 'title' => 'la_col_PlanName', 'filter_block' => 'grid_like_filter'),
+
+				'PaymentTypeId' => Array ( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+				'CreatedOn' => Array ( 'title' => 'column:la_fld_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/affiliates/affiliates_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.27.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliates/affiliates_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/affiliates/affiliates_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliates/affiliates_tag_processor.php	(revision 16630)
@@ -0,0 +1,192 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatesTagProcessor extends kDBTagProcessor {
+
+		/**
+		 * Returns link to be placed on other sites
+		 *
+		 * @param array $params Tag params.
+		 *
+		 * @return string
+		 */
+		protected function GetAffiliateLink(array $params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			return $this->buildAffiliateLink($object);
+		}
+
+		/**
+		 * Returns link to be placed on other sites (for current user)
+		 *
+		 * @param array $params Tag params.
+		 *
+		 * @return string
+		 */
+		protected function GetUserAffiliateLink(array $params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($this->Prefix . '.manual', null, array('skip_autoload' => true));
+			$object->Load($this->Application->RecallVar('user_id'), 'PortalUserId');
+
+			return $this->buildAffiliateLink($object);
+		}
+
+		/**
+		 * Builds affiliate link for given affiliate record.
+		 *
+		 * @param kDBBase $object Affiliate.
+		 *
+		 * @return string
+		 */
+		protected function buildAffiliateLink(kDBBase $object)
+		{
+			$params['affiliate'] = $object->GetDBField('AffiliateCode');
+
+			if ( $this->Application->isAdmin ) {
+				$params['prefix'] = '_FRONT_END_';
+			}
+
+			// Force defaults to remove "index.html" in Mod-Rewrite mode.
+			$params['template'] = 'index';
+			$params['m_lang'] = $this->Application->GetDefaultLanguageId();
+			$params['m_theme'] = $this->Application->GetDefaultThemeId();
+
+			// Build non-SSL link without SID in case, when SSL is enabled (or SSL domain doesn't match non-SSL domain).
+			$params['__SSL__'] = 0;
+			$params['__NO_SID__'] = 1;
+
+			// Use Mod-Rewrite, when available.
+			if ( $this->Application->ConfigValue('UseModRewrite') ) {
+				$params['__MOD_REWRITE__'] = 1;
+			}
+			else {
+				$params['index_file'] = 'index.php';
+			}
+
+			$link = $this->Application->ProcessParsedTag('m', 'Link', $params);
+
+			// Manually remove "env".
+			return preg_replace('/(.*)\/index.php\?env=(.*?)&amp;(.*)/', '\\1/index.php?\\3', $link);
+		}
+
+		/**
+		 * [Aggregated Tag] Returns true if user is affiliate
+		 *
+		 * @param Array $params
+		 * @return bool
+		 * @access protected
+		 */
+		protected function User_IsAffiliate($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($this->Prefix . '.user');
+
+			return $object->isLoaded();
+		}
+
+		/**
+		 * [Aggregated Tag] Checks, that affiliate record for current user exists and is active
+		 *
+		 * @param $params
+		 * @return bool
+		 * @access protected
+		 */
+		protected function User_AffiliateIsActive($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($this->Prefix . '.user');
+
+			return $object->isLoaded() && ($object->GetDBField('Status') == STATUS_ACTIVE);
+		}
+
+		/**
+		 * Returns url for editing user from current record
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function UserLink($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$user_id = $object->GetDBField('PortalUserId');
+
+			if ( !$user_id ) {
+				return '';
+			}
+
+			$url_params =  Array (
+				'm_opener' => 'd',
+				'u_mode' => 't',
+				'u_event' => 'OnEdit',
+				'u_id' => $user_id,
+				'pass' => 'all,u'
+			);
+
+			return $this->Application->HREF($params['edit_template'], '', $url_params);
+		}
+
+		function CurrentUserAffiliateField($params)
+		{
+			return $this->Application->ProcessParsedTag($this->Prefix . '.user', 'Field', $params);
+		}
+
+		function IsAffiliateOrRegisterAsAffiliateAllowed($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($this->Prefix . '.user');
+
+			return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') || $object->isLoaded() ? 1 : 0;
+		}
+
+		/**
+		 * [AGGREGATED TAG] Checks if affiliate registration is allowed
+		 *
+		 * @param Array $params
+		 * @return int
+		 */
+		function AllowAffiliateRegistration($params)
+		{
+			return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') ? 1 : 0;
+		}
+
+		function Main_RequireAffiliate($params)
+		{
+			$t = $params['registration_template'];
+
+			if ( !$this->User_IsAffiliate($params) ) {
+				$redirect_params = Array ('next_template' => $this->Application->GetVar('t'));
+				$this->Application->Redirect($t, $redirect_params);
+			}
+		}
+
+		/**
+		 * Calls OnNew event from template, when no other event submitted
+		 *
+		 * @param Array $params
+		 */
+		function PresetFormFields($params)
+		{
+			$prefix = $this->getPrefixSpecial();
+
+			if ( !$this->Application->GetVar($prefix . '_event') && !$this->Application->GetVar('u.register_event') ) {
+				$this->Application->HandleEvent(new kEvent($prefix . ':OnNew'));
+			}
+		}
+	}

Property changes on: releases/5.2.2-B2/units/affiliates/affiliates_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/affiliates/affiliates_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/affiliates/affiliates_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/affiliates/affiliates_event_handler.php	(revision 16630)
@@ -0,0 +1,659 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AffiliatesEventHandler extends kDBEventHandler {
+
+		/**
+		 * Allows to override standard permission mapping
+		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
+		 */
+		protected function mapPermissions()
+		{
+			parent::mapPermissions();
+
+			$permissions = Array (
+				'OnItemBuild' => Array ('self' => true),
+			);
+
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
+
+		/**
+		 * Checks user permission to execute given $event
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access public
+		 */
+		public function CheckPermission(kEvent $event)
+		{
+			if ( $event->Name == 'OnBecomeAffiliate' || $event->Name == 'OnChangePaymentType' ) {
+				return $this->Application->LoggedIn() && $this->Application->ConfigValue('Comm_RegisterAsAffiliate');
+			}
+
+			return parent::CheckPermission($event);
+		}
+
+		/**
+		 * Allows to get ID of affiliate record, associated with currently logged-in user
+		 *
+		 * @param kEvent $event
+		 * @return int
+		 * @access public
+		 */
+		public function getPassedID(kEvent $event)
+		{
+			if ( $event->Special == 'user' ) {
+				$event->setEventParam('raise_warnings', 0);
+
+				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
+						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						WHERE PortalUserId = ' . (int)$this->Application->RecallVar('user_id');
+				$id = $this->Conn->GetOne($sql);
+
+				if ( $id ) {
+					return $id;
+				}
+			}
+
+			return parent::getPassedID($event);
+		}
+
+		/**
+		 * Generate new affiliate code
+		 *
+		 * @param kEvent $event
+		 * @return string
+		 */
+		function generateAffiliateCode($event)
+		{
+			// accepts 1 - 36
+			$number_length = 11;
+			$num_chars = Array(	'1'=>'a','2'=>'b','3'=>'c','4'=>'d','5'=>'e','6'=>'f',
+								'7'=>'g','8'=>'h','9'=>'i','10'=>'j','11'=>'k','12'=>'l',
+								'13'=>'m','14'=>'n','15'=>'o','16'=>'p','17'=>'q','18'=>'r',
+								'19'=>'s','20'=>'t','21'=>'u','22'=>'v','23'=>'w','24'=>'x',
+								'25'=>'y','26'=>'z','27'=>'0','28'=>'1','29'=>'2','30'=>'3',
+								'31'=>'4','32'=>'5','33'=>'6','34'=>'7','35'=>'8','36'=>'9');
+
+			$ret = '';
+			for($i=1; $i<=$number_length; $i++)
+			{
+				mt_srand((double)microtime() * 1000000);
+				$num = mt_rand(1,36);
+				$ret .= $num_chars[$num];
+			}
+			$ret = strtoupper($ret);
+
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+
+			$sql = 'SELECT %s FROM %s WHERE AffiliateCode = %s';
+			$code_found = $this->Conn->GetOne( sprintf($sql, $id_field, $table, $this->Conn->qstr($ret) ) );
+			if($code_found) return $this->generateAffiliateCode($event);
+
+			return $ret;
+		}
+
+		/**
+		 * Creates new affiliate code when new affiliate is created
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(kEvent $event)
+		{
+			parent::OnBeforeItemCreate($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$object->SetDBField('AffiliateCode', $this->generateAffiliateCode($event));
+
+			if ( $object->getFormName() == 'registration' ) {
+				if ( $this->Application->LoggedIn() ) {
+					$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
+				}
+
+				$object->SetDBField('AffiliatePlanId', $this->_getPrimaryAffiliatePlan());
+			}
+		}
+
+		/**
+		 * Ensures, that user can only update his affiliate record
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			if ( !$this->Application->isAdmin ) {
+				/** @var kDBItem $object */
+				$object = $event->getObject();
+
+				$object->SetDBField('PortalUserId', $object->GetOriginalField('PortalUserId'));
+
+				if ( $object->GetDBField('PortalUserId') != $this->Application->RecallVar('user_id') ) {
+					$object->SetError('PortalUserId', 'not_owner');
+				}
+			}
+		}
+
+		/**
+		 * [HOOK] Stores affiliate id using method from Config (session or cookie) if correct code is present in url
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 */
+		function OnStoreAffiliate($event)
+		{
+			if ( defined('IS_INSTALL') && IS_INSTALL ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+
+			$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
+
+			$affiliate = $this->Application->GetVar('affiliate');
+			if ( $affiliate ) {
+				$object->Load($affiliate, 'AffiliateCode');
+			}
+			elseif ( $affiliate_storage_method == 2 ) {
+				$affiliate_id = $this->Application->GetVar('affiliate_id');
+				$object->Load($affiliate_id);
+			}
+
+			if ( $object->isLoaded() && ($object->GetDBField('Status') == 1) ) {
+				// user is found with such email
+				/** @var UsersItem $affiliate_user */
+				$affiliate_user = $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true));
+
+				$affiliate_user->Load($object->GetDBField('PortalUserId'));
+
+				if ( $affiliate_user->GetDBField('Status') == 1 ) {
+					$affiliate_id = $object->GetDBField('AffiliateId');
+					$this->Application->setVisitField('AffiliateId', $affiliate_id);
+
+					if ( $affiliate_storage_method == 1 ) {
+						$this->Application->StoreVar('affiliate_id', $affiliate_id); // per session
+					}
+					else {
+						// in cookie
+						$this->Application->Session->SetCookie('affiliate_id', $affiliate_id, $this->getCookieExpiration());
+					}
+				}
+			}
+		}
+
+		/**
+		 * Returns affiliate cookie expiration date
+		 *
+		 * @return int
+		 */
+		function getCookieExpiration()
+		{
+			$expire = $this->Application->ConfigValue('Comm_AffiliateCookieDuration'); // days
+			return adodb_mktime() + $expire * 24 * 60 * 60;
+		}
+
+		/**
+		 * Calculate what amount is earned by affiliate based on it's affiliate plan & store it
+		 *
+		 * @param kEvent $event
+		 * @author Alex
+		 */
+		function OnOrderApprove($event)
+		{
+			/** @var OrdersItem $order */
+			$order = $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
+
+			$affiliate_id = $order->GetDBField('AffiliateId');
+			if ( !$affiliate_id ) {
+				return false;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('ship_autoload' => true));
+
+			if ( $object->Load($affiliate_id) ) {
+				/** @var kDBItem $affiliate_plan */
+				$affiliate_plan = $this->Application->recallObject('ap', null, Array ('skip_autoload' => true));
+
+				$affiliate_plan->Load($object->GetDBField('AffiliatePlanId'));
+
+				if ( $affiliate_plan->isLoaded() ) {
+					$sql = 'SELECT SUM(Quantity) FROM %s WHERE OrderId = %s';
+					$orderitems_table = $this->Application->getUnitOption('orditems', 'TableName');
+					$items_sold = $this->Conn->GetOne(sprintf($sql, $orderitems_table, $order->GetID()));
+
+					$object->SetDBField('AccumulatedAmount', $object->GetDBField('AccumulatedAmount') + $order->GetDBField('TotalAmount'));
+					$object->SetDBField('ItemsSold', $object->GetDBField('ItemsSold') + $items_sold);
+
+					switch ($affiliate_plan->GetDBField('PlanType')) {
+						case 1: // by amount
+							$value = $object->GetDBField('AccumulatedAmount');
+							break;
+
+						case 2: // by items sold (count)
+							$value = $object->GetDBField('ItemsSold');
+							break;
+					}
+
+					$apb_table = $this->Application->getUnitOption('apbrackets', 'TableName');
+					$sql = 'SELECT Percent FROM %1$s WHERE (%2$s >= FromAmount) AND ( (%2$s <= ToAmount) OR (ToAmount = -1) ) AND (AffiliatePlanId = %3$s)';
+					$commission_percent = $this->Conn->GetOne(sprintf($sql, $apb_table, $this->Conn->qstr($value), $affiliate_plan->GetID()));
+
+					// process only orders of current affiliate from period start to this order date
+					$period_ends = $order->GetDBField('OrderDate');
+					$period_starts = $this->getPeriodStartTS($period_ends, $affiliate_plan->GetDBField('ResetInterval'));
+
+					$sql = 'SELECT AffiliateCommission, (SubTotal+ShippingCost+VAT) AS TotalAmount, OrderId
+							FROM ' . $order->TableName . '
+							WHERE OrderDate >= %s AND OrderDate <= %s AND AffiliateId = ' . $affiliate_id;
+
+					$amount_to_pay_before = 0;
+					$amount_to_pay_after = 0;
+					$order_update_sql = 'UPDATE ' . $order->TableName . ' SET AffiliateCommission = %s WHERE ' . $order->IDField . ' = %s';
+					$orders = $this->Conn->Query(sprintf($sql, $period_starts, $period_ends), 'OrderId');
+					if ( $orders ) {
+						foreach ($orders as $order_id => $order_data) {
+							$amount_to_pay_before += $order_data['AffiliateCommission'];
+							$commission = $order_data['TotalAmount'] * ($commission_percent / 100);
+							$this->Conn->Query(sprintf($order_update_sql, $this->Conn->qstr($commission), $order_id));
+							$amount_to_pay_after += $commission;
+						}
+
+
+					}
+					$object->SetDBField('AmountToPay', $object->GetDBField('AmountToPay') - $amount_to_pay_before + $amount_to_pay_after);
+					$object->SetDBField('LastOrderDate_date', $order->GetDBField('OrderDate_date'));
+					$object->SetDBField('LastOrderDate_time', $order->GetDBField('OrderDate_time'));
+					$object->Update();
+
+					$order->SetDBField('AffiliateCommission', $commission); // set last commission to this order, because ApproveEvent was called for him
+				}
+			}
+		}
+
+		/**
+		 * [HOOK] Validates affiliate fields on user registration form
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnValidateAffiliate($event)
+		{
+			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
+
+			$object->setID(0);
+			$field_values = $this->getSubmittedFields($event);
+			$object->SetFieldsFromHash($field_values);
+			$event->setEventParam('form_data', $field_values);
+
+			if ( !$object->Validate() ) {
+				/** @var kDBItem $user */
+				$user = $event->MasterEvent->getObject();
+
+				$user->Validate();
+
+				$event->MasterEvent->status = kEvent::erFAIL;
+			}
+		}
+
+		/**
+		 * [AFTER HOOK] to u:OnCreate
+		 *
+		 * @param kEvent $event
+		 */
+		function OnRegisterAffiliate($event)
+		{
+			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			/** @var UsersItem $user */
+			$user = $event->MasterEvent->getObject();
+
+			$object->SetDBField('PortalUserId', $user->GetID());
+
+			if ( $object->Create() ) {
+				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID());
+				$this->Application->emailAdmin('AFFILIATE.REGISTER');
+			}
+		}
+
+		/**
+		 * Returns primary affiliate plan
+		 *
+		 * @return int
+		 * @access protected
+		 */
+		protected function _getPrimaryAffiliatePlan()
+		{
+			$sql = 'SELECT AffiliatePlanId
+					FROM ' . $this->Application->getUnitOption('ap', 'TableName') . '
+					WHERE IsPrimary = 1';
+
+			return (int)$this->Conn->GetOne($sql);
+		}
+
+		/**
+		 * Creates affiliate record for logged-in user
+		 *
+		 * @param kEvent $event
+		 */
+		function OnBecomeAffiliate($event)
+		{
+			/** @var UsersItem $object */
+			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
+
+			$event->CallSubEvent('OnCreate');
+
+			if ( $event->status == kEvent::erSUCCESS ) {
+				$event->SetRedirectParam('opener', 's');
+
+				$next_template = $this->Application->GetVar('next_template');
+
+				if ( $next_template ) {
+					$event->redirect = $next_template;
+				}
+			}
+		}
+
+		/**
+		 * Change affiliate payment type of affiliate record associated with logged-in user
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnChangePaymentType($event)
+		{
+			$event->CallSubEvent('OnUpdate');
+
+			if ( $event->status == kEvent::erSUCCESS ) {
+				/** @var kDBItem $object */
+				$object = $event->getObject();
+
+				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
+
+				$next_template = $this->Application->GetVar('next_template');
+
+				if ( $next_template ) {
+					$event->redirect = $this->Application->GetVar('next_template');
+				}
+
+				$event->SetRedirectParam('opener', 's');
+			}
+		}
+
+		/**
+		 * If new payments made, then send email about that
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeDeleteFromLive(kEvent $event)
+		{
+			parent::OnBeforeDeleteFromLive($event);
+
+			/** @var kDBItem $payment_object */
+			$payment_object = $this->Application->recallObject('apayments', 'apayments', Array ('skip_autoload' => true));
+
+			$id = $event->getEventParam('id');
+			$ap_table = $this->Application->getUnitOption('apayments', 'TableName');
+
+			$sql = 'SELECT AffiliatePaymentId
+					FROM ' . $ap_table . '
+					WHERE AffiliateId = ' . $id;
+			$live_ids = $this->Conn->GetCol($sql);
+
+			$sql = 'SELECT AffiliatePaymentId
+					FROM ' . $payment_object->TableName . '
+					WHERE AffiliateId = ' . $id;
+			$temp_ids = $this->Conn->GetCol($sql);
+
+			$new_ids = array_diff($temp_ids, $live_ids);
+
+			foreach ($new_ids as $payment_id) {
+				$payment_object->Load($payment_id);
+				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT');
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$passed_id = $event->getEventParam('id');
+
+			if ( $object->GetID() != $passed_id ) {
+				$object->Load($passed_id);
+			}
+
+			$sql = 'SELECT Status
+					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+					WHERE ' . $object->IDField . ' = ' . $object->GetID();
+			$old_status = $this->Conn->GetOne($sql);
+
+			if ( $old_status == 2 && $object->GetDBField('Status') == 1 ) {
+				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+			}
+		}
+
+		/**
+		 * [HOOK] Resets statistics (accumulated amount & items sold) for affiliates based on ResetInterval in their plan
+		 *
+		 * @param kEvent $event
+		 * @author Alex
+		 */
+		function OnResetStatistics($event)
+		{
+			if ( defined('IS_INSTALL') && IS_INSTALL ) {
+				return;
+			}
+
+			$intervals = Array (86400 => 'la_day', 604800 => 'la_week', 2628000 => 'la_month', 7884000 => 'la_quartely', 31536000 => 'la_year');
+
+			$affiliates_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$affiliate_plan_table = $this->Application->getUnitOption('ap', 'TableName');
+
+			$base_time = adodb_mktime();
+			$where_clause = Array ();
+
+			foreach ($intervals as $interval_length => $interval_description) {
+				$start_timestamp = $this->getPeriodStartTS($base_time, $interval_length);
+				$where_clause[] = 'ap.ResetInterval = ' . $interval_length . ' AND LastOrderDate < ' . $start_timestamp;
+			}
+
+			$sql = 'SELECT AffiliateId
+					FROM ' . $affiliates_table . ' a
+					LEFT JOIN ' . $affiliate_plan_table . ' ap ON a.AffiliatePlanId = ap.AffiliatePlanId
+					WHERE (' . implode(') OR (', $where_clause) . ')';
+			$affiliate_ids = $this->Conn->GetCol($sql);
+
+			if ( !$affiliate_ids ) {
+				return;
+			}
+
+			if ( defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode() ) {
+				$this->Application->Debugger->appendHTML('Affiliates Pending Totals Reset: ');
+				$this->Application->Debugger->dumpVars($affiliate_ids);
+			}
+
+			$fields_hash = Array (
+				'AccumulatedAmount' => 0,
+				'ItemsSold' => 0,
+				'LastOrderDate' => $base_time,
+			);
+
+			$this->Conn->doUpdate($fields_hash, $affiliates_table, 'AffiliateId IN (' . implode(',', $affiliate_ids) . ')');
+		}
+
+		/**
+		 * Returns calendar period start timestamp based on current timestamp ($base_time) and $period_length
+		 *
+		 * @param int $base_time
+		 * @param int $period_length
+		 * @return int
+		 * @author Alex
+		 */
+		function getPeriodStartTS($base_time, $period_length)
+		{
+			$start_timestamp = 0;
+
+			switch ($period_length) {
+				case 86400: // day
+					$start_timestamp = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), adodb_date('d', $base_time), adodb_date('Y', $base_time));
+					break;
+
+				case 604800: // week
+					$day_seconds = 86400;
+					$first_week_day = $this->Application->ConfigValue('FirstDayOfWeek');
+					$morning = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), adodb_date('d', $base_time), adodb_date('Y', $base_time));
+					$week_day = adodb_date('w', $morning);
+					if ( $week_day == $first_week_day ) {
+						// if it is already first week day, then don't search for previous week day
+						$day_diff = 0;
+					}
+					else {
+						// this way, because sunday is 0, but not 7 as it should be
+						$day_diff = $week_day != 0 ? $week_day - $first_week_day : 7 - $first_week_day;
+					}
+					$start_timestamp = $morning - $day_diff * $day_seconds;
+					break;
+
+				case 2628000: // month
+					$start_timestamp = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), 1, adodb_date('Y', $base_time));
+					break;
+
+				case 7884000: // quartal
+					$first_quartal_month = (ceil(adodb_date('m', $base_time) / 3) - 1) * 3 + 1;
+					$start_timestamp = adodb_mktime(0, 0, 0, $first_quartal_month, 1, adodb_date('Y', $base_time));
+					break;
+
+				case 31536000:
+					$start_timestamp = adodb_mktime(0, 0, 0, 1, 1, adodb_date('Y', $base_time));
+					break;
+			}
+
+			return $start_timestamp;
+		}
+
+		/**
+		 * Apply same processing to each item being selected in grid
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function iterateItems(kEvent $event)
+		{
+			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
+				$event->status = kEvent::erFAIL;
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('skip_autoload' => true));
+
+			$ids = $this->StoreSelectedIDs($event);
+
+			if ( $ids ) {
+				$status_field = $object->getStatusField();
+
+				foreach ($ids as $id) {
+					$object->Load($id);
+
+					switch ($event->Name) {
+						case 'OnMassApprove':
+							$object->SetDBField($status_field, 1);
+							break;
+
+						case 'OnMassDecline':
+							$object->SetDBField($status_field, 0);
+							break;
+
+						case 'OnMassMoveUp':
+							$object->SetDBField('Priority', $object->GetDBField('Priority') + 1);
+							break;
+
+						case 'OnMassMoveDown':
+							$object->SetDBField('Priority', $object->GetDBField('Priority') - 1);
+							break;
+					}
+
+					if ( $object->Update() ) {
+						switch ($event->Name) {
+							case 'OnMassApprove':
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
+								break;
+							case 'OnMassDecline':
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED');
+								break;
+						}
+
+						$event->SetRedirectParam('opener', 's'); //stay!
+					}
+				}
+			}
+		}
+
+		/**
+		 * Checks that user in affiliate record matches current user
+		 * (non permission-based)
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access protected
+		 */
+		protected function checkItemStatus(kEvent $event)
+		{
+			if ( $this->Application->isAdminUser ) {
+				return true;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->isLoaded() ) {
+				return true;
+			}
+
+			return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
+		}
+	}

Property changes on: releases/5.2.2-B2/units/affiliates/affiliates_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.40
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/taxesdestinations/taxes_dst_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/taxesdestinations/taxes_dst_event_handler.php	(revision 16630)
@@ -0,0 +1,183 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class TaxDstEventHandler extends kDBEventHandler {
+
+	/**
+	 * Saves items
+	 *
+	 * @param kEvent $event
+	 */
+	function OnSaveDestinations($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+		/** @var kDBItem $tax_object */
+		$tax_object = $this->Application->recallObject('tax');
+
+		$std_dest_id = $this->Application->GetVar('StatesCountry');
+
+		if ( $items_info ) {
+			/** @var kDBItem $taxdest */
+			$taxdest = $this->Application->recallObject($event->getPrefixSpecial(true), null);
+
+			$parent_info =& $object->GetLinkedInfo();
+
+			$queryDel = "DELETE FROM " . $object->TableName . " WHERE TaxZoneId=" . $parent_info['ParentId'];
+			$this->Conn->Query($queryDel);
+
+			foreach ($items_info as $field_values) {
+				if ( $tax_object->GetDBField('Type') == 3 && (!$field_values['DestValue'] || $field_values['DestValue'] == '') ) {
+					continue;
+				}
+
+				if ( !$field_values['StdDestId'] ) {
+					$field_values['StdDestId'] = $std_dest_id;
+				}
+
+				$field_values['TaxZoneId'] = $parent_info['ParentId'];
+
+				if ( $taxdest->Load($field_values['TaxZoneDestId'], "TaxZoneDestId") ) {
+					$taxdest->SetFieldsFromHash($field_values);
+					$event->setEventParam('form_data', $field_values);
+
+					$taxdest->Update($field_values['TaxZoneDestId']);
+				}
+				else {
+					$taxdest->SetFieldsFromHash($field_values);
+					$event->setEventParam('form_data', $field_values);
+
+					$taxdest->Create($field_values['TaxZoneDestId']);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Creates new kDBItem
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnCreate(kEvent $event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject(Array ('skip_autoload' => true));
+
+		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+		if ( !$items_info ) {
+			return;
+		}
+
+		foreach ($items_info as $field_values) {
+			$object->setID(0);
+			$object->SetFieldsFromHash($field_values);
+			$event->setEventParam('form_data', $field_values);
+
+			$this->customProcessing($event, 'before');
+
+			if ( $object->Create() ) {
+				$this->customProcessing($event, 'after');
+			}
+			else {
+				$event->status = kEvent::erFAIL;
+				$event->redirect = false;
+				$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+				$object->setID(0);
+			}
+		}
+	}
+
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(kEvent $event, $type)
+	{
+		switch ($type) {
+			case 'before':
+				/** @var kDBItem $object */
+				$object = $event->getObject();
+
+				$events = $this->Application->GetVar('events');
+
+				if ( $events['tax'] == 'OnUpdate' ) {
+					$object->SetDBField('TaxZoneId', $this->Application->GetVar('tax_id'));
+				}
+
+				/** @var kDBItem $tax_object */
+				$tax_object = $this->Application->recallObject('tax');
+
+				if ( $tax_object->GetDBField('Type') == 3 ) {
+					$tax_object->SetDBField('StdDestId', $this->Application->GetVar('StatesCountry'));
+				}
+				break;
+		}
+	}
+
+	 /**
+	 *
+	 *
+	 * @param kEvent $event
+	 */
+	function OnZoneUpdate($event) {
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		/** @var kDBItem $zone_object */
+		$zone_object = $this->Application->recallObject('tax');
+
+		$zone_id = (int)$this->Application->GetVar('tax_id');
+		$zone_type = $zone_object->GetDBField('Type');
+
+		$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE TaxZoneId = '.$zone_id;
+		$this->Conn->Query($delete_zones_sql);
+
+		$selected_destinations = $this->Application->GetVar('selected_destinations');
+		$selected_destinations_array = explode(',', $selected_destinations);
+		$selected_destinations_array = array_unique($selected_destinations_array);
+
+		foreach ($selected_destinations_array as $key => $dest_id) {
+
+					if ($zone_object->GetDBField('Type') == 3){
+						list ($tax_dest_id, $dest_value) = explode('|', $dest_id);
+						$dest_id = $this->Application->GetVar('CountrySelector');
+					}
+					else {
+						$dest_value = '';
+					}
+
+					if ($dest_id > 0){
+						$object->SetDBField('TaxZoneId', $zone_id);
+						$object->SetDBField('StdDestId', $dest_id);
+						$object->SetDBField('DestValue', $dest_value);
+						$object->Create();
+					}
+
+		}
+
+
+	}
+
+}

Property changes on: releases/5.2.2-B2/units/taxesdestinations/taxes_dst_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/taxesdestinations/taxesdestinations_config.php
===================================================================
--- releases/5.2.2-B2/units/taxesdestinations/taxesdestinations_config.php	(revision 0)
+++ releases/5.2.2-B2/units/taxesdestinations/taxesdestinations_config.php	(revision 16630)
@@ -0,0 +1,77 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'taxdst',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => 'images.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'TaxDstEventHandler', 'file' => 'taxes_dst_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'Hooks' => Array (
+		/*Array (
+			'Mode' => hAFTER,
+			'Conditional' => true,
+			'HookToPrefix' => 'tax',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'onPreSave', 'onPreSaveAndGo' ),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnSaveDestinations',
+		),*/
+
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ( 'OnPreSave', 'OnUpdate'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnZoneUpdate',
+		),
+	),
+
+	//OnAfterItemUpdate
+	'IDField' => 'TaxZoneDestId',
+	'TableName' => TABLE_PREFIX.'TaxZonesDestinations',
+
+	'ParentTableKey'=>	'TaxZoneId',	// linked field in master table
+	'ForeignKey' => 'TaxZoneId',	// linked field in subtable
+	'ParentPrefix' => 'tax',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ListSQLs' => Array (
+		'' => '	SELECT *
+				FROM %s',
+	),
+
+	'Fields' => Array (
+		'TaxZoneDestId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'StdDestId' => Array ('type' => 'int', 'default' => 0),
+		'DestValue' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/taxesdestinations/taxesdestinations_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/discounts/discounts_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/discounts/discounts_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/discounts/discounts_event_handler.php	(revision 16630)
@@ -0,0 +1,58 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class DiscountsEventHandler extends kDBEventHandler {
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before item changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->SetDBField('Amount', abs($object->GetDBField('Amount')));
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/discounts/discounts_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/discounts/discounts_config.php
===================================================================
--- releases/5.2.2-B2/units/discounts/discounts_config.php	(revision 0)
+++ releases/5.2.2-B2/units/discounts/discounts_config.php	(revision 16630)
@@ -0,0 +1,144 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config =	Array (
+	'Prefix' => 'd',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'DiscountsEventHandler', 'file' => 'discounts_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'DiscountId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Name',
+	'TableName' => TABLE_PREFIX.'ProductsDiscounts',
+	'SubItems' => Array ('di'),
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('d' => '!la_title_Adding_Discount!'),
+			'edit_status_labels' => Array ('d' => '!la_title_Editing_Discount!'),
+			'new_titlefield' => Array ('d' => '!la_title_New_Discount!'),
+		),
+
+		'discounts_list' => Array (
+			'prefixes' => Array ('d_List'), 'format' => "!la_title_Discounts!",
+		),
+
+		'discount_edit' => Array (
+			'prefixes' => Array ('d'), 'format' => "#d_status# '#d_titlefield#' - !la_title_General!",
+		),
+
+		'discount_items' => Array (
+			'prefixes' => Array ('d', 'di_List'), 'format' => "#d_status# '#d_titlefield#' - !la_title_DiscountItems!",
+		),
+	),
+
+	'EditTabPresets' => Array (
+		'Default' => Array (
+			'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/discounts/discount_edit', 'priority' => 1),
+			'items' => Array ('title' => 'la_tab_DiscountItems', 't' => 'in-commerce/discounts/discount_items', 'priority' => 2),
+		),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:discounts'),
+
+	'Sections' => Array (
+		'in-commerce:discounts_folder' => Array (
+			'parent' => 'in-commerce',
+			'use_parent_header' => 1,
+			'icon' => 'discounts_coupons',
+			'label' => 'la_tab_DiscountsAndCoupons',
+			'permissions' => Array (),
+			'priority' => 3,
+			'type' => stTREE,
+		),
+
+		'in-commerce:discounts' => Array (
+			'parent' => 'in-commerce:discounts_folder',
+			'icon' => 'discounts_coupons',
+			'label' => 'la_tab_Discounts',
+			'url' => Array ('t' => 'in-commerce/discounts/discounts_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'),
+			'priority' => 3.1, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Name' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'DiscountId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 2 ),
+		'Name' => Array ('type' => 'string', 'required' => 1, 'default' => null, 'max_len'=>255),
+		'Start' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+		'End' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+		'GroupId' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'UserGroups WHERE Personal = 0 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name',
+			'required' => 1, 'default' => NULL
+		),
+		'Type' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter',
+			'options' => Array (
+				1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping'  */
+			),
+			'use_phrases' => 1, 'default' => 1,
+		),
+		'Amount' => Array ('type' => 'double', 'default' => null),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				2 => 'icon16_pending.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'DiscountId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Name' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+				'Start' => Array ( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'End' => Array ( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+				'GroupId' => Array ( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+				'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+				'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+				'Amount' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 100, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/discounts/discounts_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.18.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/order_items/order_items_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/order_items/order_items_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/order_items/order_items_event_handler.php	(revision 16630)
@@ -0,0 +1,371 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+	defined('FULL_PATH') or die('restricted access!');
+
+	class OrderItemsEventHandler extends kDBEventHandler
+	{
+		/**
+		 * Allows to override standard permission mapping
+		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
+		 */
+		protected function mapPermissions()
+		{
+			parent::mapPermissions();
+
+			$permissions = Array (
+				'OnItemBuild' => Array ('subitem' => true),
+				'OnSaveItems' => Array ('subitem' => 'add|edit'),
+			);
+
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
+
+		/**
+		 * Processes item selection from popup item selector
+		 *
+		 * @param kEvent $event
+		 */
+		function OnProcessSelected($event)
+		{
+			$object = $event->getObject( Array('skip_autoload' => true) );
+
+			$selected_ids = $this->Application->GetVar('selected_ids');
+			$product_ids = $selected_ids['p'];
+
+			if ($product_ids) {
+				//after adding Options Selection during adding products to order in admin, selector is in single mode
+				// = allows selecting one item at a time, but we leave this code just in case :)
+				$product_ids = explode(',', $product_ids);
+
+				/** @var ProductsItem $product_object */
+				$product_object = $this->Application->recallObject('p.-item', null, array('skip_autoload' => true));
+
+				foreach ($product_ids as $product_id) {
+					$product_object->Load($product_id);
+
+					$sql = 'SELECT COUNT(*)
+							FROM ' . $this->Application->getUnitOption('po', 'TableName') . '
+							WHERE (Required = 1) AND (ProductId = ' . $product_id . ')';
+
+					if ( $this->Conn->GetOne($sql) ) {
+						$url_params = Array (
+							$event->Prefix . '_event' => 'OnNew',
+							'p_id' => $product_id,
+							'm_opener' => 's',
+							'pass' => 'm,ord,p',
+						);
+
+						$this->Application->EventManager->openerStackPush('in-commerce/orders/order_product_edit', $url_params);
+					}
+					else {
+						/** @var OrdersEventHandler $orders_h */
+						$orders_h = $this->Application->recallObject('ord_EventHandler');
+
+						// 1 for PacakgeNum - temporary solution to overcome splitting into separate sub-orders
+						// of orders with items added through admin when approving them
+						$orders_h->AddItemToOrder($event, $product_id, null, 1);
+					}
+				}
+			}
+
+			$event->SetRedirectParam('opener', 'u');
+		}
+
+		/**
+		 * Updates subtotal field in order record.
+		 * Only for "Items" tab in "Orders -> Order Edit" in Admin
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnUpdate(kEvent $event)
+		{
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+			if ( !$items_info ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('skip_autoload' => true));
+
+			$table_info = $object->getLinkedInfo();
+
+			/** @var OrdersItem $main_object */
+			$main_object = $this->Application->recallObject($table_info['ParentPrefix']);
+
+			foreach ($items_info as $id => $field_values) {
+				$object->Clear(); // otherwise validation errors will be passed to next object
+
+				$object->Load($id);
+				$object->SetFieldsFromHash($field_values);
+				$event->setEventParam('form_data', $field_values);
+				$this->customProcessing($event, 'before');
+
+				if ( $object->Update($id) ) {
+					$this->customProcessing($event, 'after');
+					$event->status = kEvent::erSUCCESS;
+				}
+				else {
+					$oi_string = $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag');
+
+					$field_errors = $object->GetFieldErrors();
+
+					foreach ($field_errors as $field => $error_params) {
+						$error_msg = $object->GetErrorMsg($field);
+
+						if ( $error_msg ) {
+							$main_object->setCheckoutError(OrderCheckoutErrorType::PRODUCT, OrderCheckoutError::FIELD_UPDATE_ERROR, $oi_string . ':' . $field);
+						}
+					}
+
+					$event->status = kEvent::erFAIL;
+					$event->redirect = false;
+//					break;
+				}
+			}
+
+			if ( $this->Application->GetVar('t') != 'in-commerce/orders/orders_edit_items' ) {
+				return;
+			}
+
+			$sub_total = $this->getSubTotal($items_info);
+
+			if ( $sub_total !== false ) {
+				$main_object->SetDBField('SubTotal', $sub_total);
+			}
+
+			$main_object->SetDBField('ReturnTotal', $this->getReturnTotal($items_info));
+			$main_object->Update();
+		}
+
+		/**
+		 * Remembers what fields were changed
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterItemUpdate(kEvent $event)
+		{
+			parent::OnAfterItemUpdate($event);
+
+			if ( $this->Application->isAdmin ) {
+				return;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$changed_fields = $object->GetChangedFields();
+
+			if ( $changed_fields ) {
+				$table_info = $object->getLinkedInfo();
+
+				/** @var OrdersItem $main_object */
+				$main_object = $this->Application->recallObject($table_info['ParentPrefix']);
+
+				$oi_string = $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag');
+
+				foreach ($changed_fields as $changed_field => $change_info) {
+					$error_code = OrderCheckoutError::FIELD_UPDATE_SUCCESS;
+
+					if ( $changed_field == 'ItemData' ) {
+						$item_data_old = unserialize($change_info['old']);
+						$item_data_new = unserialize($change_info['new']);
+
+						if ( $item_data_old['DiscountId'] != $item_data_new['DiscountId'] || $item_data_old['DiscountType'] != $item_data_new['DiscountType'] ) {
+							if ( $item_data_new['DiscountId'] > 0 ) {
+								$error_code = $item_data_new['DiscountType'] == 'discount' ? OrderCheckoutError::DISCOUNT_APPLIED : OrderCheckoutError::COUPON_APPLIED;
+							}
+							else {
+								$error_code = $item_data_old['DiscountType'] == 'discount' ? OrderCheckoutError::DISCOUNT_REMOVED : OrderCheckoutError::COUPON_REMOVED;
+							}
+						}
+
+						if ( $error_code == OrderCheckoutError::DISCOUNT_APPLIED || $error_code == OrderCheckoutError::DISCOUNT_REMOVED ) {
+							// set general error too
+							$main_object->setCheckoutError(OrderCheckoutErrorType::DISCOUNT, $error_code);
+						}
+					}
+					elseif ( $changed_field == 'Quantity' && $this->Application->isDebugMode() ) {
+						// here is how qty is changed:
+						// OLD QTY -> NEW QTY
+						// RECALCULATE
+						// NEW QTY = IN_STOCK_QTY
+						// NEW ORDER ITEM with LEFTOVER QTY
+						$this->Application->Debugger->appendTrace();
+						$this->Application->Debugger->appendHTML('QTY_CHANGE (' . $oi_string . '): ' . $change_info['old'] . ' => ' . $change_info['new']);
+					}
+
+					$main_object->setCheckoutError(OrderCheckoutErrorType::PRODUCT, $error_code, $oi_string . ':' . $changed_field);
+				}
+			}
+		}
+
+		/**
+		 * Returns subtotal
+		 *
+		 * @param Array $items_info
+		 * @return float
+		 */
+		function getSubTotal($items_info)
+		{
+			$sub_total = 0;
+			foreach ($items_info as $id => $field_values) {
+				if (!array_key_exists('Price', $field_values)) {
+					return false;
+				}
+				$sub_total += $field_values['Quantity'] * $field_values['Price'];
+			}
+
+			return $sub_total;
+		}
+
+		/**
+		 * Returns total returned amount (refund)
+		 *
+		 * @param Array $items_info
+		 * @return float
+		 */
+		function getReturnTotal($items_info)
+		{
+			$return_total = 0;
+			foreach ($items_info as $id => $field_values) {
+				$return_total += $field_values['ReturnAmount'];
+			}
+
+			return $return_total;
+		}
+
+		/**
+		 * Saves selected items
+		 *
+		 * @param kEvent $event
+		 */
+		function OnSaveItems($event)
+		{
+			$event->CallSubEvent('OnUpdate');
+
+			$event->redirect = false;
+			$event->SetRedirectParam('opener', 's');
+			$event->SetRedirectParam('pass', 'all');
+		}
+
+		/**
+		 * Occurs after an item has been cloned
+		 * Id of newly created item is passed as event' 'id' param
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterClone(kEvent $event)
+		{
+			parent::OnAfterClone($event);
+
+			$id = $event->getEventParam('id');
+			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
+
+			$sql = 'UPDATE ' . $table . '
+					SET QuantityReserved = NULL
+					WHERE ' . $id_field . ' = ' . $id;
+			$this->Conn->Query($sql);
+		}
+
+		/**
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterItemLoad(kEvent $event)
+		{
+			parent::OnAfterItemLoad($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			$item_info = $object->GetDBField('ItemData');
+
+			if ( $item_info ) {
+				$item_info = unserialize($item_info);
+				$object->SetDBField('DiscountType', getArrayValue($item_info, 'DiscountType'));
+				$object->SetDBField('DiscountId', getArrayValue($item_info, 'DiscountId'));
+			}
+		}
+
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			/** @var kDBList $object */
+			$object = $event->getObject();
+
+			$package_num = $event->getEventParam('package_num');
+			if ( $package_num ) {
+				$object->addFilter('package_num', 'PackageNum = ' . $package_num);
+			}
+
+			$type = $event->getEventParam('product_type');
+			if ( $type ) {
+				$object->addFilter('product_type', 'p.Type =' . $type);
+			}
+		}
+
+		/**
+		 * Checks, that currently loaded item is allowed for viewing (non permission-based)
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access protected
+		 */
+		protected function checkItemStatus(kEvent $event)
+		{
+			if ( $this->Application->isAdmin ) {
+				return true;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->isLoaded() ) {
+				return true;
+			}
+
+			/** @var kDBItem $order */
+			$order = $this->Application->recallObject('ord');
+
+			if ( $order->isLoaded() && ($order->GetID() == $object->GetDBField('OrderId')) ) {
+				return $order->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
+			}
+
+			return false;
+		}
+	}

Property changes on: releases/5.2.2-B2/units/order_items/order_items_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.17.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/order_items/order_items_config.php
===================================================================
--- releases/5.2.2-B2/units/order_items/order_items_config.php	(revision 0)
+++ releases/5.2.2-B2/units/order_items/order_items_config.php	(revision 16630)
@@ -0,0 +1,177 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'orditems',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'OrderItemsEventHandler', 'file' => 'order_items_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'OrderItemsTagProcessor', 'file' => 'order_items_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'AggregateTags' => Array (
+		Array (
+			'AggregateTo' => '#PARENT#',
+			'AggregatedTagName' => 'ItemFieldEquals',
+			'LocalTagName' => 'FieldEquals',
+		),
+	),
+
+	'Hooks' => Array (
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '',
+			'HookToEvent' => Array ('OnPreSave', 'OnRecalculateItems'),
+			'DoPrefix' => '',
+			'DoSpecial' => '',
+			'DoEvent' => 'OnUpdate',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+
+	'IDField' => 'OrderItemId',
+	'TitleField' => 'OrderItemId',
+	'StatusField' => Array ('Status'),
+
+	'TableName' => TABLE_PREFIX.'OrderItems',
+
+	'ParentTableKey' => 'OrderId',
+	'ForeignKey' => 'OrderId',
+	'ParentPrefix' => 'ord',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'ItemType' => 11,
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ExtendedPrice' => '%1$s.Price * %1$s.Quantity',
+			'ExtendedPriceFlat' => '%1$s.FlatPrice * %1$s.Quantity',
+			'QuantityAvailable' => 'IF( ISNULL(p.QtyInStock) AND ISNULL(p.ProductId),"!la_ProductDeleted!", IF(p.Type = 1, IF(p.InventoryStatus = 2, poc.QtyInStock, p.QtyInStock), "") )',
+			'ItemDiscount' => '(%1$s.FlatPrice - %1$s.Price)',
+			'SKU' => 'IF(p.InventoryStatus = 2 OR NOT ISNULL(poc.CombinationCRC), poc.SKU, p.SKU)', // inventory by options OR combination found
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.*, p.* %2$s
+				FROM %1$s
+				LEFT JOIN '.TABLE_PREFIX.'Products p ON %1$s.ProductId = p.ProductId
+				LEFT JOIN '.TABLE_PREFIX.'ProductOptionCombinations poc ON (%1$s.ProductId = poc.ProductId) AND (%1$s.OptionsSalt = poc.CombinationCRC)',
+	),
+
+	'ItemSQLs' => Array (
+		'' => '	SELECT *, (Quantity*Price) AS ExtendedPrice, 0 AS QuantityAvailable
+				FROM %s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('ProductName' => 'asc', 'BackOrderFlag' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'OrderItemId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'OrderId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'ProductName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+		'Quantity' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'QuantityReserved' => Array ('type' => 'int', 'default' => null),
+		'FlatPrice' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1', 'default' => '0.0000'),
+		'Price' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1', 'default' => '0.0000'),
+		'Cost' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => '1', 'default' => '0.0000'),
+		'BackOrderFlag' => Array ('type' => 'int', 'default' => 0),
+		'Weight' => Array ('type' => 'double', 'default' => NULL),
+		'ShippingTypeId' => Array ('type' => 'string', 'default' => NULL),
+		'ItemData' => Array ('type' => 'string', 'default' => null),
+		'OptionsSalt' => Array ('type' => 'string', 'default' => 0),
+		'SplitShippingGroup' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'PackageNum' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
+		'ReturnType' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_Refund', 2 => 'la_opt_Exchange', 3 => 'la_opt_Warranty'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0
+		),
+		'ReturnAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => 0),
+		'ReturnedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
+	),
+
+	'VirtualFields' => Array (
+		'ExtendedPrice' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'ExtendedPriceFlat' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'QuantityAvailable' => Array ('type' => 'int', 'default'=>0),
+		'DiscountType' => Array ('type' => 'string', 'default' => ''),
+		'DiscountId' => Array ('type' => 'int', 'default'=>0),
+		'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'default' => ''),
+		'ItemDiscount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+		'SKU' => Array ('type' => 'string', 'default' => ''),
+		'MinQtyFreeShipping'=> Array ('type' => 'int', 'default' => 0,),
+		'Virtual' => Array ('type' => 'int', 'default' => 0),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+			),
+			'Fields' => Array (
+				'ProductName' => Array ('title' => 'la_col_ProductNameId', 'data_block' => 'grid_productname_td', 'filter_block' => 'grid_like_filter'),
+				'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'),
+				'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
+				'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
+				'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_range_filter'),
+				'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_range_filter'),
+
+				'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
+				'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'),
+				'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'),
+			),
+		),
+
+		'NotEditable' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_product.png',
+				0 => 'icon16_product_disabled.png',
+				1 => 'icon16_product.png',
+				2 => 'icon16_product_pending.png',
+			),
+			'Fields' => Array (
+				'ProductName' => Array ('title' => 'la_col_ProductNameId', 'data_block' => 'grid_productname_td'),
+				'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'),
+				'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
+				'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
+				'Price' => Array ('filter_block' => 'grid_range_filter'),
+				'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_range_filter'),
+
+				'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
+				'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'),
+				'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/order_items/order_items_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.22.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/order_items/order_items_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/order_items/order_items_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/order_items/order_items_tag_processor.php	(revision 16630)
@@ -0,0 +1,308 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class OrderItemsTagProcessor extends kDBTagProcessor
+{
+	function PrintGrid($params)
+	{
+		/** @var kDBList $order */
+		$order = $this->Application->recallObject('ord');
+
+		if ( $order->GetDBField('Status') != ORDER_STATUS_INCOMPLETE ) {
+			$params['grid'] = $params['NotEditable'];
+		}
+		else {
+			$params['grid'] = $params['Editable'];
+		}
+
+		return $this->Application->ProcessParsedTag('m', 'ParseBlock', $params);
+	}
+
+	function IsTangible($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return $object->GetDBField('Type') == PRODUCT_TYPE_TANGIBLE;
+	}
+
+	function HasQty($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return in_array($object->GetDBField('Type'), Array (PRODUCT_TYPE_TANGIBLE, 6));
+	}
+
+	function HasDiscount($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return (float)$object->GetDBField('ItemDiscount') ? 1 : 0;
+	}
+
+	function HasOptions($params)
+	{
+		$object = $this->getObject($params);
+		$item_data = @unserialize($object->GetDBField('ItemData'));
+		return isset($item_data['Options']);
+	}
+
+	function PrintOptions($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		$item_data = @unserialize($object->GetDBField('ItemData'));
+
+		$render_as = $this->SelectParam($params, 'render_as');
+		$block_params['name'] = $render_as;
+
+		/** @var kProductOptionsHelper $opt_helper */
+		$opt_helper = $this->Application->recallObject('kProductOptionsHelper');
+
+		$o = '';
+		$options = $item_data['Options'];
+		foreach ($options as $opt => $val) {
+			if ( !is_array($val) ) {
+				$val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
+			}
+			$key_data = $opt_helper->ConvertKey($opt, $object->GetDBField('ProductId'));
+
+			$parsed = $opt_helper->ExplodeOptionValues($key_data);
+			if ( $parsed ) {
+				$values = $parsed['Values'];
+				$prices = $parsed['Prices'];
+				$price_types = $parsed['PriceTypes'];
+			}
+			else {
+				$values = array ();
+				$prices = array ();
+				$price_types = array ();
+			}
+
+			$key = $key_data['Name'];
+			/*if (is_array($val)) {
+				$val = join(',', $val);
+			}*/
+
+			/** @var LanguagesItem $lang */
+			$lang = $this->Application->recallObject('lang.current');
+
+			if ( $render_as ) {
+				$block_params['option'] = $key;
+				if ( is_array($val) ) {
+					$block_params['value'] = $val;
+					$block_params['type'] = $key_data['OptionType'];
+					$block_params['price'] = $prices;
+					$block_params['price_type'] = $price_types;
+				}
+				else {
+					$price_type = array_key_exists($val, $price_types) ? $price_types[$val] : '';
+					$price = array_key_exists($val, $prices) ? $prices[$val] : '';
+
+					if ( $price_type == '$' ) {
+						$iso = $this->GetISO($params['currency']);
+						$value = $this->AddCurrencySymbol($lang->formatNumber($this->ConvertCurrency($price, $iso), 2), $iso, true); // true to force sign
+						$block_params['price'] = $value;
+						$block_params['price_type'] = '';
+						$block_params['sign'] = ''; // sign is included in the formatted value
+					}
+					else {
+						$block_params['price'] = $price;
+						$block_params['price_type'] = $price_type;
+						$block_params['sign'] = $price >= 0 ? '+' : '-';
+					}
+
+					// TODO: consider escaping in template instead
+					$block_params['value'] = kUtil::escape($val);
+					$block_params['type'] = $key_data['OptionType'];
+				}
+				$o .= $this->Application->ParseBlock($block_params, 1);
+			}
+			else {
+				$o .= $key . ': ' . $val . '<br>';
+			}
+		}
+		return $o;
+	}
+
+	function ProductsInStock($params)
+	{
+		$object = $this->getObject($params);
+
+		if (!$object->GetDBField('InventoryStatus')) {
+			// unlimited count available
+			return false;
+		}
+
+		if ($object->GetDBField('InventoryStatus') == 2) {
+			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
+			$sql = 'SELECT QtyInStock
+					FROM '.$poc_table.'
+					WHERE (ProductId = '.$object->GetDBField('ProductId').') AND (Availability = 1) AND (CombinationCRC = '.$object->GetDBField('OptionsSalt').')';
+			$ret = $this->Conn->GetOne($sql);
+		}
+		else {
+			$ret = $object->GetDBField('QtyInStock');
+		}
+
+		return $ret;
+	}
+
+	function PrintOptionValues($params)
+	{
+		$block_params['name'] = $params['render_as'];
+
+		/** @var Array $values */
+		$values = $this->Application->Parser->GetParam('value');
+
+		$prices = $this->Application->Parser->GetParam('price');
+		$price_types = $this->Application->Parser->GetParam('price_type');
+
+		$o = '';
+		$i = 0;
+		foreach ($values as $val) {
+			$i++;
+			$val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
+
+			// TODO: consider escaping in template instead
+			$block_params['value'] = kUtil::escape($val);
+
+			if ($price_types[$val] == '$') {
+				$iso = $this->GetISO($params['currency']);
+				$value = $this->AddCurrencySymbol(sprintf("%.2f", $this->ConvertCurrency($prices[$val], $iso)), $iso, true); // true to force sign
+				$block_params['price'] = $value;
+				$block_params['price_type'] = '';
+				$block_params['sign'] = ''; // sign is included in the formatted value
+			}
+			else {
+				$block_params['price'] = $prices[$val];
+				$block_params['price_type'] = $price_types[$val];
+				$block_params['sign'] = $prices[$val] >= 0 ? '+' : '-';
+			}
+			$block_params['is_last'] = $i == count($values);
+			$o.= $this->Application->ParseBlock($block_params, 1);
+		}
+		return $o;
+	}
+
+	/*function ConvertKey($key, &$object)
+	{
+		static $mapping = null;
+		if (is_null($mapping) || !isset($mapping[$object->GetDBField('ProductId')])) {
+			$table = TABLE_PREFIX.'ProductOptions';
+			$sql = 'SELECT * FROM '.$table.' WHERE ProductId = '.$object->GetDBField('ProductId');
+			$mapping[$object->GetDBField('ProductId')] = $this->Conn->Query($sql, 'ProductOptionId');
+		}
+		return $mapping[$object->GetDBField('ProductId')][$key];
+	}*/
+
+	function PrintList($params)
+	{
+		$list =& $this->GetList($params);
+		$id_field = $this->Application->getUnitOption($this->Prefix, 'IDField');
+
+		$list->Query();
+		$o = '';
+		$list->GoFirst();
+
+		$block_params = $this->prepareTagParams($params);
+		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
+		$block_params['pass_params'] = 'true';
+
+		/** @var kCatDBItem $product_object */
+		$product_object = $this->Application->recallObject('p', 'p', Array ('skip_autoload' => true));
+
+		$i = 0;
+		$product_id = $product_object->GetID();
+		$product_id_get = $this->Application->GetVar('p_id');
+		$category_id_backup = $this->Application->GetVar('m_cat_id');
+
+		while (!$list->EOL()) {
+			// load product used in orderitem
+			$this->Application->SetVar($this->getPrefixSpecial() . '_id', $list->GetDBField($id_field)); // for edit/delete links using GET
+			$this->Application->SetVar('p_id', $list->GetDBField('ProductId'));
+			$product_object->Load($list->GetDBField('ProductId')); // correct product load
+
+			$this->Application->SetVar('m_cat_id', $product_object->GetDBField('CategoryId'));
+
+			$block_params['is_last'] = ($i == $list->GetSelectedCount() - 1);
+
+			$o .= $this->Application->ParseBlock($block_params, 1);
+			$list->GoNext();
+			$i++;
+		}
+
+		// restore IDs used in cycle
+		$this->Application->SetVar('p_id', $product_id_get);
+		$this->Application->SetVar('m_cat_id', $category_id_backup);
+		$this->Application->DeleteVar($this->getPrefixSpecial() . '_id');
+
+		if ( $product_id ) {
+			$product_object->Load($product_id);
+		}
+
+		return $o;
+	}
+
+	function DisplayOptionsPricing($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		if ( $object->GetDBField('OptionsSelectionMode') == 1 ) {
+			return false;
+		}
+
+		$item_data = unserialize($object->GetDBField('ItemData'));
+		if ( !is_array($item_data) ) {
+			return false;
+		}
+
+		$options = getArrayValue($item_data, 'Options');
+
+		/** @var kProductOptionsHelper $helper */
+		$helper = $this->Application->recallObject('kProductOptionsHelper');
+
+		$crc = $helper->OptionsSalt($options, true);
+
+		$sql = 'SELECT COUNT(*)
+				FROM ' . TABLE_PREFIX . 'ProductOptionCombinations
+				WHERE CombinationCRC = ' . $crc . ' AND ProductId = ' . $object->GetDBField('ProductId') . ' AND (Price != 0 OR (PriceType = 1 AND Price = 0))';
+
+		return $this->Conn->GetOne($sql) == 0; // no overriding combinations found
+	}
+
+	function RowIndex($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		return $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag');
+	}
+
+	function FreePromoShippingAvailable($params)
+	{
+		/** @var kDBItem $object */
+		$object = $this->getObject($params);
+
+		/** @var OrderHelper $order_helper */
+		$order_helper = $this->Application->recallObject('OrderHelper');
+
+		return $order_helper->eligibleForFreePromoShipping($object);
+	}
+}

Property changes on: releases/5.2.2-B2/units/order_items/order_items_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/addresses/addresses_event_handler.php
===================================================================
--- releases/5.2.2-B2/units/addresses/addresses_event_handler.php	(revision 0)
+++ releases/5.2.2-B2/units/addresses/addresses_event_handler.php	(revision 16630)
@@ -0,0 +1,462 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AddressesEventHandler extends kDBEventHandler {
+
+		/**
+		 * Allows to override standard permission mapping
+		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
+		 */
+		protected function mapPermissions()
+		{
+			parent::mapPermissions();
+
+			$permissions = Array (
+				// user can view any form on front-end
+				'OnItemBuild' => Array ('subitem' => true),
+				'OnUpdate' => Array ('subitem' => true),
+				'OnCreate' => Array ('subitem' => true),
+				'OnDelete' => Array ('subitem' => true),
+			);
+
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
+
+		/**
+		 * Returns special of main item for linking with sub-item
+		 *
+		 * @param kEvent $event
+		 * @return string
+		 * @access protected
+		 */
+		protected function getMainSpecial(kEvent $event)
+		{
+			return '';
+		}
+
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(kEvent $event)
+		{
+			parent::SetCustomQuery($event);
+
+			if ( $this->Application->isAdminUser ) {
+				return;
+			}
+
+			/** @var kDBList $object */
+			$object = $event->getObject();
+
+			$user_id = $this->Application->RecallVar('user_id');
+			$object->addFilter('myitems_user', '%1$s.PortalUserId = ' . $user_id);
+		}
+
+		/**
+		 * Makes "use as $type" mark unique among user addresses
+		 *
+		 * @param kDBItem $object
+		 * @param string $type
+		 */
+		protected function processLastUsed(&$object, $type)
+		{
+			$is_last = $object->GetDBField('LastUsedAs' . $type);
+
+			if ( $is_last ) {
+				$fields_hash = Array ('LastUsedAs' . $type => 0);
+
+				$this->Conn->doUpdate($fields_hash, $object->TableName, 'PortalUserId = ' . $object->GetDBField('PortalUserId'));
+			}
+		}
+
+		/**
+		 * Ensures, that user have only one "use as billing" / "use as shipping" address
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->isLoaded()
+				|| (!$this->Application->permissionCheckingDisabled() && !$this->checkItemStatus($event))
+			) {
+				// Not trivially loaded object OR not current user address.
+				$event->status = kEvent::erPERM_FAIL;
+				return ;
+			}
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$cs_helper->CheckStateField($event, 'State', 'Country');
+			$cs_helper->PopulateStates($event, 'State', 'Country');
+
+			$this->processLastUsed($object, 'Shipping');
+			$this->processLastUsed($object, 'Billing');
+		}
+
+		/**
+		 * Updates kDBItem
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnUpdate(kEvent $event)
+		{
+			parent::OnUpdate($event);
+
+			$this->setNextTemplate($event);
+		}
+
+		/**
+		 * Creates new kDBItem
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnCreate(kEvent $event)
+		{
+			parent::OnCreate($event);
+
+			$this->setNextTemplate($event);
+		}
+
+		/**
+		 * Sets next template to be shown after address is added/updated
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function setNextTemplate(kEvent $event)
+		{
+			if ( $this->Application->isAdminUser ) {
+				return;
+			}
+
+			$event->SetRedirectParam('opener', 's');
+			$next_template = $this->Application->GetVar('next_template');
+
+			if ( $next_template ) {
+				$event->redirect = $next_template;
+			}
+		}
+
+		/**
+		 * Fills states for object country
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterItemLoad(kEvent $event)
+		{
+			parent::OnAfterItemLoad($event);
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$cs_helper->PopulateStates($event, 'State', 'Country');
+		}
+
+		/**
+		 * [HOOK] Update Users table when address marked as ProfileAddress is changed via addr prefix object
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access protected
+		 */
+		protected function OnUpdateProfileAddress(kEvent $event)
+		{
+			/** @var kDBItem $object */
+			$object = $event->getObject(Array ('skip_autoload' => true));
+
+			if ( !$this->Application->isAdmin ) {
+				$address_id = $this->getOrderAddressId();
+
+				if ( !$address_id ) {
+					return true;
+				}
+
+				$object->Load($address_id);
+			}
+
+			if ( !$object->GetDBField('IsProfileAddress') ) {
+				return true;
+			}
+
+			$field_map = Array (
+				'Company'		=>	1,
+				'Phone'			=>	1,
+				'Fax'			=>	1,
+				'Email'			=>	1,
+				'Address1'		=>	'Street',
+				'Address2'		=>	'Street2',
+				'City'			=>	1,
+				'State'			=>	1,
+				'Zip'			=>	1,
+				'Country'		=>	1,
+			);
+
+			/** @var UsersItem $user */
+			$user = $this->Application->recallObject($this->Application->isAdmin ? 'u' : 'u.current');
+
+			$user->setName( $object->GetDBField('To') );
+
+			foreach ($field_map as $src_field => $dst_field) {
+				if ( $dst_field == 1 ) {
+					$dst_field = $src_field;
+				}
+
+				$user->SetDBField($dst_field, $object->GetDBField($src_field));
+			}
+
+			return $user->Update();
+		}
+
+		/**
+		 * Returns ID of address, that is selected in address dropdown on shipping/billing step of checkout
+		 *
+		 * @return int
+		 * @access protected
+		 */
+		protected function getOrderAddressId()
+		{
+			$ret = false;
+
+			if ( $this->Application->GetVar('billing_address_id') > 0 ) {
+				$ret = $this->Application->GetVar('billing_address_id');
+			}
+			elseif ( $this->Application->GetVar('shipping_address_id') > 0 ) {
+				$ret = $this->Application->GetVar('shipping_address_id');
+			}
+
+			return $ret;
+		}
+
+		/**
+		 * [HOOK] Create user profile address based on Users table data
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access protected
+		 */
+		protected function OnUpdateUserProfile(kEvent $event)
+		{
+			/** @var UsersItem $user */
+			$user = $event->MasterEvent->getObject();
+
+			$load_keys = Array ('PortalUserId' => $user->GetID(), 'IsProfileAddress' => 1);
+
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+
+			$object->Load($load_keys);
+
+			$field_map = Array (
+				'PortalUserId'	=>	1,
+				'Company'		=>	1,
+				'Phone'			=>	1,
+				'Fax'			=>	1,
+				'Email'			=>	1,
+				'Address1'		=>	'Street',
+				'Address2'		=>	'Street2',
+				'City'			=>	1,
+				'State'			=>	1,
+				'Zip'			=>	1,
+				'Country'		=>	1,
+			);
+
+			$full_name = trim($user->GetDBField('FirstName') . ' ' . $user->GetDBField('LastName'));
+			$object->SetDBField('To', $full_name);
+			$object->SetDBField('IsProfileAddress', 1);
+
+			foreach ($field_map as $dst_field => $src_field) {
+				if ( $src_field == 1 ) {
+					$src_field = $dst_field;
+				}
+
+				$object->SetDBField($dst_field, $user->GetDBField($src_field));
+			}
+
+			$sql = 'SELECT SUM(IF(LastUsedAsBilling = 1, 1, 0 )) AS HasBilling, SUM(IF(LastUsedAsShipping = 1, 1, 0)) AS HasShipping
+					FROM ' . $object->TableName . '
+					WHERE PortalUserId = ' . $user->GetID();
+			$address_status = $this->Conn->GetRow($sql);
+
+			if ( !$address_status['HasBilling'] ) {
+				$object->SetDBField('LastUsedAsBilling', 1);
+			}
+
+			if ( !$address_status['HasShipping'] ) {
+				$object->SetDBField('LastUsedAsShipping', 1);
+			}
+
+			return $object->isLoaded() ? $object->Update() : $object->Create();
+		}
+
+		/**
+		 * Checks if user trying to manipulate address that he Owns (exception for Admins)
+		 * (non permission-based)
+		 *
+		 * @param kEvent $event
+		 * @return bool
+		 * @access protected
+		 */
+		protected function checkItemStatus(kEvent $event)
+		{
+			if ( $this->Application->isAdminUser ) {
+				return true;
+			}
+
+			if ( !$this->Application->LoggedIn() ) {
+				return false;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->isLoaded() ) {
+				return true;
+			}
+
+			return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
+
+		}
+
+		/**
+		 * Ensures, that user have only one "use as billing" / "use as shipping" address
+		 * Disables Guest ability to create addresses
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(kEvent $event)
+		{
+			parent::OnBeforeItemCreate($event);
+
+			if ( !$this->Application->LoggedIn() ) {
+				$event->status = kEvent::erPERM_FAIL;
+				return ;
+			}
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$this->Application->isAdmin ) {
+				$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
+			}
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			$cs_helper->CheckStateField($event, 'State', 'Country');
+			$cs_helper->PopulateStates($event, 'State', 'Country');
+
+			$this->processLastUsed($object, 'Shipping');
+			$this->processLastUsed($object, 'Billing');
+		}
+
+		/**
+		 * Occurs before deleting item, id of item being
+		 * deleted is stored as 'id' event param
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemDelete(kEvent $event)
+		{
+			parent::OnBeforeItemDelete($event);
+
+			/** @var kDBItem $object */
+			$object = $event->getObject();
+
+			if ( !$object->isLoaded()
+				|| (!$this->Application->permissionCheckingDisabled() && !$this->checkItemStatus($event))
+			) {
+				// Not trivially loaded object OR not current user address.
+				$event->status = kEvent::erPERM_FAIL;
+				return;
+			}
+		}
+
+		/**
+		 * Sets default country for new addresses to Latvia
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterConfigRead(kEvent $event)
+		{
+			parent::OnAfterConfigRead($event);
+
+			/** @var SiteHelper $site_helper */
+			$site_helper = $this->Application->recallObject('SiteHelper');
+
+			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping');
+			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+		}
+
+		/**
+		 * [HOOK] Creates user addresses editing tab
+		 *
+		 * @param kEvent $event
+		 */
+		function OnModifyUsersConfig($event)
+		{
+			$title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
+
+			$title_presets['user_edit_addresses'] = Array (
+				'prefixes' => Array ('u', $event->Prefix . '_List'),
+				'format' => "#u_status# '#u_titlefield#' - !la_title_Addresses! (#" . $event->Prefix . "_recordcount#)"
+			);
+
+			$title_presets['user_address_edit'] = Array (
+				'prefixes' => Array ('u', $event->Prefix),
+				'new_status_labels' => Array ($event->Prefix => '!la_title_AddingAddress!'),
+				'edit_status_labels' => Array ($event->Prefix => '!la_title_EditingAddress!'),
+				'new_titlefield' => Array ($event->Prefix => '!la_title_NewAddress!'),
+				'format' => "#u_status# '#u_titlefield#' - #{$event->Prefix}_status#"
+			);
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'TitlePresets', $title_presets);
+
+			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
+
+			$edit_tab_presets['Default']['addresses'] = Array (
+				'title' => 'la_tab_Addresses', 't' => 'in-commerce/users/user_edit_addresses', 'priority' => 6
+			);
+
+			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
+		}
+	}

Property changes on: releases/5.2.2-B2/units/addresses/addresses_event_handler.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/addresses/addresses_item.php
===================================================================
--- releases/5.2.2-B2/units/addresses/addresses_item.php	(revision 0)
+++ releases/5.2.2-B2/units/addresses/addresses_item.php	(revision 16630)
@@ -0,0 +1,29 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AddressesItem extends kDBItem
+	{
+		function MarkAddress($address_type, $update_record = true)
+		{
+			$user_id = $this->Application->RecallVar('user_id');
+			$sql = 'UPDATE '.$this->TableName.'
+					SET LastUsedAs'.$address_type.' = 0
+					WHERE PortalUserId = '.$user_id;
+			$this->Conn->Query($sql);
+			$this->SetDBField('LastUsedAs'.$address_type, 1);
+
+			return $update_record ? $this->Update() : true;
+		}
+
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/addresses/addresses_item.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/addresses/addresses_config.php
===================================================================
--- releases/5.2.2-B2/units/addresses/addresses_config.php	(revision 0)
+++ releases/5.2.2-B2/units/addresses/addresses_config.php	(revision 16630)
@@ -0,0 +1,161 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'addr',
+	'ItemClass' => Array ('class' => 'AddressesItem', 'file' => 'addresses_item.php', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'AddressesList', 'file' => 'addresses_list.php', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'AddressesEventHandler', 'file' => 'addresses_event_handler.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'AddressesTagProcessor', 'file' => 'addresses_tag_processor.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'Hooks' => Array (
+		// create/update profile address (in addresses table)
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterItemCreate', 'OnAfterItemUpdate'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnUpdateUserProfile',
+		),
+		Array (
+			'Mode' => hAFTER,
+			'Conditional' => false,
+			'HookToPrefix' => '',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterItemCreate', 'OnAfterItemUpdate'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnUpdateProfileAddress',
+		),
+		Array (
+			'Mode' => hBEFORE,
+			'Conditional' => false,
+			'HookToPrefix' => '#PARENT#',
+			'HookToSpecial' => '*',
+			'HookToEvent' => Array ('OnAfterConfigRead'),
+			'DoPrefix' => '',
+			'DoSpecial' => '*',
+			'DoEvent' => 'OnModifyUsersConfig',
+		),
+	),
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+	),
+	'IDField' => 'AddressId',
+
+	'TableName' => TABLE_PREFIX.'Addresses',
+
+	'ParentTableKey' => 'PortalUserId', // linked field in master table
+	'ForeignKey' => 'PortalUserId', // linked field in sub-table
+	'ParentPrefix' => 'u',
+	'AutoDelete' => true,
+	'AutoClone' => true,
+
+	'CalculatedFields' => Array (
+		'' => Array (
+			'ShortAddress' => 'CONCAT( TRIM(CONCAT(Address1," ",Address2)),", ",City," ...")',
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s'
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('IsProfileAddress' => 'desc')
+		)
+	),
+
+	'Fields' => Array (
+		'AddressId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'To' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
+		'Company' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'Phone' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
+		'Fax' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'Email' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'not_null' => '1', 'default' => ''),
+		'Address1' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
+		'Address2' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
+		'City' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
+		'State' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (),
+			'not_null' => '1', 'default' => ''
+		),
+		'Zip' => Array ('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''),
+		'Country' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+								FROM ' . TABLE_PREFIX . 'CountryStates
+								WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+								ORDER BY Name',
+			'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+			'not_null' => '1', 'required' => 1, 'default' => ''
+		),
+		'LastUsedAsBilling' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0
+		),
+		'LastUsedAsShipping' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0
+		),
+		'IsProfileAddress' => Array (
+			'type' => 'int',
+			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+			'not_null' => 1, 'default' => 0
+		),
+	),
+
+	'VirtualFields' => Array (
+		'ShortAddress' => Array ('type' => 'string', 'default' => ''),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Fields' => Array (
+				'AddressId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+				'To' => Array ('title' => 'column:la_fld_FullName', 'filter_block' => 'grid_like_filter'),
+				'Company' => Array ('filter_block' => 'grid_like_filter'),
+				'Phone' => Array ('filter_block' => 'grid_like_filter'),
+				'Fax' => Array ('filter_block' => 'grid_like_filter'),
+				'Email' => Array ('filter_block' => 'grid_like_filter'),
+				'Address1' => Array ('title' => 'column:la_fld_AddressLine1', 'filter_block' => 'grid_like_filter'),
+				'Address2' => Array ('title' => 'column:la_fld_AddressLine2', 'filter_block' => 'grid_like_filter'),
+				'City' => Array ('filter_block' => 'grid_like_filter'),
+				'State' => Array ('filter_block' => 'grid_like_filter'),
+				'Zip' => Array ('filter_block' => 'grid_like_filter'),
+				'Country' => Array ('filter_block' => 'grid_options_filter'),
+				'LastUsedAsBilling' => Array ('filter_block' => 'grid_options_filter'),
+				'LastUsedAsShipping' => Array ('filter_block' => 'grid_options_filter'),
+				'IsProfileAddress' => Array ('filter_block' => 'grid_options_filter'),
+			),
+		),
+	),
+);

Property changes on: releases/5.2.2-B2/units/addresses/addresses_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/addresses/addresses_tag_processor.php
===================================================================
--- releases/5.2.2-B2/units/addresses/addresses_tag_processor.php	(revision 0)
+++ releases/5.2.2-B2/units/addresses/addresses_tag_processor.php	(revision 16630)
@@ -0,0 +1,98 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AddressesTagProcessor extends kDBTagProcessor {
+
+		function ListAddresses($params)
+		{
+			$ret = $this->PrintList2($params);
+
+			if ( !$ret ) {
+				$block_params = array ('name' => $params['empty_myaddresses_render_as']);
+				$ret = $this->Application->ParseBlock($block_params);
+			}
+
+			return $ret;
+		}
+
+		/**
+		 * Print location using only filled in fields
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function PrintLocation($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			$ret = '';
+			$fields = Array ('City', 'State', 'Zip', 'Country');
+
+			foreach ($fields as $field) {
+				$value = $object->GetField($field);
+				if ( $field == 'Country' && $value ) {
+					$ret .= '<br/>';
+				}
+
+				if ( $value ) {
+					$ret .= $value . ', ';
+				}
+			}
+
+			return rtrim($ret, ', ');
+		}
+
+		function EditLink($params)
+		{
+			$tag_processor = $this->Application->recallTagProcessor('m');
+			$params['pass']	= 'm,addr';
+			return $tag_processor->Link($params);
+		}
+
+		function DeleteLink($params)
+		{
+			$params['addr_event'] = 'OnDelete';
+			return $this->EditLink($params);
+		}
+
+		function NewLink($params)
+		{
+			$params['addr_event'] = 'OnNew';
+			return $this->EditLink($params);
+		}
+
+		function IsProfileAddress($params)
+		{
+			/** @var kDBItem $object */
+			$object = $this->getObject($params);
+
+			return $object->GetDBField('IsProfileAddress');
+		}
+
+		function BuildListSpecial($params)
+		{
+			if ( $this->Special != '' ) {
+				return $this->Special;
+			}
+
+			$list_unique_key = $this->getUniqueListKey($params);
+			if ( $list_unique_key == '' ) {
+				return parent::BuildListSpecial($params);
+			}
+
+			return crc32($list_unique_key);
+		}
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/addresses/addresses_tag_processor.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.1
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/addresses/addresses_list.php
===================================================================
--- releases/5.2.2-B2/units/addresses/addresses_list.php	(revision 0)
+++ releases/5.2.2-B2/units/addresses/addresses_list.php	(revision 16630)
@@ -0,0 +1,71 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	class AddressesList extends kDBList
+	{
+
+		function CopyAddress($from_address_id, $to_address_type = '')
+		{
+			$address_found = false;
+			$this->GoFirst();
+			while( !$this->EOL() )
+			{
+				if( $this->GetID() == $from_address_id )
+				{
+					$address_found = true;
+					break;
+				}
+				$this->GoNext();
+			}
+
+			if ($address_found) {
+				$order_fields = Array('To', 'Company', 'Phone', 'Fax', 'Email', 'Address1', 'Address2', 'City', 'State', 'Zip', 'Country');
+
+				$order = $this->Application->recallObject('ord');
+				foreach ($order_fields as $order_field) {
+					$order->SetDBField($to_address_type.$order_field, $this->GetDBField($order_field) );
+				}
+			}
+		}
+
+		/**
+		 * Checks if minimal required fields set is filled in address passed
+		 *
+		 * @param Array $address_data
+		 * @return bool
+		 */
+		function CheckAddress($address_data, $prefix = '')
+		{
+			$required_fields = Array('To','Address1','City','Zip','Country','Phone');
+			$ret = true;
+			foreach($required_fields as $required_field)
+			{
+				if( !$address_data[$prefix.$required_field] )
+				{
+					$ret = false;
+					break;
+				}
+			}
+			return $ret;
+		}
+
+		/*
+		function getAddressCRC($address_data, $prefix = '')
+		{
+			return crc32( 	$address_data[$prefix.'To'].$address_data[$prefix.'Company'].$address_data[$prefix.'Phone'].$address_data[$prefix.'Fax'].
+							$address_data[$prefix.'Email'].$address_data[$prefix.'Address1'].$address_data[$prefix.'Address2'].$address_data[$prefix.'City'].
+							$address_data[$prefix.'State'].$address_data[$prefix.'Zip'].$address_data[$prefix.'Country'] );
+		}
+		*/
+	}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/addresses/addresses_list.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gift_certificates/gift_certificates_eh.php
===================================================================
--- releases/5.2.2-B2/units/gift_certificates/gift_certificates_eh.php	(revision 0)
+++ releases/5.2.2-B2/units/gift_certificates/gift_certificates_eh.php	(revision 16630)
@@ -0,0 +1,202 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class GiftCertificateEventHandler extends kDBEventHandler {
+
+	/**
+	 * Allows to override standard permission mapping
+	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
+	 */
+	protected function mapPermissions()
+	{
+		parent::mapPermissions();
+
+		$permissions = Array (
+			'OnItemBuild' => Array ('self' => true),
+		);
+
+		$this->permMapping = array_merge($this->permMapping, $permissions);
+	}
+
+	/**
+	 * Prepare temp tables for creating new item
+	 * but does not create it. Actual create is
+	 * done in OnPreSaveCreated
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreCreate(kEvent $event)
+	{
+		parent::OnPreCreate($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$exp_date = adodb_mktime();
+		$default_duration = $this->Application->ConfigValue('Comm_DefaultCouponDuration');
+
+		if ( $default_duration ) {
+			$exp_date += (int)$default_duration * 86400;
+		}
+		$object->SetDBField('Expiration_date', $exp_date);
+	}
+
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(kEvent $event)
+	{
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
+	}
+
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(kEvent $event)
+	{
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$object->SetDBField('Debit', $object->GetDBField('Amount'));
+	}
+
+	/**
+	 * Occurs before item is changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged($event)
+	{
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		$amount = abs($object->GetDBField('Amount'));
+		$debit = abs($object->GetDBField('Debit'));
+
+		if ( $debit > $amount ) {
+			$debit = $amount;
+		}
+
+		$object->SetDBField('Amount', $amount);
+		$object->SetDBField('Debit', $debit);
+
+		if ( $object->GetDBField('SendVia') == 1 ) {
+			// by postal mail
+			if ( $this->Application->GetVar('email_certificate') == 0 ) {
+				$object->setRequired('RecipientEmail', false);
+			}
+
+			/** @var kCountryStatesHelper $cs_helper */
+			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+
+			if ( !$cs_helper->CountryHasStates($object->GetDBField('RecipientCountry')) ) {
+				$object->setRequired('RecipientState', false);
+			}
+
+			$cs_helper->CheckStateField($event, 'RecipientState', 'RecipientCountry');
+		}
+		else {
+			$non_required_fields = Array (
+				'RecipientState', 'RecipientCity', 'RecipientCountry', 'RecipientZipcode',
+				'RecipientAddress1', 'RecipientFirstname', 'RecipientLastname'
+			);
+
+			$object->setRequired($non_required_fields, false);
+		}
+	}
+
+	/**
+	 * Print current gift certificate
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnSave(kEvent $event)
+	{
+		parent::OnSave($event);
+
+		if ( $event->status != kEvent::erSUCCESS || !$this->Application->GetVar('print_certificate') ) {
+			return ;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject();
+
+		// get object id by unique field Code
+		$sql = 'SELECT ' . $object->IDField . '
+				FROM ' . $this->Application->GetLiveName($object->TableName) . '
+				WHERE Code = ' . $this->Conn->qstr( $object->GetDBField('Code') );
+		$id = $this->Conn->GetOne($sql);
+
+		$this->Application->StoreVar('print_certificate_id', $id);
+	}
+
+	/**
+	 * Email selected gift certificate
+	 *
+	 * @param kEvent $event
+	 */
+	function OnEmailGiftCertificate($event)
+	{
+		$ids = $this->StoreSelectedIDs($event);
+		if (!$ids) {
+			return ;
+		}
+
+		/** @var kDBItem $object */
+		$object = $event->getObject( Array ('skip_autoload' => true) );
+
+		foreach ($ids as $id) {
+			$object->Load($id);
+
+			$send_params = Array (
+				'from_email' => $this->Application->ConfigValue('DefaultEmailSender'),
+				'from_name' => $object->GetDBField('Purchaser'),
+				'message' => $object->GetDBField('Message'),
+				'amount' => $object->GetField('Amount'),
+				'gifcert_id' => $object->GetDBField('Code'),
+			);
+
+			$this->Application->emailAdmin('USER.GIFTCERTIFICATE', null, $send_params);
+
+			$send_params['to_email'] = $object->GetDBField('RecipientEmail');
+			$send_params['to_name'] = $object->GetDBField('Recipient');
+			$this->Application->emailUser('USER.GIFTCERTIFICATE', null, $send_params);
+		}
+
+		$this->clearSelectedIDs($event);
+	}
+
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gift_certificates/gift_certificates_eh.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gift_certificates/gift_certificates_tp.php
===================================================================
--- releases/5.2.2-B2/units/gift_certificates/gift_certificates_tp.php	(revision 0)
+++ releases/5.2.2-B2/units/gift_certificates/gift_certificates_tp.php	(revision 16630)
@@ -0,0 +1,47 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+class GiftCertificateTagProcessor extends kDBTagProcessor {
+
+	function HasOrder($params)
+	{
+		if ($this->IsNewItem($params)) {
+			return 0;
+		}
+
+		$object = $this->getObject($params);
+
+		$sql = 'SELECT COUNT(OrderId)
+				FROM '.TABLE_PREFIX.'Orders
+				WHERE GiftCertificateId = '.$object->GetID();
+		return $this->Conn->GetOne($sql);
+	}
+
+	/**
+	 * Print link for gift certificate (admin only)
+	 *
+	 * @param Array $params
+	 */
+	function PrintLink($params)
+	{
+		$params[$this->getPrefixSpecial().'_id'] = $this->Application->RecallVar('print_certificate_id');
+		$this->Application->RemoveVar('print_certificate_id');
+
+		/** @var kMainTagProcessor $main_processor */
+		$main_processor = $this->Application->recallTagProcessor('m');
+
+		return $main_processor->Link($params);
+	}
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gift_certificates/gift_certificates_tp.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.4
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/units/gift_certificates/gift_certificates_config.php
===================================================================
--- releases/5.2.2-B2/units/gift_certificates/gift_certificates_config.php	(revision 0)
+++ releases/5.2.2-B2/units/gift_certificates/gift_certificates_config.php	(revision 16630)
@@ -0,0 +1,128 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+
+defined('FULL_PATH') or die('restricted access!');
+
+$config = Array (
+	'Prefix' => 'gc',
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
+	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
+	'EventHandlerClass' => Array ('class' => 'GiftCertificateEventHandler', 'file' => 'gift_certificates_eh.php', 'build_event' => 'OnBuild'),
+	'TagProcessorClass' => Array ('class' => 'GiftCertificateTagProcessor', 'file' => 'gift_certificates_tp.php', 'build_event' => 'OnBuild'),
+
+	'AutoLoad' => true,
+
+	'QueryString' => Array (
+		1 => 'id',
+		2 => 'Page',
+		3 => 'PerPage',
+		4 => 'event',
+		5 => 'mode',
+	),
+
+	'IDField' => 'GiftCertificateId',
+	'StatusField' => Array ('Status'),
+	'TitleField' => 'Recipient',
+	'TableName' => TABLE_PREFIX.'GiftCertificates',
+
+	'TitlePresets' => Array (
+		'default' => Array (
+			'new_status_labels' => Array ('gc' => '!la_title_AddingGiftCertificate!'),
+			'edit_status_labels' => Array ('gc' => '!la_title_EditingGiftCertificate!'),
+			'new_titlefield' => Array ('gc' => '!la_title_NewGiftCertificate!'),
+		),
+
+		'gift_certificates_list' => Array ('prefixes' => Array ('gc_List'), 'format' => "!la_title_GiftCertificates!",),
+		'gift_certificates_edit' => Array ('prefixes' => Array ('gc'), 'format' => "#gc_status# '#gc_titlefield#' - !la_title_General!",),
+	),
+
+	'PermSection' => Array ('main' => 'in-commerce:gift-certificates'),
+
+	'Sections' => Array (
+		'in-commerce:gift-certificates' => Array (
+			'parent' => 'in-commerce:discounts_folder',
+			'icon' => 'discounts_coupons',
+			'label' => 'la_tab_GiftCertificates',
+			'url' => Array ('t' => 'in-commerce/discounts/gift_certificate_list', 'pass' => 'm'),
+			'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'),
+			'priority' => 3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
+			'type' => stTAB,
+		),
+	),
+
+	'ListSQLs' => Array (
+		'' => '	SELECT %1$s.* %2$s
+				FROM %1$s',
+	),
+
+	'ListSortings' => Array (
+		'' => Array (
+			'Sorting' => Array ('Recipient' => 'asc'),
+		)
+	),
+
+	'Fields' => Array (
+		'GiftCertificateId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+		'OrderId' => Array ('type' => 'int', 'default' => 0),
+		'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Enabled', 2 => 'la_Used', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ),
+		'SendVia' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 0 => 'la_opt_Email', 1 => 'la_opt_PostalMail'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ),
+		'Purchaser' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'Recipient' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientEmail' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => '1', 'required'=>1, 'default' => '', 'error_msgs' => Array ('invalid_format' => '!la_invalid_email!') ),
+		'RecipientFirstname' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientLastname' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientAddress1' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientAddress2' => Array ('type' => 'string', 'default'=>null, 'max_len'=>255),
+		'RecipientCity' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientState' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientZipcode' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255),
+		'RecipientCountry' => Array (
+			'type' => 'string',
+			'formatter' => 'kOptionsFormatter',
+			'options_sql' => '	SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode
+								FROM '.TABLE_PREFIX.'CountryStates
+								WHERE Type = ' . DESTINATION_TYPE_COUNTRY . '
+								ORDER BY Name',
+			'option_key_field' => 'IsoCode', 'option_title_field' => 'Name',
+			'not_null' => 1, 'required' => 1, 'default' => 'USA'
+		),
+
+		'RecipientPhone' => Array ('type' => 'string', 'default'=>null, 'max_len'=>255),
+		'Message' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null),
+		'Code' => Array ('type' => 'string', 'required'=>1,'default'=>null, 'max_len'=>255, 'unique'=>Array ('Code')),
+		'AddDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#',),
+		'Expiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null,),
+		'Amount' => Array ('type' => 'double', 'default' => null, 'required' => 1, 'min_value_exc' => 0),
+		'Debit' => Array ('type' => 'double', 'default' => null),
+	),
+
+	'Grids' => Array (
+		'Default' => Array (
+			'Icons' => Array (
+				'default' => 'icon16_item.png',
+				0 => 'icon16_disabled.png',
+				1 => 'icon16_item.png',
+				2 => 'icon16_pending.png',
+				'module' => 'core',
+			),
+			'Fields' => Array (
+				'GiftCertificateId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_range_filter', 'width' => 160, ),
+				'Amount' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ),
+				'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+			),
+		),
+	),
+);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/units/gift_certificates/gift_certificates_config.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/export.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/export.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/export.tpl	(revision 16630)
@@ -0,0 +1,124 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p.export" section="in-portal:browse" perm_section="PRODUCT" permission_type="VIEW" system_permission="0" title_preset="products_export"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+
+						document.getElementById('hidden_export_columns').value = select_to_string('<inp2:p.export_InputName field="ExportColumns"/>');
+						submit_event('p.export','OnExportBegin');
+
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p.export','OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+
+<inp2:p.export_SaveWarning name="grid_save_warning"/>
+<inp2:p.export_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns">
+				<td class="control-cell">
+					<table cellpadding="0" cellspacing="0" border="0">
+						<tr>
+							<td>
+								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:p.export_InputName field="ExportColumns"/>', 1)" class="button">
+								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:p.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
+								<img src="img/spacer.gif" width="1" height="5" alt=""><br />
+							</td>
+							<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
+							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
+						</tr>
+						<tr>
+							<td>
+								<select multiple id="<inp2:p.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+									<inp2:p.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+								</select>
+								<input type="hidden" id="hidden_export_columns" name="<inp2:p.export_InputName field="ExportColumns"/>" value="<inp2:p.export_Field field="ExportColumns"/>" />
+							</td>
+							<td align="center">
+								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('<inp2:p.export_InputName field="AvailableColumns"/>', '<inp2:p.export_InputName field="ExportColumns"/>')" class="button"><br>
+								<img src="img/spacer.gif" width="1" height="4" alt=""><br>
+								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('<inp2:p.export_InputName field="ExportColumns"/>', '<inp2:p.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.export_InputName field="AvailableColumns"/>');" class="button">
+							</td>
+							<td>
+								<select multiple id="<inp2:p.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+									<inp2:p.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement design="form_row" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat">
+				<td class="control-cell">
+					<table cellspacing="0" cellpadding="0">
+						<tr>
+							<td rowspan="2" valign="top">
+								<input type="radio"<inp2:m_if check="p.export_FieldEquals" field="CategoryFormat" value="1"> checked</inp2:m_if> name="<inp2:p.export_InputName field="CategoryFormat"/>" id="<inp2:p.export_InputName field="CategoryFormat"/>_1" value="1" />
+							</td>
+							<td>
+								<label for="<inp2:p.export_InputName field="CategoryFormat"/>_1"><inp2:m_phrase label="la_MixedCategoryPath"/></label>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								<span class="<inp2:m_if check="p.export_HasError" field="CategorySeparator">error</inp2:m_if>"><inp2:m_phrase name="la_fld_CategorySeparator"/></span><inp2:m_if check="p.export_IsRequired" field="CategorySeparator"><span class="error"> *</span></inp2:m_if>:
+								 <input type="text" name="<inp2:p.export_InputName field="CategorySeparator"/>" id="<inp2:p.export_InputName field="CategorySeparator"/>" value="<inp2:p.export_Field field="CategorySeparator"/>" size="2" maxlength="1" /><br />
+								(will look like "Category:Sub-category:Sub-sub-category")
+
+							</td>
+						</tr>
+
+						<tr>
+							<td rowspan="2" valign="top">
+								<input type="radio"<inp2:m_if check="p.export_FieldEquals" field="CategoryFormat" value="2"> checked</inp2:m_if> name="<inp2:p.export_InputName field="CategoryFormat"/>" id="<inp2:p.export_InputName field="CategoryFormat"/>_2" value="2" />
+							</td>
+							<td>
+								<label for="<inp2:p.export_InputName field="CategoryFormat"/>_2"><inp2:m_phrase label="la_SeparatedCategoryPath"/></label><br />
+								(the fields will be titled Category1..CategoryN accordingly)
+							</td>
+						</tr>
+					</table>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/export.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/export_finish.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/export_finish.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/export_finish.tpl	(revision 16630)
@@ -0,0 +1,45 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p.export" section="in-portal:browse" perm_section="PRODUCT" permission_type="VIEW" system_permission="0" title_preset="products_export"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							submit_event('p.export', 'OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_DownloadExportFile"/>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<a href="<inp2:p.export_ExportPath as_url="1"/>"><inp2:p.export_ExportPath /></a>
+			</td>
+		</tr>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/export_finish.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_edit.tpl	(revision 16630)
@@ -0,0 +1,83 @@
+<inp2:adm_SetPopupSize width="780" height="580"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-commerce:manufacturers" prefix="manuf" title_preset="manuf_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('manuf','<inp2:manuf_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('manuf','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('manuf', '<inp2:manuf_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('manuf', '<inp2:manuf_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="manuf_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="manuf_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="manuf_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+			<script src="js/swfobject.js" type="text/javascript"></script>
+			<script type="text/javascript" src="<inp2:m_Compress files='js/uploader/upload_manager.js|js/uploader/uploader.js'/>"></script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:manuf_SaveWarning name="grid_save_warning"/>
+<inp2:manuf_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+			<inp2:m_RenderElement name="subsection" title="la_title_General"/>
+				<inp2:m_RenderElement name="inp_id_label" prefix="manuf" field="ManufacturerId" title="la_fld_Id"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Name" title="la_fld_Name" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" cols="40" rows="5"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="URL" title="la_fld_URL" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="manuf" field="Logo" thumbnail="120x120" title="la_fld_Logo"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="manuf" field="IsPopular" title="la_fld_Popular"/>
+
+			<inp2:m_RenderElement name="subsection" title="la_title_ContactInformation"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address1" title="la_fld_Address1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Address2" title="la_fld_Address2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="City" title="la_fld_City" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="State" title="la_fld_State" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_options" has_empty="1" prefix="manuf" field="Country" title="la_fld_Country" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Zip" title="la_fld_Zip" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Phone" title="la_fld_Phone" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Fax" title="la_fld_Fax" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Email" title="la_fld_Email" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.9
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_list.tpl	(revision 16630)
@@ -0,0 +1,50 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="manuf" section="in-commerce:manufacturers" title_preset="manuf_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('manuf', 'in-commerce/manufacturers/manufacturers_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewManufacturer" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('manuf', 'in-commerce/manufacturers/manufacturers_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('manuf')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="manuf" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="manuf" IdField="ManufacturerId" grid="Default"/>
+<script type="text/javascript">
+	Grids['manuf'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/manufacturers/manufacturers_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/user_item_tab.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/user_item_tab.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/user_item_tab.tpl	(revision 16630)
@@ -0,0 +1,43 @@
+<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+<inp2:m_DefaultParam title_property=""/>
+<inp2:m_DefineElement name="catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+			<div id="products_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/user_item_tab" edit_template="in-commerce/products/products_edit" dep_buttons="new_product" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
+			<script type="text/javascript">$Catalog.registerTab('products');</script>
+		</inp2:m_if>
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
+			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+		<inp2:$prefix_InitList grid="$grid_name"/>
+
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_DefineElement name="qty_td">
+			<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
+
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
+		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
+		#separator#
+		<!-- products tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="products_form"/>
+			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="kernel_form_end"/>
+		<!-- products tab: end -->
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<!--## <inp2:p_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/> ##-->
+
+<inp2:m_if check="m_Param" name="tab_init">
+	<inp2:m_include template="in-commerce/user_order_item_tab" tab_init="$tab_init" title_property="$title_property"/>
+</inp2:m_if>

Property changes on: releases/5.2.2-B2/admin_templates/user_item_tab.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/visits/visits_list_incommerce.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/visits/visits_list_incommerce.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/visits/visits_list_incommerce.tpl	(revision 16630)
@@ -0,0 +1,71 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="visits.incommerce" section="in-portal:visits" grid="visitsincommerce" title_preset="visits.incommerce_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+	  			{
+
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
+							window.location.href = window.location.href;
+						}
+				) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', function() {
+							std_delete_items('visits.incommerce');
+						}
+				) );
+
+				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
+							std_csv_export('visits.incommerce', 'visitsincommerce', 'export/export_progress');
+						}
+				) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="visits.incommerce" grid="visitsincommerce"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_userlink_td">
+	<inp2:m_if check="UserFound" user_field="$user_field">
+		<a href="<inp2:UserLink edit_template='users/users_edit' user_field="$user_field"/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" grid="$grid"/></a>
+	<inp2:m_else/>
+		<inp2:Field field="$field" grid="$grid"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_referer_td">
+	<div style="overflow: hidden;">
+		<inp2:m_if check="FieldEquals" field="$field" value="">
+			<span style="white-space: nowrap;"><inp2:m_Phrase label="la_visit_DirectReferer"/></span>
+		<inp2:m_else/>
+			<a href="<inp2:Field field="$field" grid="$grid"/>"><inp2:Field field="$field" grid="$grid" /></a>
+		</inp2:m_if>
+	</div>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="visits.incommerce" IdField="VisitId" grid="visitsincommerce"/>
+<script type="text/javascript">
+	Grids['visits.incommerce'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/visits/visits_list_incommerce.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.18.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_type_groups.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_type_groups.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_type_groups.tpl	(revision 16630)
@@ -0,0 +1,118 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="groups" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							document.getElementById('<inp2:s_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+							submit_event('s','<inp2:s_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('s','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="s_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="s_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="s_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function go_to_tab(prefix_special, tab)
+				{
+					set_hidden_field(prefix_special+'_GoTab', tab);
+					document.getElementById('<inp2:s_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+					submit_event(prefix_special,'OnPreSaveAndGoToTab',null);
+				}
+
+				function go_to_id(prefix_special, id)
+				{
+					set_hidden_field(prefix_special+'_GoId', id);
+					document.getElementById('<inp2:s_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+				 	submit_event(prefix_special,'OnPreSaveAndGo')
+				}
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:s_SaveWarning name="grid_save_warning"/>
+<inp2:s_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="s" field="PortalGroups" title="la_fld_UserGroups" size="40"/>
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="label-cell">
+					<inp2:m_phrase label="la_fld_UserGroups"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+						<table style="width: 300px">
+							<tr>
+								<td>
+									<inp2:m_DefineElement name="group_option">
+										<option value="<inp2:m_param name="GroupId"/>"><inp2:m_param name="Name"/></option>
+									</inp2:m_DefineElement>
+
+									<inp2:m_phrase label="la_fld_SelectedGroups"/><br />
+									<select id="selected_groups" name="selected_groups[]" multiple="multiple" size="15" style="width: 200px">
+										<inp2:s_ListGroups mode="selected" render_as="group_option"/>
+									</select>
+								</td>
+								<td align="center">
+									<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('available_groups', 'selected_groups'); select_sort('selected_groups')" class="button"><br>
+									<img src="img/s.gif" width="1" height="4" alt=""><br>
+									<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('selected_groups', 'available_groups'); select_sort('available_groups');" class="button">
+								</td>
+								<td>
+									<inp2:m_phrase label="la_fld_AvailableGroups"/><br />
+									<select id="available_groups" name="available_groups[]" multiple="multiple" size="15" style="width: 200px">
+										<inp2:s_ListGroups render_as="group_option"/>
+									</select>
+								</td>
+							</tr>
+						</table>
+
+				</td>
+			</tr>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_type_groups.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_custom_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_custom_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_custom_list.tpl	(revision 16630)
@@ -0,0 +1,69 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" pagination="1" title_preset="shipping_list" tabs="in-commerce/shipping/shipping_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Shipping" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('s', 'in-commerce/shipping/shipping_edit')
+						} ) );
+
+				function edit()
+				{
+				  	std_edit_item('s', 'in-commerce/shipping/shipping_edit');
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('s')
+						} ) );
+
+				function clone_items()
+		  		{
+		  			submit_event('s','OnMassClone');
+		  		}
+
+			  	a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', clone_items) );
+
+			  	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+			  	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('s','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('s','OnMassDecline');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="s" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="s" IdField="ShippingID" grid="Default"/>
+<script type="text/javascript">
+	Grids['s'].SetDependantToolbarButtons( new Array('edit','delete','clone','approve','decline') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_custom_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_edit.tpl	(revision 16630)
@@ -0,0 +1,80 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="shipping_type_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('s','<inp2:s_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('s','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="s_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="s_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="s_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:s_SaveWarning name="grid_save_warning"/>
+<inp2:s_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Shipping_Type"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="s" field="ShippingID" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Code" title="la_fld_ShippingCode" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="Name" title="la_fld_ShippingName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="SpeedCode" title="la_fld_SpeedCode" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="Type" title="la_fld_ShippingType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="BaseFee" title="la_fld_BaseFee"/>
+			<inp2:m_RenderElement name="inp_edit_options" use_phrases="1" prefix="s" field="InsuranceType" title="la_fld_Insurance_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="InsuranceFee" title="la_fld_Insurance_Fee" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="s" field="FreeShippingMinAmount" title="la_fld_FreeShippingMinAmount"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="s" field="IsFreePromoShipping" title="la_fld_IsFreePromoShipping"/>
+
+			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODFlatSurcharge" title="la_fld_CODFlatSurcharge" size="10" /> -->
+			<!-- <inp2:m_RenderElement name="inp_edit_box" prefix="s" field="CODPercentSurcharge" title="la_fld_CODPercentSurcharge" size="10" /> -->
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/modify_selector.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/modify_selector.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/modify_selector.tpl	(revision 16630)
@@ -0,0 +1,73 @@
+<inp2:adm_SetPopupSize width="400" height="180"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="select_modifier"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+	  	<td>
+	  		<script type="text/javascript">
+					a_toolbar = new ToolBar();
+
+	  				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+								submit_event('s','OnApplyModifier');
+							}
+						) );
+					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+								window_close();
+							}
+					 	) );
+
+					a_toolbar.Render();
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:sc_SaveWarning name="grid_save_warning"/>
+<inp2:sc_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<label for="operation"><inp2:m_phrase label="la_ModifyOperation"/>:</label>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<select name="operation" id="operation">
+					<option value="*">&nbsp;*&nbsp;</option>
+					<option value="/">&nbsp;/&nbsp;</option>
+					<option value="+">&nbsp;+&nbsp;</option>
+					<option value="-">&nbsp;-&nbsp;</option>
+				</select>
+			</td>
+		</tr>
+
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<label for="modify_by"><inp2:m_phrase label="la_ModifyByValue"/>:</label>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<input name="modify_by" id="modify_by" value="" size="5">
+			</td>
+		</tr>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:s_HiddenSelection/>
+
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	set_event('sc', '');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/modify_selector.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_quote_engine_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_quote_engine_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_quote_engine_edit.tpl	(revision 16630)
@@ -0,0 +1,112 @@
+<inp2:adm_SetPopupSize width="780" height="580"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="sqe" section="in-commerce:shipping_quote_engines" title_preset="engine_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('sqe','<inp2:sqe_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('sqe','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="carrier">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<input type="hidden" id="<inp2:sqe_InputName field="{$carrier}Enabled"/>" name="<inp2:sqe_InputName field="{$carrier}Enabled"/>" value="<inp2:sqe_Field field="{$carrier}Enabled" db="db"/>">
+			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>" name="_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>" <inp2:sqe_Field field="{$carrier}Enabled" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:sqe_InputName field="{$carrier}Enabled"/>'))" onchange="check_carrier('_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>', '<inp2:sqe_InputName field="{$carrier}Account" />', '_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>')">
+
+			<inp2:m_param name="title" />
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<inp2:m_phrase label="la_AccountLogin" />:
+			<input type="text" name="<inp2:sqe_InputName field="{$carrier}Account" />" id="<inp2:sqe_InputName field="{$carrier}Account" />" value="<inp2:sqe_Field field="{$carrier}Account" />" tabindex="<inp2:m_get param="tab_index"/>">
+
+			<inp2:m_phrase label="la_Invoiced" />:
+			<input type="hidden" id="<inp2:sqe_InputName field="{$carrier}Invoiced"/>" name="<inp2:sqe_InputName field="{$carrier}Invoiced"/>" value="<inp2:sqe_Field field="{$carrier}Invoiced" db="db"/>">
+			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>" name="_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>" <inp2:sqe_Field field="{$carrier}Invoiced" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:sqe_InputName field="{$carrier}Invoiced"/>'))">
+		</td>
+	</tr>
+	<script type="text/javascript">
+		check_carrier('_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>', '<inp2:sqe_InputName field="{$carrier}Account" />', '_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>');
+	</script>
+</inp2:m_DefineElement>
+
+<script type="text/javascript">
+
+function check_carrier(carrier_checkbox, account_field, invoiced_checkbox)
+{
+	if(document.getElementById(carrier_checkbox).checked)
+	{
+		document.getElementById(account_field).disabled = false;
+		document.getElementById(invoiced_checkbox).disabled = false;
+	}
+	else
+	{
+		document.getElementById(account_field).disabled = true;
+		document.getElementById(invoiced_checkbox).disabled = true;
+	}
+}
+
+</script>
+
+<inp2:sqe_SaveWarning name="grid_save_warning"/>
+<inp2:sqe_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="EngineId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="sqe" field="Name" title="la_fld_ShippingQuoteEngineName"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="la_fld_Login" />
+
+			<inp2:m_RenderElement design="form_row" prefix="sqe" field="AccountPassword" title="la_fld_Password">
+				<td class="control-cell">
+					<input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
+				</td>
+			</inp2:m_RenderElement>
+
+	<inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Carriers"/>
+			<inp2:m_RenderElement name="carrier" carrier="UPS" title="UPS" />
+			<inp2:m_RenderElement name="carrier" carrier="FDX" title="FedEx" />
+			<inp2:m_RenderElement name="carrier" carrier="DHL" title="DHL" />
+			<inp2:m_RenderElement name="carrier" carrier="USP" title="USPS" />
+			<inp2:m_RenderElement name="carrier" carrier="ARB" title="Airborne" />
+
+		<inp2:m_RenderElement name="subsection" title="la_Text_Delivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="la_fld_FirstDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="la_fld_SecondDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="la_fld_ThirdDayDelivery"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="la_fld_GroundDelivery"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_Text_Other"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="la_fld_ShipMethod"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="la_fld_FlatSurcharge" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="la_fld_PercentSurcharge" size="10"/>
+	</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_quote_engine_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_tabs.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_tabs.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_tabs.tpl	(revision 16630)
@@ -0,0 +1,5 @@
+<inp2:m_DefineElement name="shipping_tabs">
+	<inp2:adm_ListTabs render_as="tab_direct" section_name="in-commerce:shipping_folder"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="shipping_tabs"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_tabs.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_costs.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_costs.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_costs.tpl	(revision 16630)
@@ -0,0 +1,216 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="costs" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				var $checked_count = 0;
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('s','<inp2:s_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('s','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:flip', '<inp2:m_phrase label="la_ToolTip_Flip" escape="1"/>',
+							function() {
+								submit_event('s','OnFlip');
+							} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:clear_all', '<inp2:m_phrase label="la_ToolTip_ClearAll" escape="1"/>', function() {
+							if(confirm('<inp2:m_phrase label="la_ClearCostsWarning"/>'))
+								submit_event('sc','OnClearAll');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:modify', '<inp2:m_phrase label="la_ToolTip_Modify" escape="1"/>',
+							function() {
+								openSelector('s', '<inp2:m_t t="in-commerce/shipping/modify_selector" pass="all,sc" sc_event="OnSaveCreated" no_amp="1" js_escape="1"/>');
+							} ) );
+				a_toolbar.Render();
+
+				a_toolbar.DisableButton('modify');
+
+				<inp2:m_if check="s_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="s_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="s_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function reflect_toolbar($prefix_special, $id, $field)
+				{
+					var $element = document.getElementById($prefix_special+'['+$id+']['+$field+']');
+					if($element.checked)
+					{
+						$checked_count++;
+					}
+					else
+					{
+						$checked_count--;
+					}
+
+					if($checked_count)
+					{
+						a_toolbar.EnableButton('modify');
+					}
+					else
+					{
+						a_toolbar.DisableButton('modify');
+					}
+				}
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="row_header">
+	<td>
+		<input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')">
+		<inp2:m_RenderElement name="$header_caption"/>
+		<a href="javascript:propagate_values('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>)"><img src="<inp2:m_TemplatesBase module='In-Commerce'/>/img/list_horiz_propagate.gif" alt="<inp2:m_phrase label="la_PropagateValues"/>" border="0"></a>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="column_header">
+	<td align="center" style="border-left:1px solid black">
+		<input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')">
+		<inp2:m_RenderElement name="$header_caption"/>
+		<a href="javascript:propagate_values('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>)"><img src="<inp2:m_TemplatesBase module='In-Commerce'/>/img/list_vertic_propagate.gif" alt="<inp2:m_phrase label="la_PropagateValues"/>" border="0"></a>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="zone_caption">
+	<nobr><inp2:z_field field="Name"/></nobr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="bracket_caption">
+	<inp2:m_if check="s_FieldEquals" name="Type" value="1">
+		<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
+			<inp2:br_field field="Start"/>&nbsp;<inp2:m_Phrase label="la_kg" /> - <inp2:m_if check="br_fieldequals" field="End" value="-1">&infin;<inp2:m_else/><inp2:br_field field="End"/>&nbsp;<inp2:m_Phrase label="la_kg" /></inp2:m_if>
+		</inp2:m_if>
+		<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
+			<inp2:br_field field="Start_a"/>&nbsp;<inp2:m_Phrase label="la_lbs" />&nbsp;<inp2:br_field field="Start_b"/>&nbsp;<inp2:m_Phrase label="la_oz" /> - <inp2:m_if check="br_fieldequals" field="End" value="-1">&infin;<inp2:m_else/><inp2:br_field field="End_a"/>&nbsp;<inp2:m_Phrase label="la_lbs" />&nbsp;<inp2:br_field field="End_b"/>&nbsp;<inp2:m_Phrase label="la_oz"  /></inp2:m_if>
+		</inp2:m_if>
+	<inp2:m_else />
+		<nobr><inp2:br_field field="Start"/> - <inp2:m_if check="br_fieldequals" field="End" value="-1">&infin;<inp2:m_else/><inp2:br_field field="End" /></inp2:m_if></nobr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="cost_cell">
+	<td style="border-left:1px solid black" align="center">
+		<nobr>$ <input type="text" maxlength="<inp2:s_CostInputSize/>" size="<inp2:s_CostInputSize/>" name="<inp2:sc_InputName field="Flat"/><inp2:m_if check="s_fieldequals" field="CostType" value="2">_input</inp2:m_if>" id="<inp2:sc_InputName field="Flat"/><inp2:m_if check="s_fieldequals" field="CostType" value="2" >_input</inp2:m_if>" value="<inp2:sc_field field="Flat" />"<inp2:m_if check="s_fieldequals" field="CostType" value="2" > disabled</inp2:m_if>>
+		% <input type="text" maxlength="<inp2:s_CostInputSize/>" size="<inp2:s_CostInputSize/>" name="<inp2:sc_InputName field="PerUnit"/><inp2:m_if check="s_fieldequals" field="CostType" value="1">_input</inp2:m_if>" id="<inp2:sc_InputName field="PerUnit"/><inp2:m_if check="s_fieldequals" field="CostType" value="1" >_input</inp2:m_if>" value="<inp2:sc_field field="PerUnit" />"<inp2:m_if check="s_fieldequals" field="CostType" value="1" > disabled</inp2:m_if>></nobr>
+
+		<inp2:m_if check="s_fieldequals" field="CostType" value="2" >
+			<input type="hidden" name="<inp2:sc_InputName field="Flat"/>" id="<inp2:sc_InputName field="Flat"/>" value="<inp2:sc_field field="Flat"/>">
+		</inp2:m_if>
+		<inp2:m_if check="s_fieldequals" field="CostType" value="1" >
+			<input type="hidden" name="<inp2:sc_InputName field="PerUnit"/>" id="<inp2:sc_InputName field="PerUnit"/>" value="<inp2:sc_field field="PerUnit"/>">
+		</inp2:m_if>
+
+		<input type="hidden" name="<inp2:sc_InputName field="BracketId"/>" id="<inp2:sc_InputName field="BracketId"/>" value="<inp2:br_field field="BracketId"/>">
+		<input type="hidden" name="<inp2:sc_InputName field="ZoneID"/>" id="<inp2:sc_InputName field="ZoneID"/>" value="<inp2:z_field field="ZoneID"/>">
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:sc_SaveWarning name="grid_save_warning"/>
+<inp2:sc_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="la_fld_CostType"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="la_fld_EmptyCellsAre" size="20"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="s" field="PrecisionBeforeSep" title="la_Precision">
+				<td class="control-cell">
+					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">
+						<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>
+						<inp2:m_else/>
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>
+						</inp2:m_if>
+					</select>&nbsp;,&nbsp;<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">
+						<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>
+						<inp2:m_else/>
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>
+						</inp2:m_if>
+					</select>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<table class="edit-form">
+	<inp2:m_RenderElement name="subsection" title="la_section_ShippingCosts"/>
+</table>
+
+<div id="cost_container" style="overflow: auto;">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-top:none">
+		<inp2:s_ShowCostsTable/>
+	</table>
+</div>
+
+<input type="hidden" name="z_propagate_id" id="z_propagate_id" value="">
+<input type="hidden" name="br_propagate_id" id="br_propagate_id" value="">
+
+<script type="text/javascript">
+	function propagate_values(prefix,id)
+	{
+		document.getElementById(prefix + '_propagate_id').value = id;
+		submit_event('sc', 'OnPropagate');
+	}
+
+	document.getElementById('<inp2:s_InputName field="CostType"/>').onchange = saveShipping;
+	document.getElementById('<inp2:s_InputName field="PrecisionBeforeSep"/>').onchange = saveShipping;
+	document.getElementById('<inp2:s_InputName field="PrecisionAfterSep"/>').onchange = saveShipping;
+
+	function saveShipping()
+	{
+		submit_event('s', 'OnPreSave');
+	}
+
+	$(document).ready(
+		function() {
+			maximizeElement('#cost_container');
+
+
+		}
+	);
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_costs.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_list.tpl	(revision 16630)
@@ -0,0 +1,53 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="sqe" section="in-commerce:shipping_quote_engines" pagination="1" title_preset="engine_list" tabs="in-commerce/shipping/shipping_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+				{
+				  	std_edit_item('sqe', 'in-commerce/shipping/shipping_quote_engine_edit');
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+			  	a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+			  	a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('sqe','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('sqe','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="sqe" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="sqe" IdField="EngineId" grid="Default"/>
+<script type="text/javascript">
+	Grids['sqe'].SetDependantToolbarButtons( new Array('edit','approve','decline') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_brackets.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_brackets.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_brackets.tpl	(revision 16630)
@@ -0,0 +1,267 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="brackets" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+  				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('s','<inp2:s_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('s','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				function add_brackets()
+	  			{
+	  				submit_event('br', 'OnMoreBrackets')
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:more_brackets', '<inp2:m_phrase label="la_ToolTip_MoreBrackets" escape="1"/>', add_brackets) );
+
+				function infinity()
+	  			{
+					submit_event('br', 'OnInfinity');
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:infinity', '<inp2:m_phrase label="la_ToolTip_Infinity" escape="1"/>', infinity) );
+
+				function arrange_brackets()
+	  			{
+					submit_event('br', 'OnArrange')
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:arrange', '<inp2:m_phrase label="la_ToolTip_Arrange" escape="1"/>', arrange_brackets) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="s_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="s_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="s_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="br_edit_box" >
+<td>
+	<input type="text" size="<inp2:m_param name="size"/>" name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				tabindex="<inp2:m_get param="tab_index"/>"
+				value="<inp2:m_param name="$field"/>"
+			>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="br_edit_max" >
+<td>
+			<inp2:m_if check="s_FieldEquals" name="Type" value="1">
+				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
+					<input type="text"
+						<inp2:m_inc param="tab_index" by="1"/> tabindex="<inp2:m_get param="tab_index"/>"
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+						value="<inp2:m_param name="max"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="next_min_id" value="">
+						<inp2:m_else />
+							onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>,'<inp2:m_param name="PrefixSpecial"/>', 'Start', 'End')"
+						</inp2:m_if>
+					/>
+					<inp2:m_phrase label="la_kg" />
+				</inp2:m_if>
+				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
+					<input type="text"
+						<inp2:m_inc param="tab_index" by="1"/> tabindex="<inp2:m_get param="tab_index"/>"
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_a]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_a]"
+						value="<inp2:m_param name="max_a"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="next_min_id" value="">
+						<inp2:m_else />
+							onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>,'<inp2:m_param name="PrefixSpecial"/>', 'Start_a', 'End_a')"
+						</inp2:m_if>
+					/>
+					<inp2:m_phrase label="la_lbs" />
+					<input type="text"
+						<inp2:m_inc param="tab_index" by="1"/> tabindex="<inp2:m_get param="tab_index"/>"
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_b]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_b]"
+						value="<inp2:m_param name="max_b"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="next_min_id" value="">
+						<inp2:m_else />
+							onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>,'<inp2:m_param name="PrefixSpecial"/>', 'Start_b', 'End_b')"
+						</inp2:m_if>
+					/>
+					<inp2:m_phrase label="la_oz" />
+				</inp2:m_if>
+			<inp2:m_else />
+				<input type="text" size="10"
+					<inp2:m_inc param="tab_index" by="1"/> tabindex="<inp2:m_get param="tab_index"/>"
+					name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					value="<inp2:m_param name="max"/>"
+					<inp2:m_if check="m_ParamEquals" param="next_min_id" value="">
+					<inp2:m_else />
+						onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>,'<inp2:m_param name="PrefixSpecial"/>', 'Start', 'End')"
+					</inp2:m_if>
+				/>
+			</inp2:m_if>
+</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="br_edit_min" >
+<td>
+			<input type="hidden" name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="IdField"/>]" id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="IdField"/>]" value="<inp2:m_param name="id"/>">
+
+			<inp2:m_if check="s_FieldEquals" name="Type" value="1">
+				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
+					<input type="text"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1">
+							<inp2:m_inc param="tab_index" by="1"/>
+							tabindex="<inp2:m_get param="tab_index"/>"
+						<inp2:m_else/>
+							readonly
+						</inp2:m_if>
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+						value="<inp2:m_param name="min"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1"><inp2:m_else/>disabled</inp2:m_if>/>
+					<inp2:m_phrase label="la_kg" />
+				</inp2:m_if>
+				<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
+					<input type="text"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1">
+							<inp2:m_inc param="tab_index" by="1"/>
+							tabindex="<inp2:m_get param="tab_index"/>"
+						<inp2:m_else/>
+							readonly
+						</inp2:m_if>
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_a]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_a]"
+						value="<inp2:m_param name="min_a"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1"><inp2:m_else/>disabled</inp2:m_if>/>
+					<inp2:m_phrase label="la_lbs" />
+					<input type="text"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1">
+							<inp2:m_inc param="tab_index" by="1"/>
+							tabindex="<inp2:m_get param="tab_index"/>"
+						<inp2:m_else/>
+							readonly
+						</inp2:m_if>
+						name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_b]"
+						id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>_b]"
+						value="<inp2:m_param name="min_b"/>" size="10"
+						<inp2:m_if check="m_ParamEquals" param="first" value="1"><inp2:m_else/>disabled</inp2:m_if>/>
+					<inp2:m_phrase label="la_oz" />
+				</inp2:m_if>
+			<inp2:m_else />
+				<input type="text" size="10"
+					<inp2:m_if check="m_ParamEquals" param="first" value="1">
+						<inp2:m_inc param="tab_index" by="1"/>
+						tabindex="<inp2:m_get param="tab_index"/>"
+					<inp2:m_else/>
+						readonly
+					</inp2:m_if>
+					name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					value="<inp2:m_param name="min"/>"
+					<inp2:m_if check="m_ParamEquals" param="first" value="1"><inp2:m_else/>disabled</inp2:m_if>
+				/>
+			</inp2:m_if>
+</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="bracket">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+
+		<inp2:m_RenderElement name="br_edit_min" IdField="$IdField" PrefixSpecial="$PrefixSpecial" field="Start" size="40" pass_params="true"/>
+
+		<inp2:m_RenderElement name="br_edit_max" IdField="$IdField" PrefixSpecial="$PrefixSpecial" field="End" size="40" pass_params="true"/>
+
+	</tr>
+</inp2:m_DefineElement>
+
+
+<script type="text/javascript" >
+
+	NumberFormatter.ThousandsSep = '<inp2:lang.current_Field name="ThousandSep" js_escape="1"/>';
+	NumberFormatter.DecimalSep = '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>';
+
+	function set_start(id, next_id, prefix_special, start_field, end_field)
+	{
+		//var next_id = id - 1;
+		var input_id = prefix_special + '[' + next_id + '][' + start_field + ']';
+		//var orig_id = prefix_special + '[' + id + '][Start]';
+		//alert('here');
+		if(document.getElementById(input_id) != null)
+		{
+			var new_value = NumberFormatter.Parse(document.getElementById(prefix_special + '[' + id + '][' + end_field + ']').value);
+			//alert(prefix_special + '[' + id + '][' + end_field + ']');
+			if( isNaN(new_value) ) new_value = 0;
+			document.getElementById(prefix_special + '[' + id + '][' + end_field + ']').value = NumberFormatter.Format(new_value);
+			document.getElementById(input_id).value = NumberFormatter.Format(new_value);
+		}
+	}
+
+	function enableKernelFormFields()
+	{
+		var kForm = document.forms.kernel_form;
+		var elem = false;
+		for (var i=0; i<kForm.elements.length; i++){
+			elem = kForm.elements[i];
+			if (elem.type == "text" && elem.disabled == true){
+				elem.disabled = false;
+			}
+		}
+	}
+
+</script>
+
+<inp2:m_DefineElement name="br_grid_th" >
+	<td class="columntitle_small"><inp2:m_phrase label="$phrase" /></td>
+</inp2:m_DefineElement>
+
+<inp2:br_SaveWarning name="grid_save_warning"/>
+<inp2:br_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		<tr nowrap="nowrap" class="grid-header-row-0">
+			<inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_Start"/>
+			<inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_End"/>
+		</tr>
+		<inp2:br_ShowBracketsForm block="bracket" IdField="BracketId"/>
+	</table>
+</div>
+<inp2:m_include t="incs/footer"/>
+
+<script>
+	document.forms.kernel_form.onsubmit =  enableKernelFormFields;
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_brackets.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/shipping_zones.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/shipping_zones.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/shipping_zones.tpl	(revision 16630)
@@ -0,0 +1,101 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="zones" pagination="1" pagination_prefix="z" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+  				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('s','<inp2:s_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('s','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('s', '<inp2:s_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewShipZone" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('z', 'in-commerce/shipping/zone_edit')
+						} ) );
+
+				function edit()
+	  			{
+	  				// TODO: make OnLoadZoneForm as hook to OnStoreSelected, when such event will be available
+	  				// std_edit_temp_item('z', 'in-commerce/shipping/zone_edit');
+	  				
+	  				if (use_popups('z', 'OnLoadZoneForm')) {
+						open_popup('z', 'OnLoadZoneForm', 'in-commerce/shipping/zone_edit');
+					}
+					else {
+						opener_action('d');
+						submit_event('z', 'OnLoadZoneForm', 'in-commerce/shipping/zone_edit');
+					}
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('z')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>',
+						function() {
+							submit_event('z', 'OnMassClone')
+						} ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="s_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="s_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="s_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="z" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="z" IdField="ZoneID" grid="Default"/>
+<script type="text/javascript">
+	Grids['z'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/shipping_zones.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/shipping/zone_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/shipping/zone_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/shipping/zone_edit.tpl	(revision 16630)
@@ -0,0 +1,381 @@
+<inp2:adm_SetPopupSize width="650" height="480"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="zones_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							SelectAll(document.getElementById('location_list[]'));
+							SelectToString(document.getElementById('location_list[]'));
+							submit_event('z','<inp2:z_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('z','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('z', '<inp2:z_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('z', '<inp2:z_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="z_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="z_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="z_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="destination_block" selected="">
+	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="destination_title"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="countries_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedCountries"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:z_ShowCountries block="destination_block" show="current"/>
+				</select>
+
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(this.form.ShippingZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;"><br/>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.ShippingZoneIdChooser)" value="&gt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableCountries"/>:<br/>
+				<select name="ShippingZoneIdChooser" multiple size="10" size="10" style="width: 200px">
+					<inp2:z_ShowCountries block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="states_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+				<select name="CountrySelector" onChange="change_country()">
+					<inp2:z_ShowCountries block="destination_block" show="has_states"/>
+				</select>
+					<br />
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedStates"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:z_ShowStates block="destination_block" show="current"/>
+				</select>
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(this.form.ShippingZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;"><br/>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.ShippingZoneIdChooser)" value="&gt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableStates"/>:<br/>
+				<select name="ShippingZoneIdChooser" multiple size="10" style="width: 200px">
+					<inp2:z_ShowStates block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="zips_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+				<select name="CountrySelector" onChange="change_country()">
+					<inp2:z_ShowCountries block="destination_block" show="all"/>
+				</select>
+					<br />
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedZips"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:z_ShowZips block="destination_block" show="current"/>
+				</select>
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(this.form.ShippingZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;"><br/>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.ShippingZoneIdChooser)" value="&gt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableZips"/>:<br/>
+				<select name="ShippingZoneIdChooser" multiple size="10" style="width: 200px">
+					<inp2:z_ShowZips block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+			<br>
+			<input type="text" name="zone_add" id="zone_add"> <input type="button" onClick="add_zone(document.getElementById('location_list[]'))" value="<inp2:m_Phrase label='la_btn_AddLocation'/>" class="button"/>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+
+<inp2:z_SaveWarning name="grid_save_warning"/>
+<inp2:z_ErrorWarning name="form_error_warning"/>
+
+<!--## used for OnCountryChange event ##-->
+<input type="hidden" name="z_id" value="<inp2:z_Field name='ZoneID'/>"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_ShippingZone"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="z" field="ZoneID" title="la_fld_Id"/>
+
+			<inp2:m_RenderElement name="inp_label" prefix="z" field="ShippingTypeID" title="la_fld_ShippingTypeId"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="z" field="Name" title="la_fld_ShipZoneName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="z" field="CODallowed" title="la_fld_CODallowed"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="z" field="Type" title="la_fld_Zone_Type"/>
+
+			<inp2:m_if check="z_Field" field="Type" equals_to="1" db="db">
+				<inp2:m_RenderElement name="countries_multiple" prefix="z" />
+			</inp2:m_if>
+
+			<inp2:m_if check="z_Field" field="Type" equals_to="2" db="db">
+				<inp2:m_RenderElement name="states_multiple" prefix="z" />
+			</inp2:m_if>
+
+			<inp2:m_if check="z_Field" field="Type" equals_to="3" db="db">
+				<inp2:m_RenderElement name="zips_multiple" prefix="z" />
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<input type="hidden" value="" name="location_id" id="location_id">
+<input type="hidden" value="" name="selected_destinations" id="selected_destinations">
+<input type="hidden" name="z_OriginalSaveEvent" id="z_OriginalSaveEvent" value="<inp2:z_SaveEvent/>">
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="z" field="ShippingTypeID"/>
+
+<script>
+	document.getElementById('z[<inp2:z_field field="ZoneID"/>][Type]_1').onchange = change_type;
+	document.getElementById('z[<inp2:z_field field="ZoneID"/>][Type]_2').onchange = change_type;
+	document.getElementById('z[<inp2:z_field field="ZoneID"/>][Type]_3').onchange = change_type;
+
+	function change_type()
+	{
+		submit_event('z','OnTypeChange');
+	}
+
+	function change_country()
+	{
+		submit_event('z','OnCountryChange');
+	}
+
+	function remove_location(location_id)
+	{
+		document.getElementById('location_id').value = location_id;
+		submit_event('z', 'OnRemoveLocation');
+	}
+
+	function SelectToString(aSelect)
+	{
+		// written by Slava, patched by Alex, modified by SergeyG
+		var result = '';
+		for (var i=0; i < aSelect.length; i++)
+		{
+			cur = aSelect.options[i];
+			if(aSelect.options[i].selected == true) result += cur.value+',';
+		}
+		if(result.length > 0) result = result.substring(0,result.length-1);
+		document.getElementById('selected_destinations').value = result;
+		return result;
+	}
+
+	function add_zone(aSelect){
+		var el = document.getElementById('zone_add');
+		if (el)
+		{
+			if (el.value=='') return;
+			var found = false;
+			var valueArray;
+
+			for (i = 0; i < aSelect.options.length; i++){
+				valueArray = aSelect.options[i].value.split("|");
+				if (valueArray[1] == el.value){
+					found = true;
+					break;
+				}
+			}
+			if (!found){
+				aSelect.options[aSelect.length] = new Option(el.value, '0|'+el.value);
+				el.value='';
+			}
+		}
+	}
+
+function SelectContainsValue(selectObject, searchValue)
+{
+	for (i = 0; i < selectObject.options.length; i++){
+		if (selectObject.options[i].text == searchValue){
+			return true;
+		}
+	}
+	return false;
+}
+
+function SelectToArray(aSelect)
+{
+	var an_arr = new Array();
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		an_arr[an_arr.length] = new Array(cur.text, cur.value, cur.selected);
+	}
+	return an_arr;
+}
+
+function ArrayToSelect(anArray, aSelect)
+{
+	var initial_length = aSelect.length;
+	for (var i=initial_length-1; i >= 0; i--) {	aSelect.options[i] = null; }
+
+	for (var i=0; i < anArray.length; i++)
+	{
+		cur = anArray[i];
+		aSelect.options[aSelect.length] = new Option(cur[0], cur[1]);
+	}
+}
+
+function SelectCompare(a, b)
+{
+	if (a[0] < b[0])
+		return -1;
+	if (a[0] > b[0])
+		return 1;
+	return 0;
+}
+
+function MoveSelected(FromList, ToList)
+{
+	FromArr = SelectToArray(FromList);
+	ToArr = SelectToArray(ToList);
+
+	NewFrom = Array();
+
+	for (var i=FromArr.length-1; i >= 0; i--)
+	{
+		cur = FromArr[i];
+		if (cur[2] && !SelectContainsValue(ToList, cur[0])) {
+			ToArr[ToArr.length] = cur;
+		}
+		else if(SelectContainsValue(ToList, cur[0])) {
+
+		}
+		else {
+			NewFrom[NewFrom.length] = cur;
+		}
+	}
+
+	NewFrom.sort(SelectCompare);
+	ToArr.sort(SelectCompare);
+
+	FromList = ArrayToSelect(NewFrom, FromList);
+	ToList = ArrayToSelect(ToArr, ToList);
+}
+
+function SelectToString2(aSelect)
+{
+	var result = '';
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		result += cur.value+',';
+	}
+	return result;
+}
+
+
+function SelectAll(aSelect)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		aSelect.options[i].selected = true;
+	}
+// -----------
+}
+
+function OnlySelectedToString(aSelect)
+{
+	var result = '';
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		if (cur.selected)
+			result += cur.value+',';
+	}
+	return result;
+}
+
+function SelectMultipleSelected(aSelect, aStr)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		if (aStr.match("(^|\,)+"+cur.value+"(,|$)+") ) {
+			aSelect.options[i].selected = true;
+			}
+	}
+}
+
+function SelectAll(aSelect)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		aSelect.options[i].selected = true;
+	}
+}
+
+// --------------
+
+</SCRIPT>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/shipping/zone_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_items.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_items.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_items.tpl	(revision 16630)
@@ -0,0 +1,116 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="api_IsEntireOrder">
+	<inp2:m_SetParam grid="Default"/>
+<inp2:m_else/>
+	<inp2:m_SetParam grid="AffiliatePlansItems"/>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" grid="$grid" title_preset="affiliate_plans_items" pagination="1" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ap','<inp2:ap_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ap','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>',
+						function() {
+							openSelector('api', '<inp2:adm_SelectorLink prefix="api" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('api')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('entire_order', '<inp2:m_phrase label="la_ToolTip_EntireOrder" escape="1"/>',
+						function() {
+							if (inpConfirm('<inp2:m_phrase label="la_EntireOrderConfirmation"/>'))
+							{
+								submit_event('api', 'OnEntireOrder');
+							}
+						} ) );
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ap_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ap_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ap_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function edit()
+				{
+					// required for correct row selection
+				}
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="api" grid="$grid"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_item_checkbox_td">
+	<inp2:m_if check="FieldEquals" field="ItemType" value="1">
+		<inp2:Field field="ProductId" no_special="no_special"/>
+	<inp2:m_else/>
+		<inp2:Field field="CategoryId" no_special="no_special"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="api" IdField="AffiliateItemId" grid="$grid"/>
+
+<script type="text/javascript">
+	<inp2:m_if check="api_IsEntireOrder" >
+			a_toolbar.DisableButton('new_item');
+	</inp2:m_if>
+
+	Grids['api'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+
+<input type="hidden" name="main_prefix" id="main_prefix" value="api">
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_items.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_list.tpl	(revision 16630)
@@ -0,0 +1,66 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliates_list" pagination="1" tabs="in-commerce/affiliate_plans/affiliate_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+				{
+				  	std_edit_item('affil', 'in-commerce/affiliate_plans/affiliates_edit');
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Affiliate" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('affil', 'in-commerce/affiliate_plans/affiliates_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('affil')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('affil','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('affil','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="affil" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_userlink_td" format="">
+	<a href="<inp2:UserLink edit_template='users/users_edit'/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" no_special="no_special" grid="$grid" format="$format"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="affil" IdField="AffiliateId" grid="Default"/>
+<script type="text/javascript">
+	Grids['affil'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(revision 16630)
@@ -0,0 +1,105 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('ap','<inp2:ap_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('ap','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ap_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ap_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ap_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:ap_SaveWarning name="grid_save_warning"/>
+<inp2:ap_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="ap" field="AffiliatePlanId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ap" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="ap" field="PlanType" title="la_fld_PlanType"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="ap" field="ResetInterval" title="la_fld_Period"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="la_fld_Enabled" onchange="check_primary()"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount">
+				<td class="control-cell">
+					<input type="text" name="<inp2:$prefix_InputName field='$field' />" id="<inp2:$prefix_InputName field='$field' />" value="<inp2:$prefix_Field name='$field' />" tabindex="<inp2:m_get param='tab_index'/>" size="8"/>
+					<span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>
+				</td>
+			</inp2:m_RenderElement>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	if(document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked)
+	{
+		document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').disabled = true;
+		document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').disabled = true;
+	}
+
+	function check_status()
+	{
+		if(document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked)
+		{
+			document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').checked = true;
+			document.getElementById('<inp2:ap_InputName field="Enabled"/>').value = 1;
+		}
+	}
+
+	function check_primary()
+	{
+		if(!document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').checked)
+		{
+			document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked = false;
+			document.getElementById('<inp2:ap_InputName field="IsPrimary"/>').value = 0;
+		}
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.16.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_list_tabs.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_list_tabs.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_list_tabs.tpl	(revision 16630)
@@ -0,0 +1,5 @@
+<inp2:m_DefineElement name="affiliate_tabs">
+	<inp2:adm_ListTabs render_as="tab_direct" section_name="in-commerce:affiliates_folder"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="affiliate_tabs"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_list_tabs.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_payout.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_payout.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_payout.tpl	(revision 16630)
@@ -0,0 +1,45 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliates_payout"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_PayOut" escape="1"/>', function() {
+						submit_event('apayments','OnCreate');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('apayments','OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:apayments_SaveWarning name="grid_save_warning"/>
+<inp2:apayments_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="apayments" field="AffiliateId"/>
+			<inp2:m_RenderElement name="inp_label" prefix="apayments" field="AffiliateId" title="la_fld_Username"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="apayments" field="Amount" title="la_fld_Amount"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="apayments" field="PaymentTypeId" title="la_fld_PaymentTypeId"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="apayments" field="PaymentDate" title="la_fld_PaymentDate"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="apayments" field="PaymentReference" title="la_fld_PaymentReference"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="apayments" field="Comment" title="la_fld_Comment" rows="10" cols="40"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_payout.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_edit_payments.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_edit_payments.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_edit_payments.tpl	(revision 16630)
@@ -0,0 +1,71 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliate_payments" pagination="1" pagination_prefix="apayments" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('affil','<inp2:affil_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('affil','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('affil', '<inp2:affil_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('affil', '<inp2:affil_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="affil_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="affil_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="affil_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function edit()
+				{
+					// required for correct row selection
+				}
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="apayments" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="apayments" IdField="AffiliatePaymentId" grid="Default"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_edit_payments.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl	(revision 16630)
@@ -0,0 +1,97 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="apt" section="in-commerce:affiliate_payment_types" title_preset="affiliate_payment_types_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('apt','<inp2:apt_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('apt','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('apt', '<inp2:apt_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('apt', '<inp2:apt_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="apt_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="apt_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="apt_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:apt_SaveWarning name="grid_save_warning"/>
+<inp2:apt_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="apt" field="PaymentTypeId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Name" title="la_fld_Name" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="IsPrimary" title="la_fld_IsPrimary" onchange="check_status()"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="apt" field="Status" title="la_fld_Enabled"  onchange="check_primary()"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="apt" field="Priority" title="la_fld_Priority" size="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="apt" field="Description" title="la_fld_Description" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	if(document.getElementById('_cb_<inp2:apt_InputName field="IsPrimary"/>').checked)
+	{
+		document.getElementById('_cb_<inp2:apt_InputName field="IsPrimary"/>').disabled = true;
+		document.getElementById('_cb_<inp2:apt_InputName field="Status"/>').disabled = true;
+	}
+
+	function check_status()
+	{
+		if(document.getElementById('_cb_<inp2:apt_InputName field="IsPrimary"/>').checked)
+		{
+			document.getElementById('_cb_<inp2:apt_InputName field="Status"/>').checked = true;
+			document.getElementById('<inp2:apt_InputName field="Status"/>').value = 1;
+		}
+	}
+
+	function check_primary()
+	{
+		if(!document.getElementById('_cb_<inp2:apt_InputName field="Status"/>').checked)
+		{
+			document.getElementById('_cb_<inp2:apt_InputName field="IsPrimary"/>').checked = false;
+			document.getElementById('<inp2:apt_InputName field="IsPrimary"/>').value = 0;
+		}
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_list.tpl	(revision 16630)
@@ -0,0 +1,74 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_list" pagination="1" tabs="in-commerce/affiliate_plans/affiliate_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+				{
+				  	std_edit_item('ap', 'in-commerce/affiliate_plans/affiliate_plans_edit');
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Affiliate_Plan" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('ap', 'in-commerce/affiliate_plans/affiliate_plans_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('ap')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+						submit_event('ap','OnMassClone');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_setPrimary" escape="1"/>', function() {
+							submit_event('ap','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('ap','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('ap','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ap" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ap" IdField="AffiliatePlanId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ap'].SetDependantToolbarButtons( new Array('edit','delete','clone', 'approve','decline','setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_edit.tpl	(revision 16630)
@@ -0,0 +1,102 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="affil" section="in-commerce:affiliates" title_preset="affiliates_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('affil','<inp2:affil_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('affil','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('affil', '<inp2:affil_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('affil', '<inp2:affil_NextId/>');
+						}
+				 ) );
+
+				<inp2:m_if check="affil_IsNewMode" inverse="inverse">
+					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+					a_toolbar.AddButton( new ToolBarButton('in-commerce:pay_out', '<inp2:m_phrase label="la_ToolTip_PayOut" escape="1"/>', function() {
+						direct_edit('affil', '<inp2:m_t t="in-commerce/affiliate_plans/affiliates_payout" m_opener="d" apayments_event="OnNew" pass="all,apayments" no_amp="1" js_escape="1"/>');
+						}
+					) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="affil_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="affil_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="affil_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:affil_SaveWarning name="grid_save_warning"/>
+<inp2:affil_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="affil" field="AffiliateId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="affil" field="PortalUserId" title="la_fld_Username"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="AffiliatePlanId" title="la_fld_AffiliatePlan"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="affil" field="PaymentTypeId" title="la_fld_PaymentType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="affil" field="SSN" title="la_fld_SSN" />
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="affil" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="affil" field="CreatedOn" title="la_fld_RegisteredOn" />
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="affil" field="Comments" title="la_fld_Comments" cols="40" rows="5"/>
+
+			<inp2:m_if check="affil_IsNewMode" inverse="inverse">
+				<inp2:m_RenderElement name="subsection" title="la_section_AdvertisingMaterials"/>
+					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+						<inp2:m_inc param="tab_index" by="1"/>
+						<td class="label-cell">
+							<inp2:m_phrase label="la_fld_AffiliateLink"/>:
+						</td>
+						<td class="control-mid">&nbsp;</td>
+						<td class="control-cell">
+							<a href="<inp2:affil_GetAffiliateLink template='index'/>" target="_blank"><inp2:affil_GetAffiliateLink template="index" prefix="_FRONT_"/></a>
+						</td>
+					</tr>
+					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AffiliateCode" title="la_fld_AffiliateCode"/>
+
+				<inp2:m_RenderElement name="subsection" title="la_section_Statistics"/>
+					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AccumulatedAmount" title="la_fld_AccumulatedAmount" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="affil" field="ItemsSold" title="la_fld_ItemsSold"/>
+					<inp2:m_RenderElement name="inp_label" prefix="affil" field="AmountToPay" title="la_fld_AmountToPay" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="affil" field="LastPaymentDate_date" title="la_fld_LastPaymentDate"/>
+			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliates_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.22.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(revision 16630)
@@ -0,0 +1,178 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_brackets" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ap','<inp2:ap_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ap','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ap', '<inp2:ap_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				function add_brackets()
+	  			{
+	  				submit_event('apbrackets', 'OnMoreBrackets')
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:more_brackets', '<inp2:m_phrase label="la_ToolTip_MoreBrackets" escape="1"/>', add_brackets) );
+
+				function infinity()
+	  			{
+					submit_event('apbrackets', 'OnInfinity');
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:infinity', '<inp2:m_phrase label="la_ToolTip_Infinity" escape="1"/>', infinity) );
+
+				function arrange_brackets()
+	  			{
+					submit_event('apbrackets', 'OnArrange')
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:arrange', '<inp2:m_phrase label="la_ToolTip_Arrange" escape="1"/>', arrange_brackets) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ap_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ap_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ap_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="pr_edit_box" >
+<td>
+	<input type="text" size="<inp2:m_param name="size"/>" name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				tabindex="<inp2:m_get param="tab_index"/>"
+				value="<inp2:m_param name="$field"/>"
+			>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="pr_edit_max" >
+<td>
+			<input type="text" size="10" name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				tabindex="<inp2:m_get param="tab_index"/>"
+				value="<inp2:m_param name="max"/>"
+				<inp2:m_if check="m_ParamEquals" param="next_min_id" value="">
+				<inp2:m_else />
+				onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>,'<inp2:m_param name="PrefixSpecial"/>')"
+				</inp2:m_if>
+
+			>
+</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="pr_edit_min" >
+<td>
+			<input type="hidden" name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="IdField"/>]" id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="IdField"/>]" value="<inp2:m_param name="id"/>">
+			<input type="text" size="10"
+				<inp2:m_if check="m_ParamEquals" param="first" value="1">
+					<inp2:m_inc param="tab_index" by="1"/>
+					tabindex="<inp2:m_get param="tab_index"/>"
+				<inp2:m_else/>
+					readonly
+				</inp2:m_if>
+				name="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				id="<inp2:m_param name="PrefixSpecial"/>[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+				value="<inp2:m_param name="min"/>"
+				<inp2:m_if check="m_ParamEquals" param="first" value="1"><inp2:m_else/>disabled</inp2:m_if>
+			>
+</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="prbracket">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+
+		<inp2:m_RenderElement name="pr_edit_min" IdField="$IdField" PrefixSpecial="$PrefixSpecial" field="FromAmount" size="40" pass_params="true"/>
+
+		<inp2:m_RenderElement name="pr_edit_max" IdField="$IdField" PrefixSpecial="$PrefixSpecial" field="ToAmount" size="40" pass_params="true"/>
+
+		<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="$PrefixSpecial" field="Percent" size="4" pass_params="true"/>
+
+	</tr>
+</inp2:m_DefineElement>
+
+
+<script>
+
+	function set_start(id, next_id, prefix_special)
+	{
+		//var next_id = id - 1;
+		var input_id = prefix_special + '[' + next_id + '][FromAmount]';
+		//var orig_id = prefix_special + '[' + id + '][FromAmount]';
+		if(document.getElementById(input_id) != null)
+		{
+			var new_value = parseInt(document.getElementById(prefix_special + '[' + id + '][ToAmount]').value);
+			if( isNaN(new_value) ) new_value = 0;
+			document.getElementById(prefix_special + '[' + id + '][ToAmount]').value = new_value;
+			document.getElementById(input_id).value = new_value;
+		}
+	}
+
+	function enableKernelFormFields()
+	{
+		var kForm = document.forms.kernel_form;
+		var elem = false;
+		for (var i=0; i<kForm.elements.length; i++){
+			elem = kForm.elements[i];
+			if (elem.type == "text" && elem.disabled == true){
+				elem.disabled = false;
+			}
+		}
+	}
+
+</script>
+
+<inp2:m_DefineElement name="pr_grid_th" >
+	<td class="columntitle_small"><inp2:m_phrase label="$phrase" /></td>
+</inp2:m_DefineElement>
+
+<inp2:apbrackets_SaveWarning name="grid_save_warning"/>
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+	<tr nowrap="nowrap" class="grid-header-row-0">
+		<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_FromAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_ToAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_Percent"/>
+	</tr>
+	<inp2:apbrackets_ShowPricingForm block="prbracket" IdField="AffiliateBracketId"/>
+</table>
+
+<inp2:m_include t="incs/footer"/>
+
+<script>
+	document.forms.kernel_form.onsubmit =  enableKernelFormFields;
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_list.tpl	(revision 16630)
@@ -0,0 +1,77 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="apt" section="in-commerce:affiliate_payment_types" title_preset="affiliate_payment_types_list" pagination="1" tabs="in-commerce/affiliate_plans/affiliate_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('apt', 'in-commerce/affiliate_plans/affiliate_payment_types_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewAffiliatePaymentType" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('apt', 'in-commerce/affiliate_plans/affiliate_payment_types_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('apt')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep6') );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_setPrimary" escape="1"/>', function() {
+							submit_event('apt','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('apt','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('apt','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('apt','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('apt','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="apt" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="affiliate_payment_type_caption_td">
+	<inp2:Field field="$field" grid="$grid"/>
+	<inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority"/></sup></span></inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="apt" IdField="PaymentTypeId" grid="Default"/>
+<script type="text/javascript">
+	Grids['apt'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/affiliate_plans/affiliate_payment_types_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/taxes/taxes_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/taxes/taxes_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/taxes/taxes_edit.tpl	(revision 16630)
@@ -0,0 +1,382 @@
+<inp2:adm_SetPopupSize width="850" height="610"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="tax" section="in-commerce:taxes" title_preset="taxes_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							SelectAll(document.getElementById('location_list[]'));
+							SelectToString(document.getElementById('location_list[]'));
+							submit_event('tax','<inp2:tax_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('tax','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('tax', '<inp2:tax_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('tax', '<inp2:tax_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="tax_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="tax_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="tax_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="destination_block" selected="">
+	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="destination_title"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="countries_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedCountries"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:tax_ShowCountries block="destination_block" show="current"/>
+				</select>
+
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.TaxZoneIdChooser)" value="&gt;"><br>
+				<input class="button" type=button onclick="MoveSelected(this.form.TaxZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableCountries"/>:<br/>
+				<select name="TaxZoneIdChooser" multiple size="10" size="10" style="width: 200px">
+					<inp2:tax_ShowCountries block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+			<!-- <select name="<inp2:tax_InputName field="TaxZoneId" />" multiple> -->
+
+
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="states_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+				<select name="CountrySelector" onChange="change_country()">
+					<inp2:tax_ShowCountries block="destination_block" show="has_states"/>
+				</select>
+					<br />
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedStates"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:tax_ShowStates block="destination_block" show="current"/>
+				</select>
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.TaxZoneIdChooser)" value="&gt;"><br>
+				<input class="button" type=button onclick="MoveSelected(this.form.TaxZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableStates"/>:<br/>
+				<select name="TaxZoneIdChooser" multiple size="10" style="width: 200px">
+					<inp2:tax_ShowStates block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="zips_multiple">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+				<select name="CountrySelector" onChange="change_country()">
+					<inp2:tax_ShowCountries block="destination_block" show="all"/>
+				</select>
+					<br />
+			<table>
+			<tr><td>
+				<inp2:m_Phrase label="la_zones_SelectedZips"/>:<br/>
+				<select name="location_list[]" id="location_list[]" multiple onchange="SelectToString(this)" size="10" style="width: 200px">
+					<inp2:tax_ShowZips block="destination_block" show="current"/>
+				</select>
+			</td>
+			<td>
+				<input class="button" type=button onclick="MoveSelected(document.getElementById('location_list[]'), this.form.TaxZoneIdChooser)" value="&gt;"><br>
+				<input class="button" type=button onclick="MoveSelected(this.form.TaxZoneIdChooser, document.getElementById('location_list[]'))" value="&lt;">
+			</td>
+			<td>
+				<inp2:m_Phrase label="la_zones_AvailableZips"/>:<br/>
+				<select name="TaxZoneIdChooser" multiple size="10" style="width: 200px">
+					<inp2:tax_ShowZips block="destination_block" show="available"/>
+				</select>
+			</td>
+			</tr>
+			</table>
+			<br>
+			<input type="text" name="zone_add" id="zone_add"> <input type="button" onClick="add_zone(document.getElementById('location_list[]'))" value="<inp2:m_Phrase label='la_btn_AddLocation'/>" class="button"/>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:tax_SaveWarning name="grid_save_warning"/>
+<inp2:tax_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_TaxZone"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="tax" field="TaxZoneId" title="la_fld_Id"/>
+
+		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="Name" title="la_fld_ZoneName" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="tax" field="TaxValue" title="la_fld_TaxValue" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToShipping" title="la_fld_TaxApplyToShipping"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="tax" field="ApplyToProcessing" title="la_fld_TaxApplyToProcessing"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="tax" field="Type" title="la_fld_ZoneType"/>
+
+		<inp2:m_if check="tax_Field" field="Type" equals_to="1" db="db">
+			<inp2:m_RenderElement name="countries_multiple" prefix="tax" />
+		</inp2:m_if>
+
+		<inp2:m_if check="tax_Field" field="Type" equals_to="2" db="db">
+			<inp2:m_RenderElement name="states_multiple" prefix="tax" />
+		</inp2:m_if>
+
+		<inp2:m_if check="tax_Field" field="Type" equals_to="3" db="db">
+			<inp2:m_RenderElement name="zips_multiple" prefix="tax" />
+		</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<input type="hidden" value="" name="location_id" id="location_id">
+<input type="hidden" value="" name="selected_destinations" id="selected_destinations">
+<input type="hidden" name="tax_OriginalSaveEvent" id="tax_OriginalSaveEvent" value="<inp2:tax_SaveEvent/>">
+
+
+<script>
+	document.getElementById('tax[<inp2:tax_field field="TaxZoneId"/>][Type]_1').onchange = change_type;
+	document.getElementById('tax[<inp2:tax_field field="TaxZoneId"/>][Type]_2').onchange = change_type;
+	document.getElementById('tax[<inp2:tax_field field="TaxZoneId"/>][Type]_3').onchange = change_type;
+
+	function change_type()
+	{
+		submit_event('tax','OnTypeChange');
+	}
+
+	function change_country()
+	{
+		submit_event('tax','OnCountryChange');
+	}
+
+	function remove_location(location_id)
+	{
+		document.getElementById('location_id').value = location_id;
+		submit_event('tax', 'OnRemoveLocation');
+	}
+
+	function SelectToString(aSelect)
+	{
+		// written by Slava, patched by Alex, modified by SergeyG
+		var result = '';
+		for (var i=0; i < aSelect.length; i++)
+		{
+			cur = aSelect.options[i];
+			if(aSelect.options[i].selected == true) result += cur.value+',';
+		}
+		if(result.length > 0) result = result.substring(0,result.length-1);
+		document.getElementById('selected_destinations').value = result;
+		return result;
+	}
+
+	function add_zone(aSelect){
+		var el = document.getElementById('zone_add');
+		if (el)
+		{
+			if (el.value=='') return;
+			var found = false;
+			var valueArray;
+
+			for (i = 0; i < aSelect.options.length; i++){
+				valueArray = aSelect.options[i].value.split("|");
+				if (valueArray[1] == el.value){
+					found = true;
+					break;
+				}
+			}
+			if (!found){
+				aSelect.options[aSelect.length] = new Option(el.value, '0|'+el.value);
+				el.value='';
+			}
+		}
+	}
+
+function SelectContainsValue(selectObject, searchValue)
+{
+	for (i = 0; i < selectObject.options.length; i++){
+		if (selectObject.options[i].text == searchValue){
+			return true;
+		}
+	}
+	return false;
+}
+
+function SelectToArray(aSelect)
+{
+	var an_arr = new Array();
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		an_arr[an_arr.length] = new Array(cur.text, cur.value, cur.selected);
+	}
+	return an_arr;
+}
+
+function ArrayToSelect(anArray, aSelect)
+{
+	var initial_length = aSelect.length;
+	for (var i=initial_length-1; i >= 0; i--) {	aSelect.options[i] = null; }
+
+	for (var i=0; i < anArray.length; i++)
+	{
+		cur = anArray[i];
+		aSelect.options[aSelect.length] = new Option(cur[0], cur[1]);
+	}
+}
+
+function SelectCompare(a, b)
+{
+	if (a[0] < b[0])
+		return -1;
+	if (a[0] > b[0])
+		return 1;
+	return 0;
+}
+
+function MoveSelected(FromList, ToList)
+{
+	FromArr = SelectToArray(FromList);
+	ToArr = SelectToArray(ToList);
+
+	NewFrom = Array();
+
+	for (var i=FromArr.length-1; i >= 0; i--)
+	{
+		cur = FromArr[i];
+		if (cur[2] && !SelectContainsValue(ToList, cur[0])) {
+			ToArr[ToArr.length] = cur;
+		}
+		else if(SelectContainsValue(ToList, cur[0])) {
+
+		}
+		else {
+			NewFrom[NewFrom.length] = cur;
+		}
+	}
+
+	NewFrom.sort(SelectCompare);
+	ToArr.sort(SelectCompare);
+
+	FromList = ArrayToSelect(NewFrom, FromList);
+	ToList = ArrayToSelect(ToArr, ToList);
+}
+
+function SelectToString2(aSelect)
+{
+	var result = '';
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		result += cur.value+',';
+	}
+	return result;
+}
+
+
+function SelectAll(aSelect)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		aSelect.options[i].selected = true;
+	}
+// -----------
+}
+
+function OnlySelectedToString(aSelect)
+{
+	var result = '';
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		if (cur.selected)
+			result += cur.value+',';
+	}
+	return result;
+}
+
+function SelectMultipleSelected(aSelect, aStr)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		if (aStr.match("(^|\,)+"+cur.value+"(,|$)+") ) {
+			aSelect.options[i].selected = true;
+			}
+	}
+}
+
+function SelectAll(aSelect)
+{
+	for (var i=0; i < aSelect.length; i++)
+	{
+		cur = aSelect.options[i];
+		aSelect.options[i].selected = true;
+	}
+}
+
+// --------------
+
+</SCRIPT>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/taxes/taxes_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/taxes/taxes_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/taxes/taxes_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/taxes/taxes_list.tpl	(revision 16630)
@@ -0,0 +1,57 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="tax" section="in-commerce:taxes" title_preset="taxes_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewTaxZone" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('tax', 'in-commerce/taxes/taxes_edit')
+						} ) );
+
+				function edit()
+	  			{
+					std_edit_item('tax', 'in-commerce/taxes/taxes_edit');
+					//submit_event('tax', 'OnLoadZoneForm', 'in-commerce/taxes/taxes_edit')
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('tax')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>',
+						function() {
+							submit_event('tax', 'OnMassClone')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="tax" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="tax" IdField="TaxZoneId" grid="Default"/>
+<script type="text/javascript">
+	Grids['tax'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/taxes/taxes_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/category_properties.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/category_properties.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/category_properties.tpl	(revision 16630)
@@ -0,0 +1,2 @@
+<inp2:m_RenderElement name="subsection" title="la_In-commerce"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_p_ItemTemplate" type_field="cust_p_ItemTemplate" title="la_fld_cust_p_ItemTemplate" size="50"/>

Property changes on: releases/5.2.2-B2/admin_templates/category_properties.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/paid_listings/paid_listing_type_shopcart.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/paid_listings/paid_listing_type_shopcart.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/paid_listings/paid_listing_type_shopcart.tpl	(revision 16630)
@@ -0,0 +1,68 @@
+<inp2:adm_SetPopupSize width="790" height="440"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="lst" section="in-link:listing_types" title_preset="listing_type_shop_cart" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						submit_event('lst','<inp2:lst_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+						submit_event('lst','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('lst', '<inp2:lst_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('lst', '<inp2:lst_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="lst_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="lst_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="lst_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:lst_SaveWarning name="grid_save_warning"/>
+<inp2:lst_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_ShopCartItem"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="lst" field="EnableBuying" title="la_fld_EnableBuying" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lst" field="ShopCartName" title="la_fld_ShopCartName" size="20" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="lst" field="Price" title="la_fld_Price" size="8" />
+			<!-- <inp2:m_RenderElement name="inp_edit_checkbox" prefix="lst" field="Recurring" title="la_fld_Recurring" /> -->
+
+	<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/paid_listings/paid_listing_type_shopcart.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/downloads/downloads_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/downloads/downloads_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/downloads/downloads_list.tpl	(revision 16630)
@@ -0,0 +1,50 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="down" section="in-commerce:downloadlog" title_preset="downloads_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+	  			{
+
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
+							window.location.href = window.location.href;
+						}
+				) );
+
+				a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+							std_delete_items('down');
+						}
+				) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="down" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="down" IdField="DownloadId" grid="Default"/>
+
+<script type="text/javascript">
+	Grids['down'].SetDependantToolbarButtons( new Array('reset') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/downloads/downloads_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/import_progress.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/import_progress.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/import_progress.tpl	(revision 16630)
@@ -0,0 +1,16 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p.import" section="in-portal:browse" perm_section="PRODUCT" permission_type="VIEW" system_permission="0" title_preset="products_import"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('p.import', 'OnExportCancel');
+	}
+
+	$ProductImport = new AjaxProgressBar('<inp2:m_t t="dummy" p.import_event="OnExportProgress" pass="m,p.import" no_amp="1" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/import_progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/incs/order_print.css
===================================================================
--- releases/5.2.2-B2/admin_templates/incs/order_print.css	(revision 0)
+++ releases/5.2.2-B2/admin_templates/incs/order_print.css	(revision 16630)
@@ -0,0 +1,53 @@
+.order_print_defaults TD,
+.order_preview_header,
+.order_preview_header TD,
+.order_print_preview_header TD,
+.order_preview_field_name,
+.order-totals-name,
+.arial2r,
+.orders_print_flat_table TD {
+	font-family: Arial;
+	font-size: 10pt;
+}
+
+.order_preview_header, .order_preview_header TD, .order_print_preview_header TD {
+	background-color: #C9E9FE;
+	font-weight: bold;
+}
+
+.order_print_preview_header TD {
+	background-color: #FFFFFF;
+}
+
+.order_preview_field_name {
+	font-weight: bold;
+	padding: 2px 4px 2px 4px;
+}
+
+.order-totals-name {
+	font-style: normal;
+}
+
+.border1 {
+	border: 1px solid #111111;
+}
+
+.arial2r {
+	color: #602830;
+	font-weight: bold;
+}
+
+.orders_flat_table, .orders_print_flat_table {
+	border-collapse: collapse;
+	margin: 5px;
+}
+
+.orders_flat_table TD {
+	padding: 2px 5px 2px 5px;
+	border: 1px solid #444444;
+}
+
+.orders_print_flat_table TD {
+	border: 1px solid #000000;
+	padding: 2px 5px 2px 5px;
+}
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/incs/order_print.css
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/reports/chart.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/reports/chart.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/reports/chart.tpl	(revision 16630)
@@ -0,0 +1,62 @@
+<inp2:adm_SetPopupSize width="1124" height="700"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" title_preset="report_chart"/>
+
+<inp2:rep.params_CalculateChart/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
+<tbody>
+	<tr>
+  	<td>
+			<script type="text/javascript">
+				function edit()
+				{
+					// do nothing
+				}
+
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							getWindowOpener(window).focus();
+							window_close();
+							return true;
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+				 			window.print();
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	  	<td align="center">
+			<inp2:m_if check="rep.metric_ReportTypeEquals" value="2">
+			<inp2:m_else/>
+		  		<inp2:m_Phrase label="la_Metric"/>:	<select name="metric" id="metric" onchange="submit_event('rep','OnChangeStatistics')">
+					<inp2:rep.params_PredefinedOptions field="Metric" block="inp_option_phrase" selected="selected"/>
+				</select>
+			</inp2:m_if>
+		</td>
+		<td width="150">
+			&nbsp;
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<center>
+<inp2:m_if check="rep.metric_ReportTypeEquals" value="12">
+	<img src="<inp2:m_Link template='dummy' pass='m,rep' rep_event='OnPrintChart'/>&rand=<inp2:rep_GetRandom/>&width=1024&height=600" />
+<inp2:m_else/>
+	<img src="<inp2:m_Link template='dummy' pass='m,rep' rep_event='OnPieChart' />&rand=<inp2:rep_GetRandom/>&width=1024&height=600" />
+</inp2:m_if>
+<br/>
+<!--inp2:m_RenderElement name="graph" width="600" height="450" template="ebay/listings/statistics_graph"/-->
+<center/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/reports/chart.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/reports/results.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/reports/results.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/reports/results.tpl	(revision 16630)
@@ -0,0 +1,68 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" pagination="1" title_preset="report_results"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
+<tbody>
+	<tr>
+  	<td>
+			<script type="text/javascript">
+				function edit()
+				{
+					// do nothing
+				}
+
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>', function() {
+//							window.location = '<inp2:m_t t="../../plugins/reports/admin_templates/reports" "pass"="m,rep" "rep_event="OnNew" no_amp="1" js_escape="1"/>'
+							window.location = '<inp2:m_Link template="in-commerce/reports/reports" pass="m,rep" rep_event="OnNew" no_amp="1" js_escape="1"/>';
+							return true;
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+				 			window.print();
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+								show_viewmenu(a_toolbar,'view');
+							}
+					) );
+
+				 a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
+								submit_event('rep','OnExportReport');
+							}
+					) );
+
+				<inp2:m_if check="rep.metric_ReportTypeEquals" value="2">
+					// By Users report have no chart
+				<inp2:m_else/>
+					// Only PHP5 have chart
+					<inp2:m_if check="rep_IsPHPxOrGreater" version="5">
+						// Chart window open button
+						 a_toolbar.AddButton( new ToolBarButton('in-commerce:view_chart', '<inp2:m_phrase label="la_ToolTip_View_Chart" escape="1"/>', function() {
+								openSelector('rep', '<inp2:m_Link template="in-commerce/reports/chart" pass="all" no_amp="1" js_escape="1"/>');
+							}
+							) );
+					</inp2:m_if>
+
+				</inp2:m_if>
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+	  	<inp2:m_RenderElement name="search_main_toolbar" prefix="rep" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="rep" IdField="CategoryId" grid="Default" totals_render_as="grid_total_row"/>
+<script type="text/javascript">
+	Grids['rep'].SetDependantToolbarButtons( new Array() );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/reports/results.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/reports/status_xml.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/reports/status_xml.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/reports/status_xml.tpl	(revision 16630)
@@ -0,0 +1 @@
+<inp2:rep_ReportStatus/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/reports/status_xml.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/reports/progress.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/reports/progress.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/reports/progress.tpl	(revision 16630)
@@ -0,0 +1,15 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" title_preset="report_progress"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('rep', 'OnGoBack');
+	}
+	// $ProductExport = new AjaxProgressBar('<inp2:m_t t="../../plugins/reports/admin_templates/status_xml" no_amp="1" js_escape="1"/>');
+
+	$ProductExport = new AjaxProgressBar('<inp2:m_Link template="in-commerce/reports/status_xml" no_amp="1" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/reports/progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/reports/reports.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/reports/reports.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/reports/reports.tpl	(revision 16630)
@@ -0,0 +1,99 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" title_preset="report_options"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_RunReport" escape="1"/>', function() {
+
+//						set_hidden_field('progress_t', '../../plugins/reports/admin_templates/progress');
+						set_hidden_field('progress_t', 'in-commerce/reports/progress');
+
+//						set_hidden_field('reports_finish_t', '../../plugins/reports/admin_templates/results');
+						set_hidden_field('reports_finish_t', 'in-commerce/reports/results');
+						submit_event('rep','OnRunReport');
+
+						}
+					) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" class="bordered">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="rep" field="ReportType" title="la_fld_ReportType" use_phrases="1"/>
+
+		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="FromDateTime" title="la_fld_FromDateTime"/>
+		<inp2:m_RenderElement name="inp_edit_date" prefix="rep" field="ToDateTime" title="la_fld_ToDateTime"/>
+
+		<script type="text/javascript">
+			function updateTimeFrame(option) {
+				from_date = '';
+				to_date = '';
+				if (option == 'last_week') {
+					from_date = '<inp2:adm_TimeFrame type="last_week_start" format="_regional_InputDateFormat"/>';
+					to_date = '<inp2:adm_TimeFrame type="last_week_end" format="_regional_InputDateFormat"/>';
+				}
+
+				if (option == 'last_month') {
+					from_date = '<inp2:adm_TimeFrame type="last_month_start" format="_regional_InputDateFormat"/>';
+					to_date = '<inp2:adm_TimeFrame type="last_month_end" format="_regional_InputDateFormat"/>';
+				}
+
+				if (option == 'last_quater') {
+					from_date = '<inp2:adm_TimeFrame type="last_quater_start" format="_regional_InputDateFormat"/>';
+					to_date = '<inp2:adm_TimeFrame type="last_quater_end" format="_regional_InputDateFormat"/>';
+				}
+
+				if (option == 'last_6months') {
+					from_date = '<inp2:adm_TimeFrame type="last_6_months_start" format="_regional_InputDateFormat"/>';
+					to_date = '<inp2:adm_TimeFrame type="last_month_end" format="_regional_InputDateFormat"/>';
+				}
+
+				if (option == 'last_year') {
+					from_date = '<inp2:adm_TimeFrame type="last_year_start" format="_regional_InputDateFormat"/>';
+					to_date = '<inp2:adm_TimeFrame type="last_year_end" format="_regional_InputDateFormat"/>';
+				}
+
+
+				document.getElementById('<inp2:rep_InputName field="FromDateTime_date"/>').value = from_date;
+				document.getElementById('<inp2:rep_InputName field="ToDateTime_date"/>').value = to_date;
+			}
+		</script>
+
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<inp2:m_Phrase label="la_comm_Timeframe"/>:
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<select id="timeframe" onchange="updateTimeFrame(this.value)">
+				<option value=""></option>
+				<option value="last_week"><inp2:m_Phrase label="lu_comm_LastWeek"/></option>
+				<option value="last_month"><inp2:m_Phrase label="lu_comm_LastMonth"/></option>
+				<option value="last_quater"><inp2:m_Phrase label="lu_comm_LastQuater"/></option>
+				<option value="last_6months"><inp2:m_Phrase label="lu_comm_Last6Months"/></option>
+				<option value="last_year"><inp2:m_Phrase label="lu_comm_LastYear"/></option>
+			</select>
+		</td>
+	</tr>
+
+	<!--## TODO Commented out for now, but we have DB Fields! 
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="Recursive" title="la_fld_Recursive"/>
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rep" field="SkipEmpty" title="la_fld_SkipEmpty"/>
+	##-->
+
+	<inp2:m_RenderElement name="inp_edit_filler"/>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/reports/reports.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.4.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/catalog_tab.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/catalog_tab.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/catalog_tab.tpl	(revision 16630)
@@ -0,0 +1,102 @@
+<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
+<inp2:m_DefineElement name="catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+			function createProductMenu() {
+				prod_menu = menuMgr.createMenu(rs('new_prod_menu'));
+				prod_menu.applyBorder(false, false, false, false);
+				prod_menu.dropShadow("none");
+				prod_menu.showIcon = true;
+
+				<inp2:m_DefineElement name="product_type_elem">
+					prod_menu.addItem(rs('product.type.<inp2:m_param name="key"/>'),'<inp2:m_phrase name="$option" escape="1"/>','javascript:new_product(<inp2:m_param name="key"/>);');
+				</inp2:m_DefineElement>
+				<inp2:{$prefix}_PredefinedOptions selected="selected" field="Type" block="product_type_elem" skip_autoload="true"/>
+			}
+
+			a_toolbar.AddButton(
+				new ToolBarButton(
+					'in-commerce:new_product',
+					'<inp2:m_phrase label="la_ToolTip_NewProduct" escape="1"/>::<inp2:m_phrase label="la_ToolTip_NewProduct" escape="1"/>',
+					function() {
+						renderMenus();
+						nls_showMenu(rs('new_prod_menu'), a_toolbar.GetButtonImage('new_product'));
+					},
+					true
+		 		)
+		 	);
+
+			function new_product($type) {
+				$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
+				set_hidden_field('<inp2:m_param name="prefix"/>_new_type', $type);
+
+				<inp2:m_if check="m_Get" name="t" equals_to="catalog/catalog">
+					std_precreate_item($Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'));
+				<inp2:m_else/>
+					var $kf = document.getElementById($form_name);
+
+					var $prev_action = $kf.action;
+					$kf.action = '<inp2:m_t pass="all" no_pass_through="1"/>';
+
+					set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
+					std_precreate_item(
+						$Catalog.ActivePrefix, $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'edit_template'),
+						function() {
+							$kf.action = $prev_action;
+						}
+					);
+				</inp2:m_if>
+			}
+
+			createProductMenu();
+		</inp2:m_if>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
+			<div id="products_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/catalog_tab" edit_template="in-commerce/products/products_edit" category_id="-1" dep_buttons="new_product" class="catalog-tab"><!-- IE minimal height problem fix --></div>
+			<script type="text/javascript">$Catalog.registerTab('products');</script>
+		</inp2:m_if>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
+			$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:lang.current_SetContentType content_type="text/plain"/>
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+		<inp2:$prefix_InitList grid="$grid_name"/>
+
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_DefineElement name="qty_td">
+			<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_include template="in-auction/inc/grid_blocks" is_silent="1"/>
+
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
+
+		<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
+			Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
+		</inp2:m_if>
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
+		<inp2:m_RenderElement name="reflect_catalog_buttons"/>
+
+		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
+		<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
+			Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
+		</inp2:m_if>
+		#separator#
+		<!-- products tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="products_form"/>
+			<input type="hidden" name="<inp2:m_param name="prefix"/>_new_type" id="<inp2:m_param name="prefix"/>_new_type" value="">
+			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="ProductId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="kernel_form_end"/>
+		<!-- products tab: end -->
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:p_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>

Property changes on: releases/5.2.2-B2/admin_templates/catalog_tab.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.24.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/export/export.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/export/export.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/export/export.tpl	(revision 16630)
@@ -0,0 +1,171 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.export" section="in-commerce:orders" title_preset="orders_export"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+
+						document.getElementById('hidden_export_columns').value = select_to_string('<inp2:ord.export_InputName field="ExportColumns"/>');
+						submit_event('ord.export', 'OnExportBegin');
+
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord.export', 'OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:ord.export_SaveWarning name="grid_save_warning"/>
+<inp2:ord.export_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets">
+				<td class="control-cell">
+					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:ord.export_InputName field="ExportPresets"/>" id="<inp2:ord.export_InputName field="ExportPresets"/>" onchange="update_fields(this.value)">
+						<inp2:ord.export_PredefinedOptions field="ExportPresets" block="inp_option_item" selected="selected"/>
+					</select>
+					&nbsp;&nbsp;
+					<input class="button" type="button" value="<inp2:m_Phrase label="la_Text_Delete"/>" onclick="delete_preset()">
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns">
+				<td class="control-cell">
+					<table cellpadding="0" cellspacing="0" border="0">
+						<tr>
+							<td>
+								<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:ord.export_InputName field="ExportColumns"/>', 1)" class="button">
+								<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:ord.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
+								<img src="img/s.gif" width="1" height="5" alt=""><br />
+							</td>
+							<td><img src="img/s.gif" width="45" height="1" alt=""><br></td>
+							<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
+						</tr>
+						<tr>
+							<td>
+								<select multiple id="<inp2:ord.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+									<inp2:ord.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+								</select>
+								<input type="hidden" id="hidden_export_columns" name="<inp2:ord.export_InputName field="ExportColumns"/>" value="<inp2:ord.export_Field field="ExportColumns"/>" />
+							</td>
+							<td align="center">
+								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('<inp2:ord.export_InputName field="AvailableColumns"/>', '<inp2:ord.export_InputName field="ExportColumns"/>')" class="button"><br>
+								<img src="img/s.gif" width="1" height="4" alt=""><br>
+								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('<inp2:ord.export_InputName field="ExportColumns"/>', '<inp2:ord.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:ord.export_InputName field="AvailableColumns"/>');" class="button">
+							</td>
+							<td>
+								<select multiple id="<inp2:ord.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+									<inp2:ord.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="ExportSavePreset" title="la_fld_ExportSavePreset" size="2" maxlength="1" onclick="update_preset_field(this.checked)"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportPresetName" title="la_fld_ExportPresetName" size="20" />
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript" src="incs/ajax.js"></script>
+<script type="text/javascript">
+	var delete_busy = false;
+
+	function delete_preset()
+	{
+		if (!confirm('<inp2:m_Phrase label="la_ConfirmDeleteExportPreset" js_escape="1"/>')) return;
+		var $kf = document.getElementById('kernel_form');
+		tmp = $kf.elements['events[ord.export]'].value;
+		$kf.elements['events[ord.export]'].value = 'OnDeleteExportPreset';
+		Request.method = 'POST';
+		Request.params = Request.serializeForm($kf);
+		$kf.elements['events[ord.export]'].value = tmp;
+		Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" no_amp="1" js_escape="1"/>', delete_busy, '', function() {
+			presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
+
+			for (i=0; i< presets.options.length; i++) {
+				if (presets.options[i].selected) {
+					presets.options.remove[i];
+				}
+			}
+			presets.options[0].selected = true;
+		}, function() {alert('error')} );
+	}
+
+	function update_preset_field(status)
+	{
+		if (status) {
+			presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
+			if ( presets.value != '' ) {
+				for (i=0; i< presets.options.length; i++) {
+					if (presets.options[i].selected) {
+						preset_name = presets.options[i].text
+					}
+				}
+				document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').value = preset_name;
+			}
+		}
+		document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').disabled = !status;
+	}
+
+	function update_fields(preset)
+	{
+		$export = select_to_string(document.getElementById('<inp2:ord.export_InputName field="ExportColumns"/>'));
+		if ($export != '') {
+			string_to_selected($export, document.getElementById('<inp2:ord.export_InputName field="ExportColumns"/>'));
+			move_selected('<inp2:ord.export_InputName field="ExportColumns"/>', '<inp2:ord.export_InputName field="AvailableColumns"/>');
+		}
+
+		av = document.getElementById('<inp2:ord.export_InputName field="AvailableColumns"/>');
+		fields = preset.split('|');
+
+		for (var i=0; i<fields.length; i++) {
+			fld = fields[i];
+			var $cur = null;
+			for (var $i = 0; $i < av.length; $i++)
+			{
+				cur = av.options[$i];
+				if (cur.value == fld) {
+					av.options[$i].selected = true;
+					move_selected('<inp2:ord.export_InputName field="AvailableColumns"/>', '<inp2:ord.export_InputName field="ExportColumns"/>');
+				}
+				else {
+					av.options[$i].selected = false;
+				}
+			}
+		}
+	}
+
+	update_preset_field(document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').checked)
+
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/export/export.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/export/export_finish.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/export/export_finish.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/export/export_finish.tpl	(revision 16630)
@@ -0,0 +1,45 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.export" section="in-commerce:orders" title_preset="orders_export"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							submit_event('ord.export', 'OnGoBack');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_DownloadExportFile"/>
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<a href="<inp2:ord.export_ExportPath as_url="1"/>"><inp2:ord.export_ExportPath /></a>
+			</td>
+		</tr>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/export/export_finish.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/export/export_status_xml.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/export/export_status_xml.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/export/export_status_xml.tpl	(revision 16630)
@@ -0,0 +1 @@
+<inp2:m_if check="m_CheckPermission" permissions="in-commerce:orders.view" system="1"><inp2:ord.export_ExportStatus/><inp2:m_else/>100</inp2:m_if>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/export/export_status_xml.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/export/export_progress.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/export/export_progress.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/export/export_progress.tpl	(revision 16630)
@@ -0,0 +1,16 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.export" section="in-commerce:orders" title_preset="orders_export"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('ord.export', 'OnExportCancel');
+	}
+
+	$ProductExport = new AjaxProgressBar('<inp2:m_t t="in-commerce/orders/export/export_status_xml" no_amp="1" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/export/export_progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_backorders_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_backorders_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_backorders_list.tpl	(revision 16630)
@@ -0,0 +1,72 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.backorders" section="in-commerce:orders" title_preset="orders_backorders" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.backorders]',1);
+  				std_edit_item('ord.backorders', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.backorders]',1);
+							submit_event('ord.backorders','OnMassClone');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('process', '<inp2:m_phrase label="la_ToolTip_Process" escape="1"/>', function() {
+							submit_event('ord.backorders','OnMassOrderProcess');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Deny" escape="1"/>', function() {
+							submit_event('ord.backorders','OnMassOrderDeny');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('archive', '<inp2:m_phrase label="la_ToolTip_Archive" escape="1"/>', function() {
+							submit_event('ord.backorders','OnMassOrderArchive');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.backorders', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.backorders" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.backorders" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.backorders'].SetDependantToolbarButtons( new Array('edit','delete','clone','process','deny','archive','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','backorders');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_backorders_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_blocks.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_blocks.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_blocks.tpl	(revision 16630)
@@ -0,0 +1,302 @@
+<inp2:m_DefineElement name="product_image">
+	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_print_element">
+	<table cellspacing="0" cellpadding="2" width="100%" border="0" class="order_print_defaults">
+		<tr>
+			<td colspan="3" align="left">
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td width="50%" align="left" valign="top">
+							<h2><inp2:m_GetConfig name="Comm_StoreName"/></h2>
+						</td>
+						<td width="50%" align="right">
+							<inp2:m_if check="m_ConfigEquals" name="Comm_AddressLine1" value="" inverse="inverse">
+								<inp2:m_GetConfig name="Comm_AddressLine1"/><br>
+							</inp2:m_if>
+							<inp2:m_if check="m_ConfigEquals" name="Comm_AddressLine2" value="" inverse="inverse">
+								<inp2:m_GetConfig name="Comm_AddressLine2"/><br>
+							</inp2:m_if>
+							<inp2:ord_PrintLocation type="Company"/><br />
+							E-Mail: <inp2:m_GetConfig name="Comm_Contacts_Email"/><br />
+							Phone: <inp2:m_GetConfig name="Comm_Contacts_Phone"/><br />
+							Fax: <inp2:m_GetConfig name="Comm_Contacts_Fax"/><br />
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td colspan="3">
+				<br />
+				<center>
+					<h3>Order Number: <inp2:ord_Field field="OrderNumber"/></h3>
+					<inp2:ord_Field field="OrderDate" format="_regional_DateFormat"/><br />
+				</center>
+				<br />
+			</td>
+		</tr>
+
+		<inp2:m_if check="ord_Field" name="ShippingTo">
+		<tr>
+			<td width="50%" valign="top">
+				<br />
+				<!-- shipping -->
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="order_preview_field_name">Ship To:</td>
+						<td><inp2:ord_Field field="ShippingTo"/></td>
+					</tr>
+					<inp2:m_if check="ord_Field" name="ShippingEmail">
+					<tr>
+						<td class="order_preview_field_name">Email Address:</td>
+						<td><inp2:ord_Field field="ShippingEmail"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingPhone">
+					<tr>
+						<td class="order_preview_field_name">Phone:</td>
+						<td><inp2:ord_Field field="ShippingPhone"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingFax">
+					<tr>
+						<td class="order_preview_field_name">Fax Number:</td>
+						<td><inp2:ord_Field field="ShippingFax"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingCompany">
+					<tr>
+						<td class="order_preview_field_name">Company:</td>
+						<td><inp2:ord_Field field="ShippingCompany"/></td>
+					</tr>
+					</inp2:m_if>
+					<tr>
+						<td class="order_preview_field_name" style="vertical-align: top;">Address:</td>
+						<td>
+							<inp2:m_if check="ord_FieldEquals" field="ShippingAddress1" value="" inverse="inverse" >
+								<inp2:ord_Field field="ShippingAddress1"/><br>
+							</inp2:m_if>
+							<inp2:m_if check="ord_FieldEquals" field="ShippingAddress2" value="" inverse="inverse" >
+								<inp2:ord_Field field="ShippingAddress2"/><br>
+							</inp2:m_if>
+							<inp2:ord_PrintLocation type="Shipping"/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="BillingTo">
+			<td width="50%" valign="top">
+				<!-- billing -->
+				<br />
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="order_preview_field_name">Bill To:</td>
+						<td><inp2:ord_Field field="BillingTo"/></td>
+					</tr>
+					<inp2:m_if check="ord_Field" name="BillingEmail">
+					<tr>
+						<td class="order_preview_field_name">Email Address:</td>
+						<td><inp2:ord_Field field="BillingEmail"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingPhone">
+					<tr>
+						<td class="order_preview_field_name">Phone:</td>
+						<td><inp2:ord_Field field="BillingPhone"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingFax">
+					<tr>
+						<td class="order_preview_field_name">Fax Number:</td>
+						<td><inp2:ord_Field field="BillingFax"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingCompany">
+					<tr>
+						<td class="order_preview_field_name">Company:</td>
+						<td><inp2:ord_Field field="BillingCompany"/></td>
+					</tr>
+					</inp2:m_if>
+					<tr>
+						<td class="order_preview_field_name" style="vertical-align: top;">Address:</td>
+						<td>
+							<inp2:m_if check="ord_FieldEquals" field="BillingAddress1" value="" inverse="inverse" >
+								<inp2:ord_Field field="BillingAddress1"/><br>
+							</inp2:m_if>
+							<inp2:m_if check="ord_FieldEquals" field="BillingAddress2" value="" inverse="inverse" >
+								<inp2:ord_Field field="BillingAddress2"/><br>
+							</inp2:m_if>
+							<inp2:ord_PrintLocation type="Billing"/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="ShippingTo" inverse="inverse"><td width="50%" valign="top">&nbsp;</td></inp2:m_if>
+			<inp2:m_if check="ord_Field" name="BillingTo" inverse="inverse"><td width="50%" valign="top">&nbsp;</td></inp2:m_if>
+		</tr>
+	</table>
+
+	<br /><br />
+
+	<table cellspacing="0" cellpadding="0" width="100%" border="0" class="orders_print_flat_table"<inp2:m_if check="ord_NextId"> style="page-break-after: always;"</inp2:m_if>>
+		<tr class="order_print_preview_header">
+			<td width="70%"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if>>Product</td>
+			<td width="10%">Quantity</td>
+			<td width="10%">Price</td>
+			<td width="10%">Total</td>
+		</tr>
+
+		<inp2:m_DefineElement name="option_value_element">
+			<inp2:m_param name="value"/> <inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+			<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_element">
+			<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+				<strong><inp2:m_param name="option"/>:</strong>
+					<inp2:PrintOptionValues render_as="option_value_element"/>
+			<inp2:m_else/>
+					<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+						<inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+			</inp2:m_if><br/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_value_element_no_price">
+			<inp2:m_param name="value"/>
+			<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_element_no_price">
+			<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+				<strong><inp2:m_param name="option"/>:</strong>
+					<inp2:PrintOptionValues render_as="option_value_element_no_price"/>
+			<inp2:m_else/>
+					<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+			</inp2:m_if><br/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="order_detail_row">
+			<tr>
+				<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
+					<td valign="top" width="120">
+						<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="../../in-commerce/admin_templates/img/itemicons/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
+					</td>
+				</inp2:m_if>
+				<td align="left" width="100%">
+					<inp2:{$PrefixSpecial}_Field field="ProductName"/><br/>
+					<small><strong>SKU: </strong><inp2:Field field="SKU"/></small>
+					<inp2:m_if check="HasOptions">
+						<br/>
+						<small>
+						<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+							<inp2:PrintOptions render_as="option_element"/>
+						<inp2:m_else/> <!-- listed combinations -->
+							<inp2:PrintOptions render_as="option_element_no_price"/>
+						</inp2:m_if>
+						</small>
+						<br/>
+					</inp2:m_if>
+					<inp2:m_if check="HasDiscount">
+						<br />
+						<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" /><br />
+						<inp2:m_Phrase label="lu_comm_Discount" />: - <inp2:Field name="ItemDiscount" />
+					</inp2:m_if>
+				</td>
+				<td align="right" nowrap><inp2:{$PrefixSpecial}_Field field="Quantity"/></td>
+				<td align="right" nowrap><inp2:{$PrefixSpecial}_Field field="Price"/></td>
+				<td align="right" nowrap><inp2:{$PrefixSpecial}_Field field="ExtendedPrice"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:orditems_PrintList block="order_detail_row" per_page="-1" requery="1"/>
+
+		<tr>
+			<td align="left"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if>>
+				<inp2:m_if check="ord_Field" name="CouponId">
+					<span class="order_preview_field_name"><inp2:m_Phrase label="la_CouponCode"/>:</span> <inp2:ord_Field field="CouponCode"/><br />
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_FieldEquals" field="DiscountTotal" value="0.00" inverse="inverse">
+					<span class="order_preview_field_name"><inp2:m_Phrase label="la_TotalSavings"/>:</span> <inp2:ord_Field field="DiscountTotal"/><br />
+				</inp2:m_if>
+			</td>
+			<td align="right" nowrap colspan="2" class="order-totals-name"><inp2:m_Phrase label="la_SubTotal"/></td>
+			<td align="right" nowrap>
+				<inp2:m_if check="ord_FieldEquals" name="VAT" value="0.00">
+					<inp2:ord_Field field="AmountWithoutVAT"/>
+				<inp2:m_else />
+					<inp2:ord_Field field="SubTotal"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+
+		<inp2:m_DefineElement name="shipping_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_ShippingHandling"/><inp2:m_if check="ord_ShippingType"> (<inp2:ord_ShippingType />)</inp2:m_if></td>
+				<td align="right" nowrap><inp2:ord_Field field="ShippingCost"/></td>
+			</tr>
+
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_Insurance_Fee"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="InsuranceFee"/></td>
+			</tr>
+
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="vat_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_VAT"/> <inp2:ord_Field field="VATPercent"/>%</td>
+				<td align="right" nowrap><inp2:ord_Field field="VAT"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="processing_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_ProcessingFee"/> :</td>
+				<td align="right" nowrap><inp2:ord_Field field="ProcessingFee"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+		
+		<inp2:m_DefineElement name="return_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_TotalReturns"/>:</td>
+				<td align="right" nowrap class="arial2">-<inp2:ord_Field field="ReturnTotal"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:ord_PrintTotals
+				shipping_render_as="shipping_total"
+				processing_render_as="processing_total"
+				vat_render_as="vat_total"
+				return_render_as="return_total"/>
+
+		<inp2:m_if check="ord_Field" field="GiftCertificateId">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Number"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateCode"/></td>
+			</tr>
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_Certificate_Amount_Applied"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateDiscount"/></td>
+			</tr>
+		</inp2:m_if>
+
+		<tr>
+			<td align="right" colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>"><span class="order_preview_field_name">Total:</span></td>
+			<td align="right" nowrap><span class="order_preview_field_name"><inp2:ord_Field field="TotalAmount"/></span></td>
+		</tr>
+		<inp2:m_if check="ord_HasOriginalAmount" >
+		<tr>
+			<td align="right" colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>"><span class="order_preview_field_name">Original Amount:</span></td>
+			<td align="right" nowrap><span class="order_preview_field_name"><inp2:ord_Field field="OriginalAmount"/></span></td>
+		</tr>
+		</inp2:m_if>
+	</table>
+</inp2:m_DefineElement>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_blocks.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_pending_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_pending_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_pending_list.tpl	(revision 16630)
@@ -0,0 +1,75 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.pending" section="in-commerce:orders" title_preset="orders_pending" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.pending]',1);
+  				std_edit_item('ord.pending', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.pending]',1);
+							submit_event('ord.pending','OnMassClone');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('ord.pending','OnMassOrderApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Deny" escape="1"/>', function() {
+							submit_event('ord.pending','OnMassOrderDeny');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.pending', 'in-commerce/orders/orders_print');
+						}
+				) );
+
+				<!--##
+				// TODO there is code for this in OrderEventHandler, but missing PDF template
+				a_toolbar.AddButton( new ToolBarButton('pdf', '<inp2:m_phrase label="la_ToolTip_Pdf" escape="1"/>', function() {
+							submit_event('ord.pending','OnGeneratePDF');
+						}
+				) );
+				##-->
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.pending" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.pending" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.pending'].SetDependantToolbarButtons( new Array('edit','delete','clone','approve','deny','archive','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','pending');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_pending_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/gw_results.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/gw_results.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/gw_results.tpl	(revision 16630)
@@ -0,0 +1,49 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_gw_result"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+	  	<td>
+	  		<script type="text/javascript">
+					a_toolbar = new ToolBar();
+
+		  			a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+								window_close();
+							}
+					 	) );
+
+					a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:ord_SaveWarning name="grid_save_warning"/>
+<inp2:ord_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+
+		<inp2:m_DefineElement name="a_field">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<td class="label-cell">
+					<inp2:m_Param name="field"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<inp2:m_Param name="value"/>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:ord_PrintSerializedFields render_as="a_field"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<!--<inp2:s_HiddenSelection/>-->
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/gw_results.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_archived_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_archived_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_archived_list.tpl	(revision 16630)
@@ -0,0 +1,60 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.archived" section="in-commerce:orders" title_preset="orders_archived" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.archived]',1);
+  				std_edit_item('ord.archived', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('ord.archived')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				 a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.archived]',1);
+							submit_event('ord.archived','OnMassClone');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.archived', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.archived" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.archived" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.archived'].SetDependantToolbarButtons( new Array('edit','delete','clone','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	set_hidden_field('order_type','archived');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_archived_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_processed_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_processed_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_processed_list.tpl	(revision 16630)
@@ -0,0 +1,67 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.processed" section="in-commerce:orders" title_preset="orders_processed" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.processed]',1);
+  				std_edit_item('ord.processed', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.processed]',1);
+							submit_event('ord.processed','OnMassClone');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('archive', '<inp2:m_phrase label="la_ToolTip_Archive" escape="1"/>', function() {
+							submit_event('ord.processed','OnMassOrderArchive');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Deny" escape="1"/>', function() {
+							submit_event('ord.processed','OnMassOrderDeny');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.processed', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.processed" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.processed" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.processed'].SetDependantToolbarButtons( new Array('edit','delete', 'deny', 'clone','archive','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','processed');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_processed_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_denied_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_denied_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_denied_list.tpl	(revision 16630)
@@ -0,0 +1,73 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.denied" section="in-commerce:orders" title_preset="orders_denied" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.denied]',1);
+  				std_edit_item('ord.denied', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+//				a_toolbar.AddButton( new ToolBarButton('new_order', '<inp2:m_phrase label="la_ToolTip_New_Order" escape="1"/>',
+//						function() {
+//							set_hidden_field('remove_specials[ord.denied]',1);
+//							std_precreate_item('ord.denied', 'in-commerce/orders/orders_edit')
+//						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('ord.denied')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:reset_to_pending', '<inp2:m_phrase label="la_ToolTip_ResetToPending" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.denied]',1);
+							submit_event('ord.denied','OnResetToPending');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				 a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.denied]',1);
+							submit_event('ord.denied','OnMassClone');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.denied', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.denied" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.denied" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.denied'].SetDependantToolbarButtons( new Array('edit','delete','reset_to_pending', 'clone','print') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','denied');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_denied_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_list_tabs.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_list_tabs.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_list_tabs.tpl	(revision 16630)
@@ -0,0 +1,28 @@
+<inp2:m_include template="in-commerce/orders/order_blocks"/>
+
+<inp2:m_DefineElement name="orders_tabs">
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Incomplete" t="in-commerce/orders/orders_incomplete_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Pending" t="in-commerce/orders/orders_pending_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_BackOrders" t="in-commerce/orders/orders_backorders_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_ToShip" t="in-commerce/orders/orders_toship_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Processed" t="in-commerce/orders/orders_processed_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Denied" t="in-commerce/orders/orders_denied_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Returns" t="in-commerce/orders/orders_returns_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Archived" t="in-commerce/orders/orders_archived_list"/>
+	<inp2:m_RenderElement name="tab_direct" title="la_tab_Search" t="in-commerce/orders/orders_search_list"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="orders_tabs"/>
+
+<script type="text/javascript">
+
+	function print_orders($prefix_special, $t) {
+		if ($prefix_special.match(/(.*)\.(.*)/)) {
+			set_hidden_field('order_type', RegExp.$2);
+		}
+
+		set_hidden_field('remove_specials[' + $prefix_special + ']', 1);
+
+		open_popup($prefix_special, 'OnLoadSelected', $t, '750x700');
+	}
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_list_tabs.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit.tpl	(revision 16630)
@@ -0,0 +1,129 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_general" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ord','<inp2:ord_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_NextId/>');
+						}
+				 ) );
+
+//				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ord_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+//					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ord_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ord_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>
+
+<inp2:ord_SaveWarning name="grid_save_warning"/>
+<inp2:ord_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+
+			<inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="la_fld_OrderId"/>
+
+			<inp2:m_if check="ord_OrderEditable">
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
+						-<inp2:m_inc param="tab_index" by="1"/>
+						<input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
+					</td>
+				</inp2:m_RenderElement>
+
+				<inp2:m_if check="m_IsDebugMode" >
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="la_fld_Status"/>
+				<inp2:m_else/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
+				</inp2:m_if>
+
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="la_fld_Date"/>
+
+				<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
+
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
+					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
+					<inp2:m_else/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
+					</inp2:m_if>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
+
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<inp2:ord_Field field="OrderNumber"/>
+					</td>
+				</inp2:m_RenderElement>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="la_fld_Date"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
+
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
+					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
+					<inp2:m_else/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
+					</inp2:m_if>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
+
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.17.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit_billing.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit_billing.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit_billing.tpl	(revision 16630)
@@ -0,0 +1,216 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_billing" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ord','<inp2:ord_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_NextId/>');
+						}
+				 ) );
+
+				<inp2:m_if check="ord_OrderEditable">
+					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+					a_toolbar.AddButton( new ToolBarButton('reset_to_user', '<inp2:m_phrase label="la_ToolTip_ResetToUser" escape="1"/>', function() {
+								submit_event('ord','OnResetToUser');
+							}
+					 ) );
+
+					a_toolbar.AddButton( new ToolBarButton('in-commerce:reset_to_shipping', '<inp2:m_phrase label="la_ToolTip_ResetToShipping" escape="1"/>', function() {
+								submit_event('ord','OnResetToShipping');
+							}
+					 ) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ord_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ord_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ord_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<script type="text/javascript">
+	function OpenGWResults(field) {
+		openSelector('ord', '<inp2:m_Link template="in-commerce/orders/gw_results" pass="m,ord" no_amp="1" js_escape="1"/>&field=' + field, '', '500x400');
+	}
+</script>
+
+<inp2:m_DefineElement name="inp_gwresults" is_last="" as_label="" currency="" is_last="">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell">
+			<inp2:m_if check="m_Param" name="display_field"><inp2:m_Param name="display_field"/>: <inp2:Field name="$field" format="$display_field"/></inp2:m_if>
+			<a href="javascript:OpenGWResults('<inp2:m_param name="field"/>')"><inp2:m_Phrase label="la_Details"/></a>
+		</td>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>
+
+<inp2:ord_SaveWarning name="grid_save_warning"/>
+<inp2:ord_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_OrderBilling"/>
+			<inp2:m_if check="ord_OrderEditable">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="la_fld_BillingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="la_fld_BillingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="la_fld_BillingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingFax" title="la_fld_BillingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="la_fld_BillingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="la_fld_BillingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="la_fld_BillingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="la_fld_BillingCity" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="la_fld_BillingState" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="la_fld_BillingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="la_fld_BillingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentType" title="la_fld_PaymentType" onchange="submit_event('ord','OnPreSave');"/>
+
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="VATIncluded"/>
+
+				<inp2:m_if check="ord_UsingCreditCard">
+					<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="la_fld_CreditCardNumber" size="20"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="la_fld_PaymentNameOnCard" size="20"/>
+
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
+						<td class="control-cell">
+							<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
+							/
+							<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>">
+						</td>
+					</inp2:m_RenderElement>
+
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="la_fld_PaymentCVV2" size="5" maxlength="5"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="la_fld_PaymentExpires" size="16"/>
+					<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="ChargeOnNextApprove" title="la_fld_ChargeOnNextApprove"/>
+				<inp2:m_else/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="la_fld_PaymentAccount" size="20"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="la_fld_PaymentDate" size="16"/>
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_Field" name="GWResult1" db="db">
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="la_fld_AuthorizationResult" />
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_Field" name="GWResult2" db="db">
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="la_fld_CaptureResult" />
+				</inp2:m_if>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingTo" title="la_fld_BillingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCompany" title="la_fld_BillingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingPhone" title="la_fld_BillingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingFax" title="la_fld_BillingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingEmail" title="la_fld_BillingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress1" title="la_fld_BillingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress2" title="la_fld_BillingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCity" title="la_fld_BillingCity" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingState" title="la_fld_BillingState" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingZip" title="la_fld_BillingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCountry" title="la_fld_BillingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentType" title="la_fld_PaymentType"/>
+
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="la_fld_NextCharge"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="VATIncluded"/>
+
+				<inp2:m_if check="ord_UsingCreditCard">
+					<inp2:m_RenderElement name="subsection" title="la_section_CreditCard"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCardType" title="la_fld_PaymentCardType"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="la_fld_CreditCardNumber"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="la_fld_PaymentNameOnCard"/>
+
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
+						<td class="control-cell">
+							<inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
+						</td>
+					</inp2:m_RenderElement>
+
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="la_fld_PaymentCVV2"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="la_fld_PaymentExpires"/>
+				<inp2:m_else/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="la_fld_PaymentAccount"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="la_fld_PaymentDate"/>
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_Field" name="GWResult1" db="db">
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="la_fld_AuthorizationResult" />
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_Field" name="GWResult2" db="db">
+					<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="la_fld_CaptureResult" />
+				</inp2:m_if>
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="CouponId">
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="CouponCode" title="la_fld_CouponCode" />
+			</inp2:m_if>
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="DiscountTotal" title="la_fld_TotalSavings" />
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="ReturnTotal" title="la_fld_TotalReturns" />
+
+			<inp2:m_if check="ord_FieldEquals" name="VAT" value="0.00">
+			<inp2:m_else />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="AmountWithoutVAT" title="la_fld_SubTotal" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="VAT" title="la_fld_VAT" />
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="GiftCertificateId">
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="la_fld_GiftCertificateNumber" />
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="la_fld_GiftCertificateAmountApplied" />
+			</inp2:m_if>
+
+
+			<inp2:m_RenderElement name="inp_label" prefix="ord" field="TotalAmount" title="la_fld_TotalAmount" />
+			<inp2:m_if check="ord_HasOriginalAmount" >
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OriginalAmount" title="la_fld_OriginalAmount" />
+			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<input type="hidden" name="to_tab" value="Billing">
+<input type="hidden" name="check_billing_address" value="true" />
+<inp2:m_if check="ord_UsingCreditCard">
+	<input type="hidden" name="check_credit_card" value="true" />
+</inp2:m_if>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit_billing.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.18.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit_items.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit_items.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit_items.tpl	(revision 16630)
@@ -0,0 +1,251 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="ord_OrderEditable">
+	<inp2:m_SetParam grid="Default"/>
+<inp2:m_else/>
+	<inp2:m_SetParam grid="NotEditable"/>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_items" grid="$grid" pagination="1" pagination_prefix="orditems" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ord','<inp2:ord_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				function edit(){
+					std_edit_temp_item('orditems', 'in-commerce/orders/order_product_edit');
+				}
+
+				<inp2:m_if check="ord_OrderEditable">
+
+					//Order items related:
+					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add_Items" escape="1"/>',
+							function() {
+								openSelector('orditems', '<inp2:adm_SelectorLink prefix="ord" selection_mode="single" tab_prefixes="p" no_amp="1" js_escape="1"/>', '', null, 'OnSaveItems');
+							} ) );
+
+					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+							function() {
+								std_delete_items('orditems')
+							} ) );
+
+
+					a_toolbar.AddButton( new ToolBarButton('in-commerce:recalculate_order', '<inp2:m_phrase label="la_RecalculateOrder"/>',
+								function() {
+									submit_event('ord', 'OnRecalculateItems');
+								}	) );
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+				</inp2:m_if>
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ord_Status" is_not="incomplete">
+					a_toolbar.HideButton('arrange');
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ord_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ord_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				// stuff for updating extended price based on price & quantity entered
+				function CalculateSubtotal($prefix_special, $price_field, $result_id) {
+					if (typeof(Grids[$prefix_special]) != 'object') {
+						return false;
+					}
+
+					var $sub_total = 0;
+					var $grid_items = Grids[$prefix_special].Items;
+
+					for (var $i in $grid_items) {
+						$id = $grid_items[$i].ItemId;
+						var $price_control = document.getElementById($prefix_special + '['+$id+'][' + $price_field + ']');
+						$sub_total += NumberFormatter.Parse($price_field == 'ExtendedPrice' ? $price_control.innerHTML : $price_control.value);
+					}
+					document.getElementById($result_id).innerHTML = NumberFormatter.Format($sub_total.toFixed(2));
+				}
+
+				function UpdateExtendedPrice($prefix_special, $id)
+				{
+					<inp2:m_if check="ord_OrderEditable">
+						// 1. calculate current row extended price
+						var $qty = NumberFormatter.Parse(document.getElementById($prefix_special+'['+$id+'][Quantity]').value);
+						var $price = NumberFormatter.Parse(document.getElementById($prefix_special+'['+$id+'][Price]').value);
+
+						var $ext_price = Math.round($qty*$price*100)/100;
+						document.getElementById($prefix_special+'['+$id+'][ExtendedPrice]').innerHTML = NumberFormatter.Format($ext_price.toFixed(2));
+
+						// 2. recalculate subtotal
+						CalculateSubtotal($prefix_special, 'ExtendedPrice', 'order_subtotal');
+					</inp2:m_if>
+
+					// 3. recalculate return total
+					CalculateSubtotal('orditems', 'ReturnAmount', 'order_returntotal');
+				}
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="orditems" grid="$grid"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="option_value_element">
+	<inp2:m_param name="value"/> <inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_element">
+	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+		<strong><inp2:m_param name="option"/>:</strong>
+			<inp2:PrintOptionValues render_as="option_value_element"/>
+	<inp2:m_else/>
+			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+				<inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+	</inp2:m_if><br/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_value_element_no_price">
+	<inp2:m_param name="value"/>
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_element_no_price">
+	<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+		<strong><inp2:m_param name="option"/>:</strong>
+			<inp2:PrintOptionValues render_as="option_value_element_no_price"/>
+	<inp2:m_else/>
+			<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+	</inp2:m_if><br/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="product_image">
+	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_productname_td" format="" module="">
+	<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
+		<div style="width: 120px;">
+			<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="noimage.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
+		</div>
+	</inp2:m_if>
+
+	<inp2:Field field="$field" first_chars="50"/> (<inp2:Field field="ProductId"/>)
+	<inp2:m_if check="ord_BackOrderFlag"><span class="error"><inp2:m_Phrase label="la_ItemBackordered"/></span></inp2:m_if>
+	<inp2:m_if check="HasOptions">
+		<br/>
+		<small>
+			<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0">
+				<!-- selectable options -->
+				<inp2:PrintOptions render_as="option_element"/>
+			<inp2:m_else/>
+				<!-- listed combinations -->
+				<inp2:PrintOptions render_as="option_element_no_price"/>
+			</inp2:m_if>
+		</small>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_edit_td">
+	<input type="text" onkeyup="UpdateExtendedPrice('<inp2:m_param name="PrefixSpecial"/>', <inp2:{$PrefixSpecial}_Field field="OrderItemId"/>);" class="text" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/>" size="4">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_quantity_td">
+	<inp2:m_if check="FieldEquals" field="Type" value="1">
+		<input type="text" onkeyup="UpdateExtendedPrice('<inp2:m_param name="PrefixSpecial"/>', <inp2:{$PrefixSpecial}_Field field="OrderItemId"/>);" class="text" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/>" size="4">
+	<inp2:m_else />
+		<span class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/></span>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="$PrefixSpecial" field="$field"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_price_td">
+	<input type="text" onkeyup="UpdateExtendedPrice('<inp2:m_param name="PrefixSpecial"/>', <inp2:{$PrefixSpecial}_Field field="OrderItemId"/>);" class="text" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid"/>" size="5">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_extendedprice_td">
+	<span id="<inp2:InputName field="$field"/>"><inp2:Field field="$field" grid="$grid" format="%.2f"/></span>
+	<script type="text/javascript">UpdateExtendedPrice('<inp2:m_param name="PrefixSpecial"/>',<inp2:Field field="OrderItemId"/>);</script>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="orderitems_total_td">
+	<inp2:m_if check="FieldOption" field="$field" option="totals">
+		<inp2:FieldOption field="$field" option="totals" result_to_var="totals"/>
+		'<inp2:FieldTotal field="$field" function="$totals"/>'
+	<inp2:m_else/>
+		<inp2:m_if check="m_Param" name="field" equals_to="ReturnAmount">
+			'<span id="order_returntotal">0.00</span>'
+		</inp2:m_if>
+
+		<inp2:m_if check="m_Param" name="field" equals_to="ExtendedPrice">
+			<inp2:m_if check="ord_OrderEditable">
+				'<span id="order_subtotal">0.00</span>'
+			<inp2:m_else/>
+				'<span id="order_subtotal"><inp2:ord_Field name="SubTotal"/></span>'
+			</inp2:m_if>
+		</inp2:m_if>
+
+		<inp2:m_ifnot check="m_Param" name="field" equals_to="ReturnAmount|ExtendedPrice">
+		'&nbsp;'
+		</inp2:m_ifnot>
+	</inp2:m_if>
+	<inp2:m_ifnot check="m_Param" name="is_last">, </inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" grid="$grid" PrefixSpecial="orditems" IdField="OrderItemId" totals_block="orderitems_total_td" totals_render_as="grid_total_row"/>
+
+<script type="text/javascript">
+	Grids['orditems'].SetDependantToolbarButtons( new Array('delete') );
+
+	<inp2:m_if check="ord_OrderEditable">
+		CalculateSubtotal('orditems', 'ExtendedPrice', 'order_subtotal');
+	</inp2:m_if>
+
+	CalculateSubtotal('orditems', 'ReturnAmount', 'order_returntotal');
+</script>
+
+<input type="hidden" name="main_prefix" id="main_prefix" value="ord">
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit_items.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.18.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit_preview.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit_preview.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit_preview.tpl	(revision 16630)
@@ -0,0 +1,390 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_preview" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ord','<inp2:ord_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							openSelector('ord', '<inp2:m_Link template="in-commerce/orders/orders_edit_print" pass="all" no_amp="1" js_escape="1"/>', '', '750x700');
+						}
+				 ) );
+
+				<inp2:m_if check="ord_OrderEditable">
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_PlaceOrder" escape="1"/>', function() {
+								submit_event('ord','OnCompleteOrder');
+							}
+					 ) );
+				</inp2:m_if>
+
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ord_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="ord_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ord_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:ord_SaveWarning name="grid_save_warning"/>
+<inp2:ord_ErrorWarning name="form_error_warning"/>
+
+<table class="edit-form">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td class="text">
+			<inp2:m_phrase label="la_fld_OrderNumber"/>:
+		</td>
+		<td>
+			<inp2:ord_Field field="OrderNumber"/> (<inp2:ord_Field field="Status"/>)
+		</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td class="text">
+			<inp2:m_phrase label="la_fld_Date"/>:
+		</td>
+		<td>
+			<inp2:ord_Field field="OrderDate"/>
+		</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<td class="text">
+			<inp2:m_phrase label="la_fld_Username"/>:
+		</td>
+		<td>
+			<inp2:ord_Field field="PortalUserId"/> (<inp2:ord_Field field="CustomerName"/>)
+		</td>
+		<td>&nbsp;</td>
+	</tr>
+</table>
+
+<table cellspacing="0" cellpadding="0" width="100%" class="tableborder">
+<tr>
+	<td>
+	<table cellspacing="0" cellpadding="2" width="100%" border="0">
+		<tr class="subsectiontitle">
+			<td colspan="2">
+				<inp2:m_Phrase label="la_comm_ShippingBillingInfo"/>
+			</td>
+		</tr>
+		<tr>
+			<inp2:m_if check="ord_Field" name="ShippingTo">
+			<td width="50%" class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" style="vertical-align: top">
+				<!-- shipping -->
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="la_fld_ShippingTo"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="ShippingTo"/></td>
+					</tr>
+					<inp2:m_if check="ord_Field" name="ShippingEmail">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_field_email"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="ShippingEmail"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingPhone">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_comm_PhoneNumber"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="ShippingPhone"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingFax">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_comm_FaxNumber"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="ShippingFax"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="ShippingCompany">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_shipping_Company"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="ShippingCompany"/></td>
+					</tr>
+					</inp2:m_if>
+					<tr>
+						<td class="order_preview_field_name" style="vertical-align: top;">Address:</td>
+						<td class="order_preview_field_value">
+							<inp2:m_if check="ord_FieldEquals" field="ShippingAddress1" value="" inverse="inverse" >
+								<inp2:ord_Field field="ShippingAddress1"/><br>
+							</inp2:m_if>
+							<inp2:m_if check="ord_FieldEquals" field="ShippingAddress2" value="" inverse="inverse" >
+								<inp2:ord_Field field="ShippingAddress2"/><br>
+							</inp2:m_if>
+							<inp2:ord_PrintLocation type="Shipping"/>
+						</td>
+					</tr>
+				</table>
+			</td>
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="BillingTo">
+			<td width="50%" class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" style="vertical-align: top">
+				<!-- billing -->
+				<table width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="la_fld_BillingTo"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="BillingTo"/></td>
+					</tr>
+					<inp2:m_if check="ord_Field" name="BillingEmail">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_billing_Email"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="BillingEmail"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingPhone">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_comm_PhoneNumber"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="BillingPhone"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingFax">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_comm_FaxNumber"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="BillingFax"/></td>
+					</tr>
+					</inp2:m_if>
+					<inp2:m_if check="ord_Field" name="BillingCompany">
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="lu_billing_Company"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="BillingCompany"/></td>
+					</tr>
+					</inp2:m_if>
+					<tr>
+						<td class="order_preview_field_name" style="vertical-align: top;"><inp2:m_phrase label="lu_billing_Address"/>:</td>
+						<td class="order_preview_field_value">
+							<inp2:m_if check="ord_FieldEquals" field="BillingAddress1" value="" inverse="inverse" >
+								<inp2:ord_Field field="BillingAddress1"/><br>
+							</inp2:m_if>
+							<inp2:m_if check="ord_FieldEquals" field="BillingAddress2" value="" inverse="inverse" >
+								<inp2:ord_Field field="BillingAddress2"/><br>
+							</inp2:m_if>
+							<inp2:ord_PrintLocation type="Billing"/>
+						</td>
+					</tr>
+					<tr>
+						<td class="order_preview_field_name"><inp2:m_phrase label="la_fld_PaymentType"/>:</td>
+						<td class="order_preview_field_value"><inp2:ord_Field field="PaymentType"/></td>
+					</tr>
+				</table>
+			</td>
+			</inp2:m_if>
+
+			<inp2:m_if check="ord_Field" name="ShippingTo" inverse="inverse"><td width="50%" valign="top">&nbsp;</td></inp2:m_if>
+			<inp2:m_if check="ord_Field" name="BillingTo" inverse="inverse"><td width="50%" valign="top">&nbsp;</td></inp2:m_if>
+		</tr>
+
+		<tr class="subsectiontitle">
+			<td colspan="2">
+				<inp2:m_Phrase label="la_comm_OrderContents"/>
+			</td>
+		</tr>
+
+	</table>
+
+	<table cellspacing="0" cellpadding="0" width="100%" border="0" class="orders_flat_table">
+		<tr class="subsectiontitle">
+			<td width="70%"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if> nowrap><inp2:m_Phrase label="la_col_Product"/></td>
+			<td width="10%" nowrap style="text-align: center"><inp2:m_Phrase label="la_col_Quantity"/></td>
+			<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="column:la_fld_Price"/></td>
+			<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_ExtendedPrice"/></td>
+		</tr>
+
+		<inp2:m_DefineElement name="option_value_element">
+			<inp2:m_param name="value"/> <inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+			<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_element">
+			<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+				<strong><inp2:m_param name="option"/>:</strong>
+					<inp2:PrintOptionValues render_as="option_value_element"/>
+			<inp2:m_else/>
+					<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+						<inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/> (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>
+			</inp2:m_if><br/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_value_element_no_price">
+			<inp2:m_param name="value"/>
+			<inp2:m_if check="m_ParamEquals" name="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_element_no_price">
+			<inp2:m_if check="m_ParamEquals" param="type" value="6"> <!-- checkboxes - multiple -->
+				<strong><inp2:m_param name="option"/>:</strong>
+					<inp2:PrintOptionValues render_as="option_value_element_no_price"/>
+			<inp2:m_else/>
+					<strong><inp2:m_param name="option"/>:</strong> <inp2:m_param name="value"/>
+			</inp2:m_if><br/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="product_image">
+			<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" />
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="order_detail_row">
+			<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+				<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
+					<td valign="top" width="120">
+						<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="../../in-commerce/admin_templates/img/itemicons/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
+					</td>
+				</inp2:m_if>
+
+				<td align="left" valign="top" width="100%">
+					<strong><inp2:{$PrefixSpecial}_Field field="ProductName"/></strong><br/>
+					<small><strong>SKU: </strong><inp2:Field field="SKU"/></small>
+					<inp2:m_if check="HasOptions">
+						<br/>
+						<small>
+						<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+							<inp2:PrintOptions render_as="option_element"/>
+						<inp2:m_else/> <!-- listed combinations -->
+							<inp2:PrintOptions render_as="option_element_no_price"/>
+						</inp2:m_if>
+						</small>
+						<br/>
+					</inp2:m_if>
+					<inp2:m_if check="HasDiscount">
+						<br />
+						<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" /><br />
+						<inp2:m_Phrase label="lu_comm_Discount" />: - <inp2:Field name="ItemDiscount" />
+					</inp2:m_if>
+				</td>
+				<td align="right" nowrap style="text-align: center"><inp2:{$PrefixSpecial}_Field field="Quantity"/></td>
+				<td align="right" nowrap><inp2:{$PrefixSpecial}_Field field="Price"/></td>
+				<td align="right" nowrap><inp2:{$PrefixSpecial}_Field field="ExtendedPrice"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:orditems_PrintList block="order_detail_row" per_page="-1"/>
+
+		<tr style="border-top: 2px solid black">
+			<td align="left"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if>>
+				<inp2:m_if check="ord_Field" name="CouponId">
+					<span class="order_preview_field_name"><inp2:m_Phrase label="la_CouponCode"/>:</span> <inp2:ord_Field field="CouponCode"/><br />
+				</inp2:m_if>
+
+				<inp2:m_if check="ord_FieldEquals" field="DiscountTotal" value="0.00" inverse="inverse">
+					<span class="order_preview_field_name"><inp2:m_Phrase label="la_TotalSavings"/>:</span> <inp2:ord_Field field="DiscountTotal"/><br />
+				</inp2:m_if>
+			</td>
+			<td align="right" nowrap colspan="2" class="order-totals-name"><inp2:m_Phrase label="la_SubTotal"/>:</td>
+			<td align="right" nowrap class="arial2">
+				<inp2:m_if check="ord_FieldEquals" name="VAT" value="0.00">
+					<inp2:ord_Field field="AmountWithoutVAT"/>
+				<inp2:m_else />
+					<inp2:ord_Field field="SubTotal"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+
+		<inp2:m_DefineElement name="shipping_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_ShippingHandling"/><inp2:m_if check="ord_ShippingType"> (<inp2:ord_ShippingType />):</inp2:m_if></td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="ShippingCost"/></td>
+			</tr>
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_Insurance_Fee"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="InsuranceFee"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="vat_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_VAT"/> <inp2:ord_Field field="VATPercent"/>%:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="VAT"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="processing_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_ProcessingFee"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="ProcessingFee"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="return_total">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_TotalReturns"/>:</td>
+				<td align="right" nowrap class="arial2">-<inp2:ord_Field field="ReturnTotal"/></td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<inp2:ord_PrintTotals
+				shipping_render_as="shipping_total"
+				processing_render_as="processing_total"
+				vat_render_as="vat_total"
+				return_render_as="return_total"/>
+
+
+		<inp2:m_if check="ord_Field" field="GiftCertificateId">
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_GiftCertificateNumber"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateCode"/></td>
+			</tr>
+			<tr>
+				<td align="right" nowrap colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>" class="order-totals-name"><inp2:m_Phrase label="la_fld_Gift_CertificateAmountApplied"/>:</td>
+				<td align="right" nowrap class="arial2"><inp2:ord_Field field="GiftCertificateDiscount"/></td>
+			</tr>
+		</inp2:m_if>
+		<tr>
+			<td align="right" colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">3<inp2:m_else/>2</inp2:m_if>">&nbsp;</td>
+			<td align="right"><span class="order_preview_field_name">Total:</span></td>
+			<td align="right" nowrap><span class="order_preview_field_name"><inp2:ord_Field field="TotalAmount"/></span></td>
+		</tr>
+		<inp2:m_if check="ord_HasOriginalAmount" >
+		<tr>
+			<td align="right"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if>>&nbsp;</td>
+			<td align="right" colspan="2" nowrap><span class="order_preview_field_name"><inp2:m_Phrase label="la_fld_OriginalAmount"/>:</span></td>
+			<td align="right" nowrap <span class="order_preview_field_name"><inp2:ord_Field field="OriginalAmount"/></span></td>
+		</tr>
+		</inp2:m_if>
+	</table>
+	</td>
+</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit_preview.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.20.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit_shipping.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit_shipping.tpl	(revision 16630)
@@ -0,0 +1,246 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_shipping" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('ord','<inp2:ord_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('ord','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('ord', '<inp2:ord_NextId/>');
+						}
+				 ) );
+				<inp2:m_if check="ord_OrderEditable">
+					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+					a_toolbar.AddButton( new ToolBarButton('reset_to_user', '<inp2:m_phrase label="la_ToolTip_ResetToUser" escape="1"/>', function() {
+								submit_event('ord','OnResetToUser');
+							}
+					 ) );
+
+					a_toolbar.AddButton( new ToolBarButton('in-commerce:reset_to_billing', '<inp2:m_phrase label="la_ToolTip_ResetToBilling" escape="1"/>', function() {
+								submit_event('ord','OnResetToBilling');
+							}
+					 ) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="ord_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="ord_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="ord_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>
+
+<inp2:ord_SaveWarning name="grid_save_warning"/>
+
+<inp2:m_RenderElement design="form_message" id="sqe_error" style="display: none;" pass_params="1">
+	&nbsp;
+</inp2:m_RenderElement>
+
+<inp2:ord_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_OrderShipping"/>
+
+			<inp2:m_if check="ord_OrderEditable">
+
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
+
+				<script type="text/javascript">
+					function update_address()
+					{
+						submit_event('ord','OnQuietPreSave');
+					}
+				</script>
+
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20" />
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20" />
+
+				<inp2:m_DefineElement name="order_option">
+					<input onclick="submit_event('ord','OnQuietPreSave');"  class="simple" type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;<br>
+				</inp2:m_DefineElement>
+
+				<!--## TODO looks like this field is NOT used in Admin - check on implementation of this field here
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20" />
+				##-->
+
+				<inp2:m_DefineElement name="order_shipping_type">
+					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
+				</inp2:m_DefineElement>
+
+				<inp2:m_DefineElement name="order_shipment">
+					<tr class="<inp2:m_odd_even var="shipping_odd_even" odd="table-color1" even="table-color2"/>">
+						<td style="border-right: 1px solid black"><inp2:m_param name="shipment"/></td>
+						<td>
+							<select style="width:230px;" name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>">
+								<inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected"/>
+							</select>
+						</td>
+					</tr>
+				</inp2:m_DefineElement>
+
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+					<inp2:m_inc param="tab_index" by="1"/>
+					<td class="label-cell">
+						<inp2:m_Phrase label="la_fld_ShippingOptions"/>:
+					</td>
+					<td class="control-mid">&nbsp;</td>
+					<td class="control-cell">
+						<inp2:ord_PredefinedOptions field="ShippingOption" block="order_option" selected="checked" />
+					</td>
+				</tr>
+
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+					<inp2:m_inc param="tab_index" by="1"/>
+					<td class="label-cell">
+						<inp2:m_Phrase label="la_fld_ShippingType"/>:
+					</td>
+					<td class="control-mid">&nbsp;</td>
+					<td class="control-cell">
+						<table border="0" cellspacing="1" cellpadding="3" width="100%" style="border: 1px solid black; border-collapse: collapse">
+							<tr class="subsectiontitle" style="border-bottom: 1px solid black">
+								<td width="25%" style="border-right: 1px solid black"><b><inp2:m_Phrase label="lu_ship_Shipment" /></b></td>
+								<td width="45%" style="border-right: 1px solid black"><b><inp2:m_Phrase label="lu_ship_ShippingType" /></b></td>
+							</tr>
+
+							<inp2:ord_PrintShippings block="order_shipment" currency="selected"/>
+						</table>
+					</td>
+				</tr>
+
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" style="width: auto;" size="30"/>
+
+			<inp2:m_else/>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="la_fld_ShippingTo" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="la_fld_ShippingCompany" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="la_fld_ShippingPhone" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="la_fld_ShippingFax" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="la_fld_ShippingEmail" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="la_fld_ShippingAddress1" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="la_fld_ShippingAddress2" size="40"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="la_fld_ShippingCity" size="20"/>
+
+				<script type="text/javascript">
+					function update_address()
+					{
+						submit_event('ord','OnQuietPreSave');
+					}
+				</script>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="la_fld_ShippingCountry" size="20"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="la_fld_ShippingState" size="20"/>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="la_fld_ShippingZip" size="10"/>
+
+				<inp2:m_DefineElement name="order_option_label">
+					<inp2:m_param name="key"/> <inp2:m_phrase label="$option"/>
+				</inp2:m_DefineElement>
+
+				<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="la_fld_ShippingOption" size="20"/-->
+
+				<inp2:m_DefineElement name="order_shipping_type">
+					<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
+				</inp2:m_DefineElement>
+
+				<inp2:m_DefineElement name="order_shipment_label">
+					<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected" selected_only="1"/>
+				</inp2:m_DefineElement>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="la_fld_ShippingOptions" size="10"/>
+
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+					<inp2:m_inc param="tab_index" by="1"/>
+					<td class="label-cell">
+						<inp2:m_Phrase label="la_fld_ShippingType"/>:
+					</td>
+					<td class="control-mid">&nbsp;</td>
+					<td class="control-cell">
+						<inp2:ord_PrintShippings block="order_shipment_label" currency="selected"/>
+					</td>
+				</tr>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10" currency="selected"/>
+
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
+
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30">
+					<td valign="top" class="control-cell">
+						<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>"/>
+
+						<inp2:m_if check="{$prefix}_USPSLabelFound" field="$field">
+							&nbsp; &nbsp;<a href="#" onClick="javascript:submit_event('<inp2:m_Param name="prefix"/>', 'OnDownloadLabel'); return false;"><inp2:m_Phrase label="la_ViewLabel"/></a>
+						</inp2:m_if>
+					</td>
+				</inp2:m_RenderElement>
+
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<input type="hidden" name="to_tab" value="Shipping">
+<input type="hidden" name="check_shipping_address" value="true" />
+
+<inp2:m_if check="m_Recall" name="sqe_error">
+	<script type="text/javascript">
+		var $error_table = $('#sqe_error');
+		$('td:first', $error_table).html('<inp2:m_Recall name="sqe_error" js_escape="1"/>');
+		$error_table.show();
+		<inp2:m_RemoveVar name="sqe_error"/>
+	</script>
+</inp2:m_if>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit_shipping.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/order_blocks.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/order_blocks.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/order_blocks.tpl	(revision 16630)
@@ -0,0 +1,19 @@
+<inp2:m_DefineElement name="grid_ordernumber_td">
+	<a href="javascript:edit();"><inp2:Field field="$field" grid="$grid"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_userlink_td">
+	<inp2:m_if check="UserFound" user_field="$user_field">
+		<a href="<inp2:UserLink edit_template='users/users_edit' user_field="$user_field"/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" grid="$grid"/></a>
+	<inp2:m_else/>
+		<inp2:Field field="$field" grid="$grid"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_previewlink_td">
+	<a href="<inp2:OrderLink edit_template="in-commerce/orders/orders_edit_preview"/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Order_Preview"/>"><inp2:Field field="$field" grid="$grid"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_billinglink_td">
+	<a href="<inp2:OrderLink edit_template="in-commerce/orders/orders_edit_billing"/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Order_Billing_Information"/>"><inp2:Field field="$field" grid="$grid"/></a>
+</inp2:m_DefineElement>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/order_blocks.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_incomplete_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_incomplete_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_incomplete_list.tpl	(revision 16630)
@@ -0,0 +1,80 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.incomplete" section="in-commerce:orders" title_preset="orders_incomplete" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.incomplete]',1);
+  				std_edit_item('ord.incomplete', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Order" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							set_hidden_field('remove_specials[ord.incomplete]',1);
+							std_precreate_item('ord.incomplete', 'in-commerce/orders/orders_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+						set_hidden_field('remove_specials[ord.incomplete]',1);
+						submit_event('ord.incomplete','OnMassClone');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Deny" escape="1"/>', function() {
+							submit_event('ord.incomplete','OnMassOrderDeny');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('in-commerce:archive', '<inp2:m_phrase label="la_ToolTip_Archive" escape="1"/>', function() {
+							submit_event('ord.incomplete','OnMassOrderArchive');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('in-commerce:place_order', '<inp2:m_phrase label="la_ToolTip_PlaceOrder" escape="1"/>', function() {
+							submit_event('ord.incomplete','OnMassPlaceOrder');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+//				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+				 			print_orders('ord.incomplete', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.incomplete" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.incomplete" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.incomplete'].SetDependantToolbarButtons( new Array('edit','delete','clone','deny','archive','place_order','print') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','incomplete');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_incomplete_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_print.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_print.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_print.tpl	(revision 16630)
@@ -0,0 +1,19 @@
+<inp2:m_RequireLogin permissions="in-commerce:orders.view" system="1"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="window.print();">
+	<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress files='in-commerce/incs/order_print.css'/>" type="text/css" />
+
+	<script type="text/javascript">
+		$(document).ready(
+			function() {
+				set_window_title('Orders Print');
+			}
+		)
+	</script>
+
+	<inp2:m_include t="in-commerce/orders/orders_blocks"/>
+
+	<inp2:ord_PrintList block="order_print_element"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_print.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.2.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_returns_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_returns_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_returns_list.tpl	(revision 16630)
@@ -0,0 +1,56 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.returns" section="in-commerce:orders" title_preset="orders_returns" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.returns]',1);
+  				std_edit_item('ord.returns', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				 a_toolbar.AddButton( new ToolBarButton('archive', '<inp2:m_phrase label="la_ToolTip_Archive" escape="1"/>', function() {
+							submit_event('ord.returns','OnMassOrderArchive');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.returns', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.returns" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.returns" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.returns'].SetDependantToolbarButtons( new Array('edit','delete', 'deny', 'clone','archive','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','processed');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_returns_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_search_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_search_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_search_list.tpl	(revision 16630)
@@ -0,0 +1,72 @@
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_RenderElement name="combined_header" prefix="ord.search" section="in-commerce:orders" grid="Search" title_preset="orders_search" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  		<td>
+	  		<script type="text/javascript">
+	  			//do not rename - this function is used in default grid for double click!
+	  			function edit()
+	  			{
+	  				set_hidden_field('remove_specials[ord.search]',1);
+	  				std_edit_item('ord.search', 'in-commerce/orders/orders_edit');
+	  			}
+
+	  			var a_toolbar = new ToolBar();
+
+  				a_toolbar.AddButton( new ToolBarButton('in-commerce:goto_order', '<inp2:m_phrase label="la_ToolTip_GoToOrder" escape="1"/>',
+						function() {
+							submit_event('ord.search','OnGoToOrder');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+ 				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
+				 			set_hidden_field('export_finish_t', 'in-commerce/orders/export/export_finish');
+				 			set_hidden_field('export_progress_t', 'in-commerce/orders/export/export_progress');
+				 			set_hidden_field('grid', 'Search');
+							open_popup('ord.search', 'OnExport', 'in-commerce/orders/export/export');
+						}
+				 	) );
+
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.search', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.search" grid="Search"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.search" IdField="OrderId" grid="Search"/>
+
+<script type="text/javascript">
+	Grids['ord.search'].SetDependantToolbarButtons( new Array('edit','delete','print','goto_order','archive') );
+
+	function processUserSelector($field, $selector) {
+		var $user_id = parseInt( $selector.Grids['u'].GetSelected() );
+		var $field_mask = '<inp2:ord.search_SearchInputName field="#FIELD_NAME#" filter_type="like" grid="Search"/>';
+
+		document.getElementById( $field_mask.replace('#FIELD_NAME#', $field) ).value = $selector.$user_logins[ $user_id ];
+	}
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','search');
+</script>

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_search_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.18.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_edit_print.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_edit_print.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_edit_print.tpl	(revision 16630)
@@ -0,0 +1,9 @@
+<inp2:m_RequireLogin permissions="in-commerce:orders.view" system="1"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="window.print();">
+	<inp2:m_include t="in-commerce/orders/orders_blocks"/>
+	<inp2:m_RenderElement name="order_print_element"/>
+	
+<inp2:m_include t="incs/footer"/>
+		
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_edit_print.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/orders_toship_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/orders_toship_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/orders_toship_list.tpl	(revision 16630)
@@ -0,0 +1,82 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord.toship" section="in-commerce:orders" title_preset="orders_toship" pagination="1" tabs="in-commerce/orders/orders_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[ord.toship]',1);
+  				std_edit_item('ord.toship', 'in-commerce/orders/orders_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>', function() {
+							set_hidden_field('remove_specials[ord.toship]',1);
+							submit_event('ord.toship','OnMassClone');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:ship', '<inp2:m_phrase label="la_ToolTip_Ship" escape="1"/>', function() {
+							submit_event('ord.toship','OnMassOrderShip');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('deny', '<inp2:m_phrase label="la_ToolTip_Deny" escape="1"/>', function() {
+							submit_event('ord.toship','OnMassOrderDeny');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('archive', '<inp2:m_phrase label="la_ToolTip_Archive" escape="1"/>', function() {
+							submit_event('ord.toship','OnMassOrderArchive');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				 a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
+							print_orders('ord.toship', 'in-commerce/orders/orders_print');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="ord.toship" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="sqe_error_element">
+	Order: <inp2:m_Param name="order_number"/>. Error: <inp2:m_Param name="error_description"/><br/>
+</inp2:m_DefineElement>
+
+<inp2:m_if check="m_Recall" name="sqe_errors">
+	<inp2:m_RenderElement design="form_message" pass_params="1">
+		<inp2:ord_PrintSQEErrors render_as="sqe_error_element" />
+	</inp2:m_RenderElement>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.toship" IdField="OrderId" grid="Default"/>
+<script type="text/javascript">
+	Grids['ord.toship'].SetDependantToolbarButtons( new Array('edit','delete','clone','ship','deny','archive','print') );
+</script>
+<inp2:m_include t="incs/footer"/>
+<script type="text/javascript">
+	set_hidden_field('order_type','toship');
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/orders_toship_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/orders/order_product_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/orders/order_product_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/orders/order_product_edit.tpl	(revision 16630)
@@ -0,0 +1,155 @@
+<inp2:adm_SetPopupSize width="820" height="570"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_product_edit"/>
+
+<inp2:m_SetParam use_grid="0"/>
+<inp2:m_if check="p_ShouldListOptions">
+	<inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
+		<inp2:m_SetParam use_grid="1"/>
+	</inp2:m_if>
+</inp2:m_if>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							if (Grids['poc']) {
+								if (Grids['poc'].SelectedCount == 0)  {
+									return;
+								}
+								set_hidden_field('qty[<inp2:p_Field name="ProductId"/>]['+Grids['poc'].GetSelected()[0]+']',1)
+							}
+							submit_event('ord','<inp2:m_if check="orditems_IsNewItem">OnAddToCart<inp2:m_else/>OnUpdateItemOptions</inp2:m_if>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('orditems','OnCancel');
+						}
+				 ) );
+
+				<inp2:m_if check="m_Param" name="use_grid">
+					a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_if check="m_Param" name="use_grid">
+			<inp2:m_RenderElement name="search_main_toolbar" prefix="poc" grid="Radio"/>
+		</inp2:m_if>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_if check="p_ShouldListOptions">
+	<input type="hidden" name="p_id" value="<inp2:p_Field name='ProductId'/>">
+
+	<inp2:m_if check="p_OptionsHaveError">
+		<inp2:m_RenderElement design="form_message" pass_params="1">
+			<inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
+		</inp2:m_RenderElement>
+	</inp2:m_if>
+
+	<inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
+		<script type="text/javascript">
+			function edit() {
+				set_hidden_field('qty[<inp2:p_Field name="ProductId"/>]['+Grids['poc'].GetSelected()[0]+']',1)
+				submit_event('ord','<inp2:m_if check="orditems_IsNewItem">OnAddToCart<inp2:m_else/>OnUpdateItemOptions</inp2:m_if>');
+			}
+		</script>
+
+		<inp2:m_DefineElement name="combination_option_element">
+			<strong><inp2:m_Param name="option_name" />: </strong>
+			<inp2:m_Param name="option_value" /><inp2:m_if check="m_ParamEquals" param="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="grid_combination_td">
+			<inp2:ShowCombination render_as="combination_option_element"/>
+		</inp2:m_DefineElement>
+
+		<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc" IdField="CombinationId" grid="Radio"/>
+	<inp2:m_else/> <!-- Selectable options -->
+		<inp2:m_DefineElement name="option_select_element">
+				<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if></option>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_cb_element">
+				<input type="checkbox" <inp2:m_param name="selected"/>
+							name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>][]"
+							id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
+							value="<inp2:m_param name="id"/>" />
+					<label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
+						<inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
+					</label>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_radio_element">
+				<input type="radio" <inp2:m_param name="selected"/>
+							name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"
+							id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
+							value="<inp2:m_param name="id"/>" />
+					<label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
+						<inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
+					</label>
+		</inp2:m_DefineElement>
+
+		<inp2:m_DefineElement name="option_element">
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="label-cell">
+					<inp2:Field name="Name"/><inp2:m_if check="FieldEquals" field="Required" value="1"><span class="error">*</span></inp2:m_if>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<inp2:m_if check="FieldEquals" field="OptionType" value="1"> <!-- drop-down -->
+						<select name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]">
+							<option value=""></option>
+							<inp2:ShowOptions render_as="option_select_element" currency="selected" preselect_first="1"/>
+						</select>
+					</inp2:m_if>
+
+					<inp2:m_if check="FieldEquals" field="OptionType" value="5"> <!-- editbox -->
+						<input type="text" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]" value="<inp2:OptionData/>"/>
+					</inp2:m_if>
+
+					<inp2:m_if check="FieldEquals" field="OptionType" value="4"> <!-- textarea -->
+						<textarea cols="50" rows="5" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"><inp2:OptionData/></textarea>
+					</inp2:m_if>
+
+					<inp2:m_if check="FieldEquals" field="OptionType" value="6"> <!-- checkboxeS -->
+						<inp2:ShowOptions render_as="option_cb_element" currency="selected"/>
+					</inp2:m_if>
+
+					<inp2:m_if check="FieldEquals" field="OptionType" value="3"> <!-- radio buttons -->
+						<inp2:ShowOptions render_as="option_radio_element" currency="selected" preselect_first="1"/>
+					</inp2:m_if>
+				</td>
+			</tr>
+		</inp2:m_DefineElement>
+
+		<div id="scroll_container">
+			<table class="edit-form">
+				<inp2:m_RenderElement name="subsection" title="lu_comm_SelectOptions"/>
+
+				<inp2:p_ListOptions no_table="1" per_page="-1" render_as="option_element" row_start_render_as="html:" row_end_render_as="html:"/>
+				<inp2:m_RenderElement name="inp_edit_filler"/>
+			</table>
+		</div>
+	</inp2:m_if>
+<inp2:m_else/>
+		Product Doesn't Use Options.
+</inp2:m_if>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/orders/order_product_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.5.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/payments/payments_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payments/payments_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payments/payments_list.tpl	(revision 16630)
@@ -0,0 +1,48 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="apayments.log" section="in-commerce:paymentlog" title_preset="payments_log"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  		<td>
+	  		<script type="text/javascript">
+					a_toolbar = new ToolBar();
+
+					a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh" escape="1"/>', function() {
+								window.location.href = window.location.href;
+							}
+					) );
+
+					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+					a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+								show_viewmenu(a_toolbar,'view');
+							}
+					) );
+
+					a_toolbar.Render();
+
+					function edit()
+					{
+						// required for correct row selection
+					}
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="apayments.log" grid="Log"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_userlink_td" format="">
+	<a href="<inp2:UserLink edit_template='users/users_edit'/>" onclick="return direct_edit('<inp2:m_Param name="PrefixSpecial"/>', this.href);" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:Field field="$field" no_special="no_special" grid="$grid" format="$format"/></a>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_currency_td" format="" no_special="">
+	<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format" currency="selected" />
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="apayments.log" IdField="AffiliatePaymentId" grid="Log" main_special=""/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/payments/payments_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/users/user_address_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/users/user_address_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/users/user_address_edit.tpl	(revision 16630)
@@ -0,0 +1,74 @@
+<inp2:adm_SetPopupSize width="750" height="570"/>
+<inp2:m_include t="incs/header" body_properties="" />
+<inp2:m_RenderElement name="combined_header" prefix="u" section="in-portal:user_list" title_preset="user_address_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+	<tr>
+		<td>
+			<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select',
+						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+						function() {
+							submit_event('addr', '<inp2:addr_SaveEvent/>');
+						}
+					)
+				);
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							cancel_edit('addr','OnCancel','<inp2:addr_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+					)
+				);
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'reset_edit',
+						'<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>',
+						function() {
+							reset_form('addr', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						}
+					)
+				);
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</table>
+
+<inp2:addr_SaveWarning name="grid_save_warning"/>
+<inp2:addr_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="addr" field="PortalUserId"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="addr" field="AddressId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="la_fld_FullName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="la_fld_AddressLine1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="la_fld_AddressLine2"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling"/>
+		<inp2:m_RenderElement name="inp_label" prefix="addr" field="IsProfileAddress"/>
+		<inp2:m_RenderElement name="inp_edit_filler" />
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/users/user_address_edit.tpl
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/users/user_edit_addresses.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/users/user_edit_addresses.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/users/user_edit_addresses.tpl	(revision 16630)
@@ -0,0 +1,132 @@
+<inp2:adm_SetPopupSize width="570" height="540"/>
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" prefix="u" title_preset="user_edit_addresses" tab_preset="Default" pagination_prefix="addr" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+	<tr>
+		<td>
+			<table width="100%" cellpadding="0" cellspacing="0">
+				<tr>
+					<td>
+						<script type="text/javascript">
+							a_toolbar = new ToolBar();
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'select',
+									'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+									function() {
+										submit_event('u', '<inp2:u_SaveEvent/>');
+									}
+								)
+							);
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'cancel',
+									'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+									function() {
+										cancel_edit('u','OnCancelEdit','<inp2:u_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+									}
+								)
+							);
+
+							a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'prev',
+									'<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>',
+									function() {
+										go_to_id('u', '<inp2:u_PrevId/>');
+									}
+								)
+							);
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'next',
+									'<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>',
+									function() {
+										go_to_id('u', '<inp2:u_NextId/>');
+									}
+								)
+							);
+
+							a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+							<!-- Start Address Buttons -->
+
+							function edit()
+							{
+								std_edit_temp_item('addr', 'in-commerce/users/user_address_edit');
+							}
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'new_item',
+									'<inp2:m_phrase label="la_ToolTip_NewAddress" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+									function() {
+										std_new_item('addr', 'in-commerce/users/user_address_edit')
+									}
+								)
+							);
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'edit',
+									'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>',
+									edit
+								)
+							);
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'delete',
+									'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+									function() {
+										std_delete_items('addr')
+									}
+								)
+							);
+
+							a_toolbar.AddButton(
+								new ToolBarButton(
+									'view',
+									'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
+									function(id) {
+										show_viewmenu(a_toolbar, 'view');
+									}
+								)
+							);
+
+							<!-- End Address Buttons -->
+
+							a_toolbar.Render();
+
+							<inp2:m_if check="u_IsSingle">
+								a_toolbar.HideButton('prev');
+								a_toolbar.HideButton('next');
+								a_toolbar.HideButton('sep1');
+							<inp2:m_else/>
+								<inp2:m_if check="u_IsLast">
+									a_toolbar.DisableButton('next');
+								</inp2:m_if>
+								<inp2:m_if check="u_IsFirst">
+									a_toolbar.DisableButton('prev');
+								</inp2:m_if>
+							</inp2:m_if>
+						</script>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<inp2:m_RenderElement name="grid" PrefixSpecial="addr" IdField="AddressId" grid="Default"/>
+<script type="text/javascript">
+Grids['addr'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/users/user_edit_addresses.tpl
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/currencies/currencies_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/currencies/currencies_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/currencies/currencies_edit.tpl	(revision 16630)
@@ -0,0 +1,116 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="curr" section="in-commerce:currencies" title_preset="currencies_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('curr','<inp2:curr_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('curr','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('curr', '<inp2:curr_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('curr', '<inp2:curr_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="curr_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="curr_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="curr_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:curr_SaveWarning name="grid_save_warning"/>
+<inp2:curr_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_Currency"/>
+			<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="la_fld_ISOCode"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
+					<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
+					<span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
+					<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
+					<inp2:curr_Error field="Symbol"/>
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="la_fld_CurrencySymbolPosition"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Name" title="la_fld_CurrencyName" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="IsPrimary" title="la_fld_Primary" onchange="check_status()"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="Status" title="la_fld_Enabled" onchange="check_primary()"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Priority" title="la_fld_Priority" size="5"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	if(document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked)
+	{
+		document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').disabled = true;
+		document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').disabled = true;
+	}
+
+	function check_status()
+	{
+		if(document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked)
+		{
+			document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').checked = true;
+			document.getElementById('<inp2:curr_InputName field="Status"/>').value = 1;
+		}
+	}
+
+	function check_primary()
+	{
+		if(!document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').checked)
+		{
+			document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked = false;
+			document.getElementById('<inp2:curr_InputName field="IsPrimary"/>').value = 0;
+		}
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/currencies/currencies_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/currencies/currencies_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/currencies/currencies_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/currencies/currencies_list.tpl	(revision 16630)
@@ -0,0 +1,118 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="curr" section="in-commerce:currencies" title_preset="currencies_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit()
+	  			{
+					std_edit_item('curr', 'in-commerce/currencies/currencies_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep6') );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_setPrimary" escape="1"/>', function() {
+							submit_event('curr','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('curr','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('curr','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('curr','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('curr','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:update_rates', '<inp2:m_phrase label="la_ToolTip_UpdateRates" escape="1"/>', function() {
+							if(Grids['curr'].CountSelected() > 0)
+							{
+								message = '<inp2:m_phrase label="la_warning_UpdateSelectedCurrencyRates" />?';
+							}
+							else
+							{
+								message = '<inp2:m_phrase label="la_warning_UpdateAllCurrencyRates" />?';
+							}
+							if(confirm(message))
+							{
+								submit_event('curr','OnUpdateRates');
+							}
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="curr_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="curr_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="curr_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="curr" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="currency_caption_td" >
+	<inp2:Field field="$field" grid="$grid"/>
+	<inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="curr" IdField="CurrencyId" grid="Default"/>
+
+<script type="text/javascript">
+	Grids['curr'].SetDependantToolbarButtons( new Array('edit','setprimary','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_DefineElement name="remove_unused_warning" >
+	<input type="hidden" name="unused_ids" id="unused_ids" value="<inp2:m_param name="unused_ids" />">
+	<script type="text/javascript">
+		if(inpConfirm('<inp2:m_phrase label="la_WarningCurrenciesNotUsed" />: <inp2:m_param name="unused_iso" />. <inp2:m_phrase label="la_WarningRemoveUnusedCurrencies" />?'))
+		{
+			submit_event('curr', 'OnDisableUnused');
+		}
+	</script>
+</inp2:m_DefineElement>
+<inp2:curr_DisableUnusedWarning block="remove_unused_warning" />
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/currencies/currencies_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/export_progress.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/export_progress.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/export_progress.tpl	(revision 16630)
@@ -0,0 +1,16 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p.export" section="in-portal:browse" perm_section="PRODUCT" permission_type="VIEW" system_permission="0" title_preset="products_export"/>
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('p.export', 'OnExportCancel');
+	}
+
+	$ProductExport = new AjaxProgressBar('<inp2:m_t t="dummy" p.export_event="OnExportProgress" pass="m,p.export" no_amp="1" js_escape="1"/>');
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/export_progress.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/access_pricing_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/access_pricing_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/access_pricing_edit.tpl	(revision 16630)
@@ -0,0 +1,84 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="pricing_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('pr','<inp2:pr_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pr','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('pr', '<inp2:pr_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('pr', '<inp2:pr_NextId/>');
+					}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="pr_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="pr_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pr_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:pr_SaveWarning name="grid_save_warning"/>
+<inp2:pr_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_PriceBracket"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="pr" field="ProductId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessDuration" title="la_fld_AccessDuration" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="pr" field="AccessUnit" title="la_fld_AccessDurationUnit" size="20"/>
+
+			<!--## TODO check on implementation (came from customization healtheconomics.org)
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="AccessRebillDate" title="la_fld_AccessRebillDate" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="pr" field="DurationType" title="la_fld_DurationType"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="pr" field="AccessExpiration" title="la_fld_AccessExpiration"/>
+			## -->
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Description" title="la_fld_Description" size="30"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="IsPrimary" title="la_fld_Primary"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_if check="pr_Field" name="IsPrimary">
+	<script type="text/javascript">
+		document.getElementById('_cb_<inp2:pr_InputName field="IsPrimary"/>').disabled = true;
+	</script>
+</inp2:m_if>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/access_pricing_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_relations.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_relations.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_relations.tpl	(revision 16630)
@@ -0,0 +1,105 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="rel" title_preset="relations" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Relations related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('rel', '<inp2:adm_SelectorLink prefix="rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
+						} ) );
+
+				function edit()
+	  			{
+	  				std_edit_temp_item('rel', 'in-commerce/products/relations_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('rel')
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('rel','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('rel','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="rel" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default"/>
+<script type="text/javascript">
+	Grids['rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
+</script>
+<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
+<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>

Property changes on: releases/5.2.2-B2/admin_templates/products/products_relations.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_pricing_grid.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_pricing_grid.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_pricing_grid.tpl	(revision 16630)
@@ -0,0 +1,110 @@
+<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
+<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+	<div id="<inp2:m_param name="item_prefix"/>_div" prefix="<inp2:m_param name="item_prefix"/>" group_id="-1"></div>
+	<script type="text/javascript">$BracketManager.registerTab('<inp2:m_param name="item_prefix"/>');</script>
+<inp2:m_else/>
+	<inp2:lang.current_SetContentType content_type="text/plain"/>
+	if ($request_visible) {
+		document.getElementById('<inp2:m_get name="item_prefix" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" js_escape="1"/>);
+		maximizeElement( jq('#<inp2:m_get name="item_prefix" js_escape="1"/>_div') );
+	}
+	<inp2:m_if check="c_SaveWarning">
+		document.getElementById('save_warning').style.display = 'block';
+		$edit_mode = true;
+	</inp2:m_if>
+	#separator#
+	<inp2:m_DefineElement name="pr_edit_box" >
+	<td>
+		<input type="text" size="<inp2:m_param name="size"/>" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					tabindex="<inp2:m_get param="tab_index"/>"
+					value="<inp2:m_param name="$field"/>"
+				>
+	</inp2:m_DefineElement>
+
+	<inp2:m_DefineElement name="pr_edit_checkbox" >
+	<td>
+		<input type="hidden" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]" id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]" tabindex="<inp2:m_get param="tab_index"/>" value="<inp2:m_param name="$field"/>">
+				<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>"
+					<inp2:m_if check="m_paramequals" param="$field" value="1" >
+						checked
+					</inp2:m_if> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]'))">
+	</td>
+	</inp2:m_DefineElement>
+
+	<inp2:m_DefineElement name="pr_edit_max" >
+	<td>
+				<input type="text" size="10" name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					tabindex="<inp2:m_get param="tab_index"/>"
+					value="<inp2:m_param name="max"/>"
+					<inp2:m_if check="m_paramequals" param="next_min_id" value=""  >
+					<inp2:m_else />
+					onchange="set_start(<inp2:m_param name="id"/>, <inp2:m_param name="next_min_id"/>)"
+					</inp2:m_if>
+
+				>
+	</td>
+	</inp2:m_DefineElement>
+
+	<inp2:m_DefineElement name="pr_edit_min" >
+	<td>
+				<input type="hidden" name="pr.tang[<inp2:m_param name="id"/>][PriceId]" id="pr.tang[<inp2:m_param name="id"/>][PriceId]" value="<inp2:m_param name="id"/>">
+				<input type="text" size="10"
+					<inp2:m_if check="m_paramequals" param="first" value="1" >
+						<inp2:m_inc param="tab_index" by="1"/>
+						tabindex="<inp2:m_get param="tab_index"/>"
+					<inp2:m_else/>
+						readonly
+					</inp2:m_if>
+					name="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					id="pr.tang[<inp2:m_param name="id"/>][<inp2:m_param name="field"/>]"
+					value="<inp2:m_param name="min"/>"
+					<inp2:m_if check="m_paramequals" param="first" value="1" ><inp2:m_else/>disabled</inp2:m_if>
+				>
+	</td>
+	</inp2:m_DefineElement>
+
+	<inp2:m_DefineElement name="prbracket">
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+
+			<inp2:m_RenderElement name="pr_edit_min" IdField="$IdField" PrefixSpecial="pr.tang" field="MinQty" title="la_fld_Title" size="40" pass_params="true"/>
+
+			<inp2:m_RenderElement name="pr_edit_max" IdField="$IdField" PrefixSpecial="pr.tang" field="MaxQty" title="la_fld_Title" size="40" pass_params="true"/>
+
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Cost" title="la_fld_Title" size="4" pass_params="true"/>
+
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Price" title="la_fld_Title" size="4" pass_params="true"/>
+		<!--##
+			<inp2:m_RenderElement name="pr_edit_box" IdField="$IdField" PrefixSpecial="pr.tang" field="Points" title="la_fld_Title" size="4" pass_params="true"/>
+		##-->
+			<inp2:m_RenderElement name="pr_edit_checkbox" IdField="$IdField" PrefixSpecial="pr.tang" field="Negotiated" title="la_fld_Title" pass_params="true"/>
+
+		</tr>
+	</inp2:m_DefineElement>
+	<inp2:m_DefineElement name="pr_grid_th" width="">
+		<td class="columntitle_small"<inp2:m_if check="m_Param" name="width"> style="width: <inp2:m_Param name='width'/>"</inp2:m_if>><inp2:m_phrase label="$phrase" /></td>
+	</inp2:m_DefineElement>
+
+	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
+		<tr nowrap="nowrap" class="grid-header-row-0">
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MinQty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MaxQty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Cost" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Price" width="10%"/>
+		<!--##
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Points" width="10%"/>
+		##-->
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Negotiated"/>
+		</tr>
+		<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
+
+		<script type="text/javascript">
+			<inp2:m_if check="m_Get" name="pr_tang">
+				a_toolbar.EnableButton('delete');
+			<inp2:m_else/>
+				a_toolbar.DisableButton('delete');
+			</inp2:m_if>
+		</script>
+	</table>
+</inp2:m_if>

Property changes on: releases/5.2.2-B2/admin_templates/products/products_pricing_grid.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.6.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/file_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/file_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/file_edit.tpl	(revision 16630)
@@ -0,0 +1,97 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="file_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('file','<inp2:file_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('file','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('file', '<inp2:file_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('file', '<inp2:file_NextId/>');
+					}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="file_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="file_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="file_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:file_SaveWarning name="grid_save_warning"/>
+<inp2:file_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_File"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="file" field="ProductId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Name" title="la_fld_Name" size="50" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Version" title="la_fld_Version" size="10" />
+			<inp2:m_RenderElement name="inp_edit_upload" prefix="file" field="RealPath" title="la_fld_FilePath" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="Status" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="file" field="IsPrimary" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="file" field="Priority" title="la_fld_Priority" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_date" prefix="file" field="AddedOn" title="la_fld_AddedOn" />
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	<inp2:m_if check="file_Field" name="IsPrimary">
+		document.getElementById('_cb_<inp2:file_InputName field="IsPrimary" />').disabled = true;
+		document.getElementById('_cb_<inp2:file_InputName field="Status" />').disabled = true;
+	</inp2:m_if>
+
+	function check_status()
+	{
+		if(document.getElementById('_cb_<inp2:file_InputName field="IsPrimary" />').checked)
+		{
+			document.getElementById('_cb_<inp2:file_InputName field="Status" />').checked = true;
+			document.getElementById('<inp2:file_InputName field="Status"/>').value = 1;
+		}
+	}
+
+	function check_primary()
+	{
+		if(!document.getElementById('_cb_<inp2:file_InputName field="Status" />').checked)
+		{
+			document.getElementById('_cb_<inp2:file_InputName field="IsPrimary" />').checked = false;
+			document.getElementById('<inp2:file_InputName field="IsPrimary"/>').value = 0;
+		}
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/file_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_access.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_access.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_access.tpl	(revision 16630)
@@ -0,0 +1,130 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="pr" grid="Access" title_preset="access" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+//				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+				//Pricing related:
+				a_toolbar.AddButton(
+					new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewPricing" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+					function() {
+						save_product_ajax(function () {
+							std_new_item('pr', 'in-commerce/products/access_pricing_edit')
+						});
+					})
+				);
+
+				function edit()
+  				{
+					save_product_ajax(function () {
+						std_edit_temp_item('pr', 'in-commerce/products/access_pricing_edit');
+					});
+  				}
+
+				function save_product_ajax($callback) {
+					$.post(
+						'<inp2:m_Link p_event="OnPreSaveAjax" pass="m,p" no_amp="1" js_escape="1"/>',
+						$('#' + $form_name).serialize(),
+						function ($data) {
+							$data = eval('(' + $data + ')');
+
+							if ($data.status == 'OK') {
+								$callback();
+							}
+						}
+					);
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('pr')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('pr','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+//					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="pr" grid="Access"/>
+	</tr>
+</tbody>
+</table>
+
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessGroupId" title="la_fld_AccessGroup" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="IsRecurringBilling" title="la_fld_IsRecurringBilling"/>
+
+			<!--## TODO check on implementation of this field
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="PayPalRecurring" title="la_fld_IsPayPalRecurring"/>
+			##-->
+
+			<!--## TODO check on implementation of these fields
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="AccessDuration" title="la_fld_AccessDuration" size="4" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="AccessDurationType" title="la_fld_AccessDurationType" size="20"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessStart" title="la_fld_AccessStart" size="10" />
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="AccessEnd" title="la_fld_AccessEnd" size="10" />
+			##-->
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="pr" IdField="PriceId" grid="Access" />
+
+<script type="text/javascript">
+	Grids['pr'].SetDependantToolbarButtons( new Array('edit','delete', 'setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_access.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.16.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_files.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_files.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_files.tpl	(revision 16630)
@@ -0,0 +1,129 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="file" title_preset="files" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewFile" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('file', 'in-commerce/products/file_edit')
+						} ) );
+
+				function edit()
+  				{
+  					std_edit_temp_item('file', 'in-commerce/products/file_edit');
+  				}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('file')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('file','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('file','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('file','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('file','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep5') );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('file','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep6') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="file" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" style="width: 100px;"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_Files"/>
+	</table>
+</div>
+
+<inp2:m_DefineElement name="file_caption_td" module="">
+	<inp2:Field field="$field" grid="$grid"/><inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="file" IdField="FileId" grid="Default"/>
+<script type="text/javascript">
+	Grids['file'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','move_up','move_down','approve','decline') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_files.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.14.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_images.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_images.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_images.tpl	(revision 16630)
@@ -0,0 +1,107 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="img" title_preset="images" tab_preset="Default"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  				function edit()
+	  			{
+	  				std_edit_temp_item('img', 'in-commerce/products/images_edit');
+	  			}
+
+  				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Images" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('img', 'in-commerce/products/images_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('img')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('img','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('img','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('img','OnSetPrimary');
+						}
+				 ) );
+
+				  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="img" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="img" IdField="ImageId" grid="Default"/>
+<script type="text/javascript">
+	Grids['img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_images.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/shipping_options.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/shipping_options.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/shipping_options.tpl	(revision 16630)
@@ -0,0 +1,78 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="shipping_options"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  			a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						document.getElementById('<inp2:p_InputName field="ShippingLimitation"/>').value = select_to_string('selected_types');
+						submit_event('p','OnPreSavePopup');
+					}
+				) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							window_close();
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:p_SaveWarning name="grid_save_warning"/>
+<inp2:p_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="p" field="ShippingLimitation"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="ShippingMode" title="la_fld_ShippingMode"/>
+
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<inp2:m_inc param="tab_index" by="1"/>
+				<td class="label-cell">
+					<inp2:m_phrase label="la_fld_ShippingTypes"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<table>
+						<tr>
+							<td>
+								<inp2:m_DefineElement name="shipping_type">
+									<option value="<inp2:m_param name="_Id"/>"><inp2:m_param name="_Name"/></option>
+								</inp2:m_DefineElement>
+
+								<inp2:m_phrase label="la_fld_AllowedShippingTypes"/><br />
+								<select id="selected_types" multiple="multiple" size="20" style="width: 200px">
+									<inp2:p_ListShippingTypes mode="selected" render_as="shipping_type"/>
+								</select>
+							</td>
+							<td align="center">
+								<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('available_types', 'selected_types'); select_sort('selected_types')" class="button"><br>
+								<img src="img/s.gif" width="1" height="4" alt=""><br>
+								<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('selected_types', 'available_types'); select_sort('available_types');" class="button">
+							</td>
+							<td>
+								<inp2:m_phrase label="la_fld_AvailableShippingTypes"/><br />
+								<select id="available_types" multiple="multiple" size="20" style="width: 200px">
+									<inp2:p_ListShippingTypes mode="available" render_as="shipping_type"/>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/shipping_options.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_custom.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_custom.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_custom.tpl	(revision 16630)
@@ -0,0 +1,75 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="products_custom" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				function edit(){ }
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="ml_selector" prefix="p"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:p_SaveWarning name="grid_save_warning"/>
+<inp2:p_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_include t="incs/custom_blocks"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:cf.all_PrintList render_as="cv_row_block" SourcePrefix="p" value_field="Value" per_page="-1" grid="Default" original_title="la_section_OriginalValues" display_original="1"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<input type="hidden" name="cf_type" value="<inp2:p_UnitOption name='ItemType'/>"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_custom.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.13.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_list.tpl	(revision 16630)
@@ -0,0 +1,70 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" title_preset="product_list" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('p', 'in-commerce/products/products_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('p', 'in-commerce/products/products_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('p')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('p','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('p','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('p','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('p','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="p" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="preview">
+	<inp2:m_RenderElement name="preview_td" PrefixSpecial="$PrefixSpecial" field="$field" type="auto" max_width="100" max_height="100"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="p" IdField="ProductId" grid="Default"/>
+<script type="text/javascript">
+	Grids['p'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.7.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_access_pricing.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_access_pricing.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_access_pricing.tpl	(revision 16630)
@@ -0,0 +1,85 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="pr" grid="Access" title_preset="access_pricing" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Pricing related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_PricingLimit" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('pr', 'in-commerce/products/access_pricing_edit')
+						} ) );
+
+				function edit()
+  				{
+  					std_edit_temp_item('pr', 'in-commerce/products/access_pricing_edit');
+  				}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('pr')
+						} ) );
+
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="pr" grid="Access"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="negotiated_td">
+	<input disabled type="checkbox" <inp2:Field field="$field" checked="checked"/> >
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="pr" IdField="PriceId" grid="Access"/>
+<script type="text/javascript">
+	Grids['pr'].SetDependantToolbarButtons( new Array('edit','delete') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_access_pricing.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/pricing_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/pricing_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/pricing_edit.tpl	(revision 16630)
@@ -0,0 +1,48 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="pricing_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('pr','<inp2:pr_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pr','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:pr_SaveWarning name="grid_save_warning"/>
+<inp2:pr_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_PriceBracket"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="pr" field="ProductId"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MinQty" title="la_fld_MinQty" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="MaxQty" title="la_fld_MaxQty" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Price" title="la_fld_Price" size="4"/>
+		<!--## temporarily commented out
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Points" title="la_fld_Points" size="4"/>
+		##-->
+			<inp2:m_RenderElement name="inp_edit_box" prefix="pr" field="Cost" title="la_fld_Cost" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pr" field="Negotiated" title="la_fld_Negotiated" size="4"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/pricing_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/relations_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/relations_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/relations_edit.tpl	(revision 16630)
@@ -0,0 +1,76 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="relations_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('rel','<inp2:rel_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('rel','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+					go_to_id('rel', '<inp2:rel_PrevId/>');
+				}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('rel', '<inp2:rel_NextId/>');
+					}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="rel_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="rel_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="rel_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="categories/ci_blocks"/>
+
+<inp2:rel_SaveWarning name="grid_save_warning"/>
+<inp2:rel_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_Relation"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="SourceId"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="SourceType"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="rel" field="TargetType"/>
+
+			<inp2:m_RenderElement name="inp_id_label" prefix="rel" field="RelationshipId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_relation" prefix="rel" field="TargetId" title="la_fld_TargetId"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="rel" field="Type" title="la_fld_RelationshipType"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="rel" field="Enabled" title="la_fld_Enabled"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rel" field="Priority" title="la_fld_Priority" size="4"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/relations_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/review_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/review_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/review_edit.tpl	(revision 16630)
@@ -0,0 +1,77 @@
+<inp2:adm_SetPopupSize width="750" height="400"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="reviews_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('rev','<inp2:rev_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('rev','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('rev', '<inp2:rev_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('rev', '<inp2:rev_NextId/>');
+					}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="rev_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="rev_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="rev_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:rev_SaveWarning name="grid_save_warning"/>
+<inp2:rev_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="rev" field="ItemId"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Review"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox_allow_html" prefix="rev" field="TextFormat"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="rev" field="ReviewId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="rev" field="CreatedById" title="la_fld_CreatedById" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="rev" field="ReviewText" title="la_fld_ReviewText" cols="70" rows="8"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rev" field="HelpfulCount" title="la_fld_HelpfulCount" style="width: 50px;"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rev" field="NotHelpfulCount" title="la_fld_NotHelpfulCount" style="width: 50px;"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_Text_General"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="rev" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="rev" field="Priority" title="la_fld_Priority" size="3" class="text"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="rev" field="CreatedOn" title="la_fld_CreatedOn" size="20" class="text"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/review_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_reviews.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_reviews.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_reviews.tpl	(revision 16630)
@@ -0,0 +1,115 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="rev" title_preset="reviews" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Pricing related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewReview" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('rev', 'in-commerce/products/review_edit')
+						} ) );
+
+				function edit()
+	  			{
+	  				std_edit_temp_item('rev', 'in-commerce/products/review_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('rev')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('rev','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('rev','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('rev','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('rev','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="rev" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="reviewtext_checkbox_td">
+	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="rev" IdField="ReviewId" grid="Default"/>
+<script type="text/javascript">
+	Grids['rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_reviews.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_edit.tpl	(revision 16630)
@@ -0,0 +1,181 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="products_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="ml_selector" prefix="p"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="p" field="Type" db="db"/>
+
+<inp2:p_SaveWarning name="grid_save_warning"/>
+<inp2:p_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+			<inp2:m_RenderElement name="inp_label" prefix="p" field="ProductId" title="la_fld_Id"/>
+
+			<inp2:m_if check="m_IsDebugMode" >
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="Type" title="la_fld_ProductType"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="p" field="Name" title="la_fld_Title" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="SKU" title="la_fld_SKU" size="70"/>
+
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="la_fld_Description" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="DescriptionExcerpt" title="la_fld_DescriptionExcerpt" cols="70" rows="3"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Filename" title="la_fld_Filename" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MinQtyFreePromoShipping" title="la_fld_ProductFreeShipping" size="5"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="1">
+				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+					<td class="label-cell">
+						<inp2:m_phrase label="la_fld_ManageShipping"/>:
+					</td>
+					<td class="control-mid">&nbsp;</td>
+					<td class="control-cell">
+						<a href="javascript:openShipping()">Open</a>
+					</td>
+				</tr>
+			</inp2:m_if>
+
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<td class="label-cell">
+					<inp2:m_phrase label="la_fld_AssignedCoupon"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<inp2:p_Field name="AssignedCoupon" />&nbsp;<a href="javascript:openCouponSelector()">Open</a>
+				</td>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="ManufacturerId" title="la_fld_Manufacturer" size="4" has_empty="1"/>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="3">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" size="5"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="6">
+				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" size="5"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
+				<inp2:m_RenderElement name="inp_edit_weight" prefix="p" field="Weight" title="la_fld_Weight" size="5"/>
+			</inp2:m_if>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MSRP" title="la_fld_MSRP" size="5"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="Status" title="la_fld_Status"/>
+
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="NewItem" title="la_fld_New"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="HotItem" title="la_fld_TopSeller"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="PopItem" title="la_fld_Pop"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="EditorsPick" title="la_fld_EditorsPick"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="Featured" title="la_fld_Featured"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="OnSale" title="la_fld_OnSale"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Priority" title="la_fld_Priority" size="4"/>
+
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="CreatedOn" title="la_fld_CreatedOn" size="12"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="p" field="Expire" title="la_fld_Expire" size="12"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="MetaKeywords" title="la_fld_MetaKeywords" size="70"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="MetaDescription" title="la_fld_MetaDescription" cols="70" rows="5"/>
+
+			<inp2:m_if check="p_FieldEquals" field="Type" value="1" >
+				<inp2:m_RenderElement name="subsection" title="la_section_Backordering"/>
+					<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="BackOrder" title="la_fld_BackOrder"/>
+					<inp2:m_RenderElement name="inp_edit_date_time" format="mm/dd/y" prefix="p" field="BackOrderDate" title="la_fld_BackOrderDate" size="12"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="QtyInStockMin" title="la_fld_QtyInStockMin" size="4"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_Counters"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedRating" title="la_fld_Rating" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="CachedVotesQty" title="la_fld_Votes" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Hits" title="la_fld_QtySold" size="4"/>
+			<input type="hidden" name="Hits_original" id="Hits_original" value="<inp2:p_Field name="Hits" db="db" />" />
+
+	<!-- custom fields: begin -->
+		<inp2:m_include t="incs/custom_blocks"/>
+		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="p" value_field="Value" per_page="-1" grid="Default" />
+	<!-- custom fields: end -->
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script language="javascript" type="text/javascript">
+	$(document).ready(reflect_filename);
+	disable_categories('<inp2:p_InputName name="CategoryId"/>', <inp2:p_AllowedCategoriesJSON/>);
+
+	function reflect_filename() {
+    	var $checked = document.getElementById('_cb_<inp2:p_InputName field="AutomaticFilename"/>').checked;
+    	document.getElementById('<inp2:p_InputName field="Filename"/>').readOnly = $checked;
+    }
+
+	function openShipping() {
+		openSelector('p','<inp2:m_link t="in-commerce/products/shipping_options" pass="all" no_amp="1" js_escape="1"/>', 'ShippingOption', '800x600', 'OnPreSaveAndOpenPopup');
+	}
+
+	function openCouponSelector() {
+		openSelector('p','<inp2:m_link t="in-commerce/discounts/coupon_selector" pass="all" no_amp="1" js_escape="1"/>', 'AssignedCoupon', '800x400', 'OnPreSaveAndOpenPopup');
+	}
+</script>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/products/products_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.28.2.11
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_categories.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_categories.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_categories.tpl	(revision 16630)
@@ -0,0 +1,84 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="p-ci" title_preset="categories" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  				function edit(){ }
+
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Category related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="none" no_amp="1" js_escape="1"/>', 'ItemCategory');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('p-ci')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+							submit_event('p-ci','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="p-ci" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_checkbox_category_td">
+	<inp2:CategoryName field="$field" primary_title="la_PrimaryCategory" no_special="1"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="p-ci" IdField="CategoryId" grid="Default"/>
+<script type="text/javascript">
+	Grids['p-ci'].SetDependantToolbarButtons( new Array('delete','setprimary') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_categories.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_packagecontent.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_packagecontent.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_packagecontent.tpl	(revision 16630)
@@ -0,0 +1,95 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="p.content" title_preset="content" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add_Items" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="p" no_amp="1" js_escape="1"/>', 'PackageContent', null, 'OnSaveItems');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							submit_event('p.content','OnRemovePackageItem');
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				function edit()
+	  			{
+	  				alert();
+	  			}
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="p.content" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_include t="categories/ci_blocks"/>
+
+<inp2:m_DefineElement name="qty_td" >
+	<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="p.content" IdField="ProductId" grid="Default" types="content"/>
+<input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
+<input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
+<input type="hidden" name="main_prefix" id="main_prefix" value="p">
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>

Property changes on: releases/5.2.2-B2/admin_templates/products/products_packagecontent.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.12.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/images_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/images_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/images_edit.tpl	(revision 16630)
@@ -0,0 +1,88 @@
+<inp2:adm_SetPopupSize width="750" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="images_edit"/>
+
+<inp2:m_include t="incs/image_blocks"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('img','<inp2:img_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('img','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						go_to_id('img', '<inp2:img_PrevId/>');
+					}
+				));
+
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						go_to_id('img', '<inp2:img_NextId/>');
+					}
+				));
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="img_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="img_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="img_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:img_SaveWarning name="grid_save_warning"/>
+<inp2:img_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_Image"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="img" field="ResourceId"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="img" field="ImageId" title="la_fld_Id"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="AltName" title="la_fld_AltValue" size="40"/>
+
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="Enabled" title="la_fld_Enabled" onchange="check_primary()" />
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="DefaultImg" title="la_fld_Primary" onchange="check_status()" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="img" field="Priority" title="la_fld_Priority" size="5"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_ThumbnailImage"/>
+			<inp2:m_RenderElement name="thumbnail_section" prefix="img"/>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_FullSizeImage"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="img" field="SameImages" title="la_fld_SameAsThumb" onchange="toggle_fullsize()"/>
+			<inp2:m_RenderElement name="fullsize_section" prefix="img"/>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	<inp2:m_RenderElement name="images_edit_js" prefix="img"/>
+	toggle_fullsize();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/images_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/option_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/option_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/option_edit.tpl	(revision 16630)
@@ -0,0 +1,352 @@
+<inp2:adm_SetPopupSize width="780" height="590"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="options_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							PrepareData();
+							submit_event('po','<inp2:po_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('po','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_PrevId/>');
+					}
+				));
+	
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						PrepareData();
+						go_to_id('po', '<inp2:po_NextId/>');
+					}
+				));
+	
+				a_toolbar.Render();
+
+				<inp2:m_if check="po_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');					
+				<inp2:m_else/>
+					<inp2:m_if check="po_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="po_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+				
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<script type="text/javascript">
+	var edit_id = null;
+	var prices = {};
+	var price_types = {};
+
+	NumberFormatter.ThousandsSep = '<inp2:lang.current_Field name="ThousandSep" js_escape="1"/>';
+	NumberFormatter.DecimalSep = '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>';
+
+	// var formatter = new NumberFormat();
+	// formatter.setInputDecimal('<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>');
+	// formatter.setSeparators(true, '<inp2:lang.current_Field name="ThousandSep" js_escape="1"/>', '<inp2:lang.current_Field name="DecimalPoint" js_escape="1"/>');
+
+	function PrepareData() {
+		SelectToString('options_list[]', '<inp2:po_InputName field="Values"/>');
+		prices_str = '';
+
+		for (var i in prices) {
+			if (prices[i] == null) continue;
+//			formatter.setNumber(prices[i]);
+//			prices[i] = formatter.pars
+			prices_str += i.replace(/\|/g, '\\|').replace(/\=/g, '\\=') + '=' + prices[i]  + '|'; // .replace(/\|/g, '\\|').replace(/\=/g, '\\=') + '|'
+		}
+		if(prices_str.length > 0) prices_str = prices_str.substring(0,prices_str.length-1);
+//		alert('prices str: '+prices_str)
+		document.getElementById('<inp2:po_InputName field="Prices"/>').value = prices_str;
+
+		price_types_str = '';
+		for (var i in price_types) {
+			if (price_types[i] == null) continue;
+			price_types_str += i.replace(/\|/g, '\\|').replace(/\=/g, '\\=') + '=' + price_types[i].replace(/\|/g, '\\|').replace(/\=/g, '\\=') + '|'
+		}
+		if(price_types_str.length > 0) price_types_str = price_types_str.substring(0,price_types_str.length-1);
+		document.getElementById('<inp2:po_InputName field="PriceTypes"/>').value = price_types_str;
+	}
+
+	function SelectToString(aSelectId, aStringId) {
+		aSelect = document.getElementById(aSelectId);
+		// written by Slava, patched by Alex, modified by SergeyG
+		var result = '';
+		for (var i=0; i < aSelect.length; i++)
+		{
+			cur = aSelect.options[i];
+			result += cur.value+',';
+		}
+		if(result.length > 0) result = result.substring(0,result.length-1);
+		document.getElementById(aStringId).value = result;
+		return result;
+	}
+
+	function add_option(aSelectId) {
+		aSelect = document.getElementById(aSelectId);
+		var el = document.getElementById('option_value');
+		price = document.getElementById('option_price');
+		price_val = NumberFormatter.Parse(price.value);
+		price_type = document.getElementById('kernel_form').elements['option_price_type'];
+		price_mod = '';
+		if (price_type[0].checked) {
+			price_mod = '$'
+		}
+		if (price_type[1].checked) {
+			price_mod = '%'
+		}
+
+		if (price_val < 0) {
+			sign = '-';
+		}
+		else {
+			sign = '+';
+		}
+
+		if (price.value != '') {
+			option_text = el.value + ': ' + sign + price_val + ' ' + price_mod;
+		}
+		else {
+			option_text = el.value;
+		}
+
+		if (el)
+		{
+			if (el.value=='') return;
+			var found = false;
+			var valueArray;
+
+			for (i = 0; i < aSelect.options.length; i++){
+				if (aSelect.options[i].value == edit_id){
+					found = true;
+					break;
+				}
+			}
+			if (!found){
+				aSelect.options[aSelect.length] = new Option(option_text, el.value);
+			}
+			else {
+				aSelect.options[i].text = option_text;
+				aSelect.options[i].value = el.value;
+			}
+			//alert('set '+price.value+' unformatted is '+price_val)
+			prices[el.value] = price_val
+			price_types[el.value] = price_mod;
+			el.value='';
+			price.value = '';
+			price_type[0].checked = false;
+			price_type[1].checked = false;
+			edit_id = null;
+			document.getElementById('option_save').value = '<inp2:m_phrase label="la_button_add"/>';
+		}
+	}
+
+	function cancel_edit() {
+		var el = document.getElementById('option_value');
+		document.getElementById('option_save').value = '<inp2:m_phrase label="la_button_add"/>';
+		el.value = '';
+		document.getElementById('option_price').value = '';
+		document.getElementById('kernel_form').elements['option_price_type'][0].checked = false;
+		document.getElementById('kernel_form').elements['option_price_type'][1].checked = false;
+		edit_id = null;
+	}
+
+	function htmlspecialchars(str) {
+		return str.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\"/g,"&quot;");
+	}
+
+	function edit_option(aSelectId) {
+		aSelect = document.getElementById(aSelectId);
+		for (var i=0; i < aSelect.length; i++)
+		{
+			cur = aSelect.options[i];
+			if(aSelect.options[i].selected == true) {
+				edit_id = aSelect.options[i].value;
+				document.getElementById('option_value').value = aSelect.options[i].value;
+
+//				alert('setting: '+prices[edit_id]+' formatted is '+NumberFormatter.Format(prices[edit_id]))
+				var formatted = NumberFormatter.Format(prices[edit_id]) ;
+				document.getElementById('option_price').value = formatted == 0 ? '' : formatted;
+
+				if (price_types[edit_id] == '$') {
+					document.getElementById('kernel_form').elements['option_price_type'][0].checked = true;
+				}
+				if (price_types[edit_id] == '%') {
+					document.getElementById('kernel_form').elements['option_price_type'][1].checked = true;
+				}
+
+			}
+		}
+		document.getElementById('option_save').value = '<inp2:m_phrase label="la_Text_Save"/>';
+	}
+
+	function delete_option(aSelectId) {
+		aSelect = document.getElementById(aSelectId);
+		if (!confirm('<inp2:m_phrase label="la_Delete_Confirm"/>')) return;
+		for (var i=aSelect.length-1; i >= 0; i--)
+		{
+			cur = aSelect.options[i];
+			if(aSelect.options[i].selected == true) {
+				prices[aSelect.options[i].value] = null;
+				price_types[aSelect.options[i].value] = null;
+				aSelect.remove(i);
+			}
+		}
+	}
+
+	function catchEnter(e) {
+		if (!e) return;
+		//enter
+	 	if (e.keyCode == 13) {
+	 		add_option('options_list[]')
+	 	}
+	}
+
+	function update_type(type) {
+		switch (type) {
+			case '1': //drop-down
+				switch_option_values(1);
+				break;
+			case '5': //edit-box
+				switch_option_values(0);
+				break;
+			case '4': //text-area
+				switch_option_values(0);
+				break;
+			case '6': //checkboxes
+				switch_option_values(1);
+				break;
+			case '3': //radio-buttons
+				switch_option_values(1);
+				break;
+			default:
+				switch_option_values(0);
+		}
+	}
+
+	function switch_option_values(mode) {
+		var elems = new Array('option_value', 'option_price', 'option_price_type_$','option_price_type_%','options_list[]',	'option_save', 'option_cancel', 'opt_edit_but', 'opt_del_but', 'opt_moveup_but', 'opt_movedown_but');
+		for (var i = 0; i < elems.length; i++) {
+			the_elem = document.getElementById(elems[i]);
+			the_elem.disabled = !mode;
+
+			if (the_elem.tagName == 'INPUT' && the_elem.getAttribute('type') == 'button') {
+				the_elem.className = mode ? 'button':'button-disabled';
+			}
+		}
+	}
+
+</script>
+<inp2:m_DefineElement name="option_block">
+	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="value"/>: <inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_block_js">
+	prices['<inp2:m_param name="id"/>'] = '<inp2:m_param name="price"/>';
+	price_types['<inp2:m_param name="id"/>'] = '<inp2:m_param name="price_type"/>';
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="options_list">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<inp2:m_phrase label="la_fld_OptionValue"/>:
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<input type="text" name="option_value" id="option_value" value="" style="width: 300px" onkeydown="catchEnter(event)">&nbsp;<br/>
+		</td>
+	</tr>
+
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<inp2:m_phrase label="la_fld_OptionPrice"/>:
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<input type="text" name="option_price" id="option_price" value="" style="width: 40px">&nbsp;
+			<input type="radio" name="option_price_type" value="$" id="option_price_type_$">&nbsp;<label for="option_price_type_$">$</label>&nbsp;&nbsp;
+			<input type="radio" name="option_price_type" value="%" id="option_price_type_%">&nbsp;<label for="option_price_type_%">%</label>&nbsp;&nbsp;
+			<br/>
+			<input type="button" id="option_save" class="button" style="width: 80px" value="<inp2:m_phrase label="la_button_add"/>" onclick="add_option('options_list[]')">&nbsp;
+			<input type="button" id="option_cancel" class="button" value="<inp2:m_phrase label="la_Cancel"/>" onclick="cancel_edit()">&nbsp;
+		</td>
+	</tr>
+
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell"><inp2:m_phrase label="$title"/>:</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<input type="hidden" value="" name="<inp2:po_InputName field="Values"/>" id="<inp2:po_InputName field="Values"/>">
+			<input type="hidden" value="" name="<inp2:po_InputName field="Prices"/>" id="<inp2:po_InputName field="Prices"/>">
+			<input type="hidden" value="" name="<inp2:po_InputName field="PriceTypes"/>" id="<inp2:po_InputName field="PriceTypes"/>">
+			<table style="padding: 0px; margin: 0px">
+				<tr>
+					<td style="padding: 0px; margin: 0px">
+						<select style="padding-left: 0px; width: 300px" name="options_list[]" id="options_list[]" multiple onchange="PrepareData()" ondblclick="edit_option('options_list[]')" size="10" style="width: 200px">
+							<inp2:po_ShowOptions render_as="option_block" show="current" no_currency="1"/>
+						</select>
+						<script type="text/javascript">
+							<inp2:po_ShowOptions render_as="option_block_js" show="current" js="1"/>
+						</script>
+					</td>
+					<td style="padding-left: 5px; vertical-align: top">
+						<input type="button" id="opt_edit_but" class="button" style="width: 90px" onclick="edit_option('options_list[]')" value="<inp2:m_phrase label="la_Text_Edit"/>"><br/>
+						<input type="button" id="opt_del_but" class="button" style="width: 90px" onclick="delete_option('options_list[]')" value="<inp2:m_phrase label="la_Text_Delete"/>"><br/>
+						<br/><br/><br/>
+						<input type="button" id="opt_moveup_but" class="button" style="width: 90px" onclick="move_options_up('options_list[]', 1)" value="<inp2:m_phrase label="la_prompt_moveup"/>"><br/>
+						<input type="button" id="opt_movedown_but" class="button" style="width: 90px" onclick="move_options_down('options_list[]', 1)" value="<inp2:m_phrase label="la_prompt_movedown"/>"><br/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:po_SaveWarning name="grid_save_warning"/>
+<inp2:po_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Option"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="po" field="ProductId"/>
+			<inp2:m_RenderElement name="inp_label" prefix="po" field="ProductOptionId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Name" title="la_fld_Name" size="40"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Required" title="la_fld_Required"/>
+			<!--<inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Listable" title="la_fld_Listable"/>-->
+			<inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="la_fld_OptionType" onchange="update_type(this.value)"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="la_fld_Priority" size="2"/>
+			<inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="la_fld_OptionValues" size="2"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<script type="text/javascript">
+	update_type(document.getElementById('<inp2:po_InputName field="OptionType"/>').value);
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/option_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/option_combinations.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/option_combinations.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/option_combinations.tpl	(revision 16630)
@@ -0,0 +1,161 @@
+<inp2:adm_SetPopupSize width="830" height="720"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="poc.grid" title_preset="options_combinations"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  			function edit()
+  			{
+  				set_hidden_field('remove_specials[poc.grid]', 1);
+  				set_hidden_field('poc_id', '');
+  				submit_event('poc','')
+  			}
+
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							window_close();
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('poc.grid')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('poc.grid','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('poc.grid','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="poc.grid" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="option_value_block">
+	<option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_value_cb_block">
+	<input type="checkbox"
+				name="poc[<inp2:poc_Field name="CombinationId"/>][Combination][<inp2:Field name="ProductOptionId"/>][]"
+				id="poc[<inp2:poc_Field name="CombinationId"/>][Combination][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
+				value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>>
+				<label for="poc[<inp2:poc_Field name="CombinationId"/>][Combination][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"><inp2:m_param name="value"/></label>&nbsp;
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="option_block">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<inp2:Field name="Name"/>:
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<script type="text/javascript">
+			if (typeof(fields['poc']) == 'undefined') {
+				fields['poc'] = new Object();
+			}
+			fields['poc']['Combination[<inp2:Field name="ProductOptionId"/>]'] = '<inp2:Field name="Name" js_escape="1"/>';
+		</script>
+		<td class="control-cell">
+			<inp2:m_if check="FieldEquals" field="OptionType" value="6">
+				<inp2:ShowOptions render_as="option_value_cb_block" mode="selected" combination_prefix="poc" combination_field="Combination"/>
+				<span class="error"><inp2:poc_Error field="Combination"/></span>
+			<inp2:m_else/>
+				<select style="padding-left: 0px; width: 300px" name="poc[<inp2:poc_Field name="CombinationId"/>][Combination][<inp2:Field name="ProductOptionId"/>]" id="poc[<inp2:poc_Field name="CombinationId"/>][Combination][<inp2:Field name="ProductOptionId"/>]" style="width: 200px">
+					<option value=""></option>
+					<option value="_ANY_"><inp2:m_phrase label="la_comm_Any"/></option>
+					<inp2:ShowOptions render_as="option_value_block" mode="selected" combination_prefix="poc" combination_field="Combination"/>
+				</select>
+			</inp2:m_if>
+		</td>
+		<script type="text/javascript">
+			add_form_error('poc', 'Combination[<inp2:Field name="ProductOptionId"/>]', '<inp2:poc_InputName field="Combination"/>[<inp2:Field name="ProductOptionId"/>]', '<inp2:poc_Error field="Combination" js_escape="1"/>');
+		</script>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="combination_buttons">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">&nbsp;</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<input class="button" style="width: 80px" type="button" onclick="submit_event('poc', '<inp2:poc_SaveEvent/>')" value="<inp2:m_if check="m_GetEquals" var="poc_SaveEvent" value="OnCreate"><inp2:m_Phrase label="la_Button_Add"/><inp2:m_else/><inp2:m_Phrase label="la_Button_Save"/></inp2:m_if>">&nbsp
+			<input class="button" style="width: 80px" type="button" onclick="submit_event('poc', 'OnNew')" value="<inp2:m_Phrase label="la_Cancel"/>">&nbsp;&nbsp;
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_combination_td">
+	<inp2:Field field="$field" grid="$grid" no_special="1"/>
+	<inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="price_td" >
+	<inp2:m_if check="FieldEquals" field="PriceType" value="1">
+		=
+		<inp2:Field field="$field" grid="$grid" format="%.2f"/>&nbsp;
+		$
+	</inp2:m_if>
+	<inp2:m_if check="FieldEquals" field="PriceType" value="2">
+		<inp2:Field field="$field" grid="$grid" format="%+.2f"/>&nbsp;
+		$
+	</inp2:m_if>
+	<inp2:m_if check="FieldEquals" field="PriceType" value="3">
+		<inp2:Field field="$field" grid="$grid" format="%+ 6.2f"/>&nbsp;
+		%
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="weight_td" >
+	<inp2:Field field="$field" grid="$grid"/>
+</inp2:m_DefineElement>
+
+<!--<inp2:poc_SaveWarning name="grid_save_warning"/>-->
+<inp2:poc_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container" style="height: 250px;">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_Text_Combination"/>
+			<inp2:po.edit_PrintList2 per_page="-1" selectable_only="1" render_as="option_block" main_special=""/>
+		<inp2:m_RenderElement name="subsection" title="la_Text_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_hidden" prefix="poc" field="ProductId"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="poc" field="Availability" title="la_fld_Availability"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="PriceType" title="la_fld_PriceType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Price" title="la_fld_Price" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="SKU" title="la_fld_SKU" size="40"/>
+			<!--<inp2:m_RenderElement name="inp_edit_radio" prefix="poc" field="WeightType" title="la_fld_WeightType"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poc" field="Weight" title="la_fld_Weight" size="4"/>-->
+			<inp2:m_RenderElement name="combination_buttons"/>
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Default"/>
+<script type="text/javascript">
+	Grids['poc.grid'].SetDependantToolbarButtons( new Array('delete', 'move_up', 'move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/option_combinations.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.16.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_options.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_options.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_options.tpl	(revision 16630)
@@ -0,0 +1,128 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="po" title_preset="options" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				//Pricing related:
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewOption" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_new_item('po', 'in-commerce/products/option_edit')
+						} ) );
+
+				function edit()
+	  			{
+	  				std_edit_temp_item('po', 'in-commerce/products/option_edit');
+	  			}
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('po')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('po','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('po','OnMassMoveDown');
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep5') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="po" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="option_name_td">
+	<inp2:Field field="$field" grid="$grid"/><inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
+</inp2:m_DefineElement>
+
+<script type="text/javascript">
+	function openCombinations() {
+		set_hidden_field('events[poc.edit]', 'OnNew');
+		openSelector('p', '<inp2:m_Link t="in-commerce/products/option_combinations" pass="all,poc" poc_id="" no_amp="1" js_escape="1"/>', '', '800x600');
+	}
+</script>
+
+
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_fld_ManageCombinations"/>:
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<a href="javascript:openCombinations();">Open</a>
+			</td>
+		</tr>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="OptionsSelectionMode" title="la_fld_OptionsSelectionMode"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="po" IdField="ProductOptionId" grid="Default"/>
+<script type="text/javascript">
+	Grids['po'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_options.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_pricing.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_pricing.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_pricing.tpl	(revision 16630)
@@ -0,0 +1,250 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="pricing" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+	  	<script type="text/javascript" src='js/catalog.js'></script>
+
+  		<script type="text/javascript">
+  				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
+
+				Catalog.prototype.AfterInit = function () {
+					var $default_group = <inp2:conf_ConfigValue name="User_LoggedInGroup"/>;
+
+					set_hidden_field('group_id', $default_group);
+					$('#current_group_id').val($default_group).change();
+				}
+
+				Catalog.prototype.go_to_group = function($group_id) {
+					this.refreshTab('pr.tang', 'pr.tang_div');
+				}
+
+  				Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
+					var $group_id = $('#current_group_id').val();
+					var $tab_group_id = document.getElementById($div_id).getAttribute('group_id');
+					if ($group_id != $tab_group_id || $force) {
+						// query tab content only in case if not queried or category don't match
+						var $url = this.URLMask.replace('#ITEM_PREFIX#', $prefix).replace('#GROUP_ID#', $group_id);
+						this.BusyRequest[$prefix] = false;
+						Request.makeRequest($url, this.BusyRequest[$prefix], $div_id, this.successCallback, this.errorCallback, $div_id, this);
+					}
+				}
+
+				// adds information about tab to tab_registry
+				Catalog.prototype.registerTab = function($tab_id) {
+					var $tab = document.getElementById($tab_id + '_div');
+					var $index = this.TabRegistry.length;
+					this.TabRegistry[$index] = new Array();
+					this.TabRegistry[$index]['tab_id'] = $tab_id;
+					this.TabRegistry[$index]['prefix'] = $tab.getAttribute('prefix');
+					this.TabRegistry[$index]['dep_buttons'] = new Array();
+					this.TabRegistry[$index]['index'] = $index;
+				}
+
+				Catalog.prototype.displaySearch = function ($prefix) {
+
+				}
+
+				Catalog.prototype.submit_event = function($prefix_special, $event, $t, $return_result) {
+					var $prev_template = get_hidden_field('t');
+					if (isset($event)) set_hidden_field('events[' + $prefix_special + ']', $event);
+					if (isset($t)) set_hidden_field('t', $t);
+
+					var $tab_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id');
+					if ($return_result)
+						this.submit_kernel_form($tab_id);
+					else
+						this.submit_kernel_form();
+
+					set_hidden_field('t', $prev_template);
+				}
+
+	  			var $BracketManager = new Catalog('<inp2:m_Link template="in-commerce/products/products_pricing_grid" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" pass="m,p,pr.tang" no_amp="1" js_escape="1"/>', 'permmanager_', 'ProductPriceBracketManager');
+
+		</script>
+
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				function add_brackets()
+	  			{
+	  				//submit_event('pr.tang', 'OnMoreBrackets')
+	  				set_hidden_field('group_id', get_hidden_field('current_group_id'));
+	  				set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+	  				$BracketManager.submit_event('pr.tang', 'OnMoreBrackets', 'in-commerce/products/products_pricing_grid', true);
+
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:more_brackets', '<inp2:m_phrase label="la_ToolTip_MoreBrackets" escape="1"/>', add_brackets) );
+
+				function infinity()
+	  			{
+					//submit_event('pr.tang', 'OnInfinity');
+					set_hidden_field('group_id', get_hidden_field('current_group_id'));
+					set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+					$BracketManager.submit_event('pr.tang', 'OnInfinity', 'in-commerce/products/products_pricing_grid', true);
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:infinity', '<inp2:m_phrase label="la_ToolTip_Infinity" escape="1"/>', infinity) );
+
+				function arrange_brackets()
+	  			{
+					//submit_event('pr.tang', 'OnArrange')
+					set_hidden_field('group_id', get_hidden_field('current_group_id'));
+					set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+					$BracketManager.submit_event('pr.tang', 'OnArrange', 'in-commerce/products/products_pricing_grid', true);
+					//$BracketManager.refreshTab('pr.tang', 'pr.tang_div', true);
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:arrange', '<inp2:m_phrase label="la_ToolTip_Arrange" escape="1"/>', arrange_brackets) );
+
+				function delete_brackets()
+	  			{
+		  			if (confirm('<inp2:m_Phrase name="la_msg_ConfirmDeletePricing" js_escape="1" no_editing="1"/>')) {
+						set_hidden_field('group_id', get_hidden_field('current_group_id'));
+						set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+						$BracketManager.submit_event('pr.tang', 'OnDeleteBrackets', 'in-commerce/products/products_pricing_grid', true);
+		  			}
+	  			}
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_DeleteGroupPricing" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', delete_brackets) );
+
+				function edit(){ }
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				a_toolbar.DisableButton('delete');
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="g" grid="Radio"/>
+	</tr>
+</tbody>
+</table>
+
+<script type="text/javascript">
+	function set_start(id, next_id)
+	{
+		//var next_id = id - 1;
+		var input_id = ('pr.tang[' + next_id) + '][MinQty]';
+		var orig_id = ('pr.tang[' + id) + '][MinQty]';
+		if(document.getElementById(input_id) != null)
+		{
+			var new_value = parseInt(document.getElementById('pr.tang[' + id + '][MaxQty]').value);
+			if( isNaN(new_value) ) new_value = 0;
+			document.getElementById('pr.tang[' + id + '][MaxQty]').value = new_value;
+			document.getElementById(input_id).value = new_value;
+		}
+	}
+
+	function enableKernelFormFields()
+	{
+		var kForm = document.forms.kernel_form;
+		var elem = false;
+		for (var i=0; i<kForm.elements.length; i++){
+			elem = kForm.elements[i];
+			if (elem.type == "text" && elem.disabled == true){
+				elem.disabled = false;
+			}
+		}
+	}
+</script>
+
+<inp2:pr.tang_SaveWarning name="grid_save_warning"/>
+
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<td class="label-cell">
+					<inp2:m_Phrase name="la_fld_Group"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<select name="current_group_id" id="current_group_id">
+						<inp2:m_DefineElement name="group_element">
+							<option value="<inp2:Field name='GroupId'/>"><inp2:Field name="Name"/></option>
+						</inp2:m_DefineElement>
+
+						<inp2:g_PrintList render_as="group_element" per_page="-1"/>
+					</select>
+				</td>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="in-commerce/products/products_pricing_grid" tab_init="1" item_prefix="pr.tang"/>
+
+<inp2:m_include t="incs/footer"/>
+
+<script type="text/javascript">
+	var $last_group_id = false;
+
+	$(document).ready(
+		function() {
+			$('#current_group_id').change(
+				function ($e) {
+					var $group_id = $(this).val();
+
+					if ($last_group_id !== false) {
+						// save pricings from previous selected group
+						set_hidden_field('group_id', $last_group_id);
+						set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+						$BracketManager.submit_event('pr.tang', 'OnArrange', 'in-commerce/products/products_pricing_grid', false);
+					}
+
+					// get prices from new group
+					set_hidden_field('group_id', $group_id);
+					$BracketManager.go_to_group($group_id);
+
+					// remember previous selected group
+					$last_group_id = $group_id;
+				}
+			);
+
+			$BracketManager.Init(false);
+		}
+	);
+
+	document.forms.kernel_form.onsubmit =  enableKernelFormFields;
+</script>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_pricing.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.5
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/products/products_inventory.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/products/products_inventory.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/products/products_inventory.tpl	(revision 16630)
@@ -0,0 +1,194 @@
+<inp2:adm_SetPopupSize width="1000" height="680"/>
+
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
+	  <inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="poc.grid" grid="Inventory" title_preset="inventory" tab_preset="Default"/>
+<inp2:m_else/>
+	<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="inventory" tab_preset="Default"/>
+</inp2:m_if>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				function edit() {
+
+				}
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('p','<inp2:p_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('p','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('p', '<inp2:p_NextId/>');
+						}
+				 ) );
+
+				 <inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
+					  a_toolbar.AddButton( new ToolBarSeparator('sep4') );
+
+						a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+									show_viewmenu(a_toolbar,'view');
+								}
+						) );
+				</inp2:m_if>
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="p_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="p_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="p_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
+			  <inp2:m_RenderElement name="search_main_toolbar" prefix="poc.grid" grid="Inventory"/>
+		</inp2:m_if>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_ifnot check="p_Field" name="InventoryStatus" equals_to="2" db="db">
+	<inp2:p_SaveWarning name="grid_save_warning"/>
+</inp2:m_ifnot>
+
+<inp2:p_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="height: 142px;"</inp2:m_if>>
+	<table class="edit-form"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="border-bottom: 1px solid black;"</inp2:m_if>>
+		<inp2:m_RenderElement name="subsection" title="la_section_Product"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="InventoryStatus" title="la_fld_InventoryStatus" onchange="change_inventory_status()"/>
+
+			<inp2:m_ifnot check="p_Field" name="InventoryStatus" db="db" equals_to="2">
+				<!-- inventory by product / inventory disabled -->
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyInStock" title="la_fld_QtyInStock"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyReserved" title="la_fld_QtyReserved"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyBackOrdered" title="la_fld_QtyBackOrdered"/>
+				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="la_fld_QtyOnOrder"/>
+			</inp2:m_ifnot>
+
+			<inp2:m_RenderElement design="form_row" prefix="p" field="Qty" title="la_fld_Qty" size="3">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />&nbsp;
+					<input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">&nbsp;
+					<input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">&nbsp;
+					<input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">&nbsp;
+					<input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">&nbsp;
+					<input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">&nbsp;
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="la_fld_Comment" cols="40" rows="3"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
+	<!-- inventory by product options -->
+	<inp2:m_DefineElement name="grid_combination_td">
+		<inp2:Field field="$field" grid="$grid" no_special="1"/>
+		<inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
+	</inp2:m_DefineElement>
+
+	<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Inventory"/>
+</inp2:m_if>
+
+<script type="text/javascript">
+	var $inventory_status = <inp2:p_Field name="InventoryStatus" db="db"/>;
+	function getInventoryStatus() {
+		var $i = 0;
+		var $status_id = '<inp2:p_InputName field="InventoryStatus"/>';
+
+		while ($i <= 2) {
+			if (document.getElementById($status_id + '_' + $i).checked) {
+				return $i;
+			}
+			$i++;
+		}
+
+		return 0;
+	}
+
+	function change_inventory_status()
+	{
+		var $new_inventory_status = getInventoryStatus();
+		if (confirm('<inp2:m_phrase label="la_warning_ChangeInventoryStatus" />')) {
+			$inventory_status = $new_inventory_status;
+			affect_dependent_elements();
+			go_to_tab('p', t);
+		}
+		else {
+			var $status_id = '<inp2:p_InputName field="InventoryStatus"/>';
+			document.getElementById($status_id + '_' + $new_inventory_status).checked = false;
+			document.getElementById($status_id + '_' + $inventory_status).checked = true;
+			document.getElementById($status_id + '_' + $inventory_status).focus();
+		}
+	}
+
+	function iterateButtons($disabled, $class_name) {
+		var $i = 0;
+		var $buttons = Array('Add', 'Remove', 'Order', 'ReceiveOrder', 'CancelOrder');
+
+		while ($i < $buttons.length) {
+			document.getElementById($buttons[$i]).disabled = $disabled;
+			document.getElementById($buttons[$i]).className = $class_name;
+			$i++;
+		}
+	}
+
+	function processButton($prefix, $event) {
+		if ($inventory_status == 2) {
+			if (Grids['poc.grid'].GetSelected().length == 0) {
+				alert('<inp2:m_phrase name="la_warning_SelectOptionCombination" escape="1"/>')
+			}
+			else {
+				// go next if option combination is selected
+				submit_event($prefix, $event);
+			}
+		}
+		else {
+			// go next if not using option combination inventory
+			submit_event($prefix, $event);
+		}
+	}
+
+	function affect_dependent_elements()
+	{
+		var $inventory_disabled = document.getElementById('<inp2:p_InputName field="InventoryStatus"/>_0').checked;
+
+		iterateButtons($inventory_disabled, $inventory_disabled ? 'button-disabled' : 'button');
+		document.getElementById('<inp2:p_InputName field="Qty"/>').disabled = $inventory_disabled;
+		document.getElementById('<inp2:p_InputName field="InventoryComment"/>').disabled = $inventory_disabled;
+
+		document.getElementById('<inp2:p_InputName field="InventoryStatus"/>_2').disabled = <inp2:poc.grid_TotalRecords/> > 0 ? false : true;
+	}
+
+	affect_dependent_elements();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/products/products_inventory.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.15.2.7
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/import.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/import.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/import.tpl	(revision 16630)
@@ -0,0 +1,223 @@
+<inp2:adm_SetPopupSize width="780" height="670"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:p.import_PresetFormFields/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						location.href = '<inp2:m_Link t="tools/import2" no_amp="1" js_escape="1"/>';
+					}
+				) );
+
+				a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {
+
+						document.getElementById('export_columns').value = select_to_string('<inp2:p.import_InputName field="ExportColumns"/>');
+						submit_event('p.import','OnExportBegin');
+
+						}
+					) );
+
+				a_toolbar.Render();
+
+				function check_radio($id)
+				{
+					document.getElementById($id).checked = true;
+				}
+
+				// gets value of checked radio button
+				function get_checked($field_name) {
+					var $ret = false;
+					var $fields = document.getElementsByName($field_name);
+
+					for(var $i = 0; $i < $fields.length; $i++) {
+						if ($fields[$i].checked) {
+							$ret = $fields[$i].value;
+							break;
+						}
+					}
+					return $ret;
+				}
+
+				// enable/disable form fields based on other field values
+				function reflectFormFields()
+				{
+					var $auto_fields = get_checked('<inp2:p.import_InputName field="FieldTitles"/>') == 1 ? true : false;
+
+					if ($auto_fields) {
+						document.getElementById('_cb_<inp2:p.import_InputName field="SkipFirstRow"/>').checked = true;
+					}
+					document.getElementById('_cb_<inp2:p.import_InputName field="SkipFirstRow"/>').onchange();
+					document.getElementById('<inp2:p.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
+					document.getElementById('<inp2:p.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;
+
+					var $btn = null;
+					var $btns = Array('up', 'down', 'left', 'right');
+					var $i = 0;
+					while ($i < $btns.length) {
+						$btn = document.getElementById('btn_move_'+$btns[$i]);
+						$btn.disabled = $auto_fields;
+						$btn.className = $auto_fields ? 'button-disabled' : 'button';
+						$i++;
+					}
+				}
+
+				Application.setHook('p.import:OnBeforeOpenSelector',
+					function() {
+						document.getElementById('export_columns').value = select_to_string('<inp2:p.import_InputName field="ExportColumns"/>');
+					}
+				);
+
+				$(document).ready(
+					function() {
+						$('#step_number').text(3);
+					}
+				);
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+
+<inp2:p.import_SaveWarning name="grid_save_warning"/>
+<inp2:p.import_ErrorWarning name="form_error_warning"/>
+
+<table class="edit-form bordered">
+	<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
+			<td class="control-cell">
+				<table border="0">
+					<tr>
+						<td>
+							<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_1"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
+						</td>
+						<td>
+							<label for="<inp2:p.import_InputName field="ImportSource"/>_1">upload</label>
+						</td>
+						<td>
+							<input type="file" name="<inp2:p.import_InputName field="ImportFilename"/>" id="<inp2:p.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_1');">
+						</td>
+					</tr>
+
+					<tr>
+						<td>
+							<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_2"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
+						</td>
+						<td>
+							<label for="<inp2:p.import_InputName field="ImportSource"/>_2">select</label>
+						</td>
+						<td>
+							<select name="<inp2:p.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_2');">
+								<inp2:p.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
+							</select>
+						</td>
+					</tr>
+
+				</table>
+			</td>
+		</inp2:m_RenderElement>
+
+		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
+
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns">
+			<td class="control-cell">
+				<table cellpadding="0" cellspacing="0" border="0">
+					<tr>
+						<td>
+							<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button">
+							<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
+							<img src="img/spacer.gif" width="1" height="5" alt=""><br />
+						</td>
+						<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
+						<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
+					</tr>
+					<tr>
+						<td>
+							<select multiple id="<inp2:p.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
+								<inp2:p.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
+							</select>
+							<input type="hidden" id="export_columns" name="<inp2:p.import_InputName field="ExportColumns"/>" value="<inp2:p.import_Field field="ExportColumns"/>" />
+						</td>
+						<td align="center">
+							<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" id="btn_move_left" onclick="move_selected('<inp2:p.import_InputName field="AvailableColumns"/>', '<inp2:p.import_InputName field="ExportColumns"/>')" class="button"><br>
+							<img src="img/spacer.gif" width="1" height="4" alt=""><br>
+							<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" id="btn_move_right" onclick="move_selected('<inp2:p.import_InputName field="ExportColumns"/>', '<inp2:p.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.import_InputName field="AvailableColumns"/>');" class="button">
+						</td>
+						<td>
+							<select multiple id="<inp2:p.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
+								<inp2:p.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
+							</select>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</inp2:m_RenderElement>
+
+<!-- CATEGORY SELECTOR: BEGIN -->
+	<inp2:m_DefineElement name="root_cat_caption">
+		<inp2:m_Phrase name="la_rootcategory_name"/>
+	</inp2:m_DefineElement>
+
+	<inp2:m_DefineElement name="category_caption">
+		<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
+	</inp2:m_DefineElement>
+
+	<inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory">
+		<td class="control-cell">
+			<b><inp2:p.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
+			<input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" />
+			<a href="<inp2:adm_SelectorLink prefix='p.import' selection_mode='single' tab_prefixes='none'/>" onclick="javascript:openSelector('p.import', this.href, 'ImportCategory', null, 'OnSaveSettings'); return false;"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
+		</td>
+	</inp2:m_RenderElement>
+
+<!-- CATEGORY SELECTOR: END -->
+	<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
+	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
+
+	<inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
+		<td class="control-cell">
+			<table cellspacing="0" cellpadding="0">
+				<tr>
+					<td valign="top">
+						<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
+					</td>
+					<td>
+						<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: PRODUCTID</label>
+					</td>
+				</tr>
+
+				<tr>
+					<td valign="top">
+						<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
+					</td>
+					<td>
+						<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
+						<inp2:p.import_PredefinedOptions prefix="p.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>
+
+						<inp2:m_RenderElement prefix="p.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</inp2:m_RenderElement>
+
+	<inp2:m_RenderElement name="inp_edit_filler"/>
+</table>
+
+<script language="javascript" type="text/javascript">
+	reflectFormFields();
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/import.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.8
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/coupons_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/coupons_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/coupons_list.tpl	(revision 16630)
@@ -0,0 +1,67 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" title_preset="coupons_list" pagination="1" tabs="in-commerce/discounts/discounts_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('coup', 'in-commerce/discounts/coupon_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Coupon" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('coup', 'in-commerce/discounts/coupon_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('coup')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>',
+							function() {
+								//set_event('sc', 'OnSaveCreated');
+								openSelector('coup', '<inp2:m_Link template="in-commerce/discounts/coupon_clone_selector" pass="all" no_amp="1" js_escape="1"/>', '', '600x260', 'OnPrepareClone');
+							} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('coup','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('coup','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="coup" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Default"/>
+<script type="text/javascript">
+	Grids['coup'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/coupons_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/coupon_clone_selector.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/coupon_clone_selector.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/coupon_clone_selector.tpl	(revision 16630)
@@ -0,0 +1,40 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" title_preset="coupons_clone"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+	  	<td>
+	  		<script type="text/javascript">
+					a_toolbar = new ToolBar();
+
+	  				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+								submit_event('coup', 'OnApplyClone');
+							}
+						) );
+					a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+								window_close();
+							}
+					 	) );
+
+					a_toolbar.Render();
+			</script>
+
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:coup_SaveWarning name="grid_save_warning"/>
+<inp2:coup_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="CouponCount" title="la_EnterNumberOfCopies" style="width: 50px;"/>
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="DefaultExpiration" title="la_Expiration"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/coupon_clone_selector.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/coupon_selector.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/coupon_selector.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/coupon_selector.tpl	(revision 16630)
@@ -0,0 +1,47 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" grid="Radio" title_preset="coupon_selector" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+
+  			function edit()
+  			{
+  				//do nothing;
+  			}
+
+  			a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+						set_hidden_field('selected_ids', Grids['coup'].GetSelected());
+						submit_event('<inp2:m_recall name="main_prefix"/>', 'OnProcessSelected');
+					}
+				) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							window_close();
+						}
+				 ) );
+
+				 a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="coup" grid="Radio"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Radio"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/coupon_selector.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.4.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/coupon_items.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/coupon_items.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/coupon_items.tpl	(revision 16630)
@@ -0,0 +1,116 @@
+<inp2:adm_SetPopupSize width="870" height="600"/>
+
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="coupi_IsEntireOrder">
+	<inp2:m_SetParam grid="Default"/>
+<inp2:m_else/>
+	<inp2:m_SetParam grid="CouponItems"/>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" title_preset="coupons_items" grid="$grid" pagination="1" pagination_prefix="coupi" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('coup','<inp2:coup_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('coup','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('coup', '<inp2:coup_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('coup', '<inp2:coup_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							openSelector('coupi', '<inp2:adm_SelectorLink prefix="coupi" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('coupi')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:entire_order', '<inp2:m_phrase label="la_ToolTip_EntireOrder" escape="1"/>',
+						function() {
+							if (inpConfirm('<inp2:m_phrase label="la_EntireOrderConfirmation"/>'))
+							{
+								submit_event('coupi', 'OnEntireOrder');
+							}
+						} ) );
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="coup_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="coup_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="coup_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function edit()
+				{
+					// required for correct row selection
+				}
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="coupi" grid="$grid"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_item_td">
+	<inp2:m_if check="FieldEquals" field="ItemType" value="1">
+		<inp2:Field field="ProductId" no_special="no_special"/>
+	<inp2:m_else/>
+		<inp2:Field field="CategoryId" no_special="no_special"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="coupi" IdField="CouponItemId" grid="$grid"/>
+
+<script type="text/javascript">
+	<inp2:m_if check="coupi_IsEntireOrder" >
+			a_toolbar.DisableButton('new_item');
+	</inp2:m_if>
+
+	Grids['coupi'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+
+<input type="hidden" name="main_prefix" id="main_prefix" value="coupi">
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/coupon_items.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/discounts_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/discounts_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/discounts_list.tpl	(revision 16630)
@@ -0,0 +1,61 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="d" section="in-commerce:discounts" title_preset="discounts_list" pagination="1" tabs="in-commerce/discounts/discounts_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('d', 'in-commerce/discounts/discount_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Discount" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('d', 'in-commerce/discounts/discount_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('d')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('d','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('d','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="d" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="d" IdField="DiscountId" grid="Default"/>
+<script type="text/javascript">
+	Grids['d'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/discounts_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/gift_certificate_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/gift_certificate_list.tpl	(revision 16630)
@@ -0,0 +1,63 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="gc" section="in-commerce:gift-certificates" title_preset="gift_certificates_list" pagination="1" tabs="in-commerce/discounts/discounts_list_tabs"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('gc', 'in-commerce/discounts/gift_certificate_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewGiftCertificate" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('gc', 'in-commerce/discounts/gift_certificate_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('gc')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('e-mail', '<inp2:m_phrase label="la_ToolTip_SendMail" escape="1"/>', function() {
+						submit_event('gc', 'OnEmailGiftCertificate');
+					}
+				) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="gc" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="gc" IdField="GiftCertificateId" grid="Default"/>
+<script type="text/javascript">
+	Grids['gc'].SetDependantToolbarButtons( new Array('edit','delete','e-mail') );
+
+	addLoadEvent(
+		function() {
+			<inp2:m_if check="m_Recall" name="print_certificate_id">
+				openSelector('gc', '<inp2:gc_PrintLink template="in-commerce/discounts/gift_certificate_print" no_amp="1" js_escape="1"/>');
+			</inp2:m_if>
+		}
+	);
+
+</script>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_print.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/gift_certificate_print.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/gift_certificate_print.tpl	(revision 16630)
@@ -0,0 +1,49 @@
+<inp2:m_RequireLogin permissions="in-commerce:gift-certificates.view" system="1"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<script type="text/javascript">
+	set_window_title('Gift Certificate - Print Preview');
+</script>
+
+<inp2:m_NoDebug/>
+<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF" onload="window.print();">
+
+<img src="<inp2:m_TemplatesBase module="custom"/>/img/site_logo.jpg" width="159" height="61" border="0">
+<br/>
+<br/>
+<strong><inp2:m_Phrase label="la_title_GiftCertificates"/></strong>
+
+<br/>
+<br/>
+<inp2:m_Phrase label="la_fld_Amount"/>: <inp2:gc_Field name="Amount"/>
+<br/>
+<inp2:m_Phrase label="la_fld_Id"/>: <inp2:gc_Field name="Code"/>
+<br/>
+<br/>
+<inp2:m_Phrase label="la_fld_MessageText"/>Message: <inp2:gc_Field name="Message"/>
+<br/>
+<br/>
+<strong><inp2:m_Phrase label="la_section_EmailDelivery"/></strong>
+<br/>
+<br/>
+<inp2:m_Phrase label="la_fld_FirstName"/>: <inp2:gc_Field name="RecipientFirstname"/>
+<br/>
+<inp2:m_Phrase label="la_fld_LastName"/>: <inp2:gc_Field name="RecipientLastname"/>
+<br/>
+<inp2:m_Phrase label="la_fld_AddressLine1"/>: <inp2:gc_Field name="RecipientAddress1"/>
+<br/>
+<inp2:m_Phrase label="la_fld_AddressLine2"/>: <inp2:gc_Field name="RecipientAddress2"/>
+<br/>
+<inp2:m_Phrase label="la_fld_City"/>: <inp2:gc_Field name="RecipientCity"/>
+<br/>
+<inp2:m_Phrase label="la_fld_Zip"/>: <inp2:gc_Field name="RecipientZipcode"/>
+<br/>
+<inp2:m_Phrase label="la_fld_State"/>: <inp2:gc_Field name="RecipientState"/>
+<br/>
+<inp2:m_Phrase label="la_fld_Country"/>: <inp2:gc_Field name="RecipientCountry"/>
+<br/>
+<inp2:m_Phrase label="la_fld_Phone"/>: <inp2:gc_Field name="RecipientPhone"/>
+<br/>
+
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_print.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/coupon_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/coupon_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/coupon_edit.tpl	(revision 16630)
@@ -0,0 +1,110 @@
+<inp2:adm_SetPopupSize width="870" height="600"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" title_preset="coupons_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('coup','<inp2:coup_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('coup','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('coup', '<inp2:coup_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('coup', '<inp2:coup_NextId/>');
+						}
+				 ) );
+
+				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="coup_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="coup_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="coup_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<script language="JavaScript">
+function Random(N) {
+    return Math.floor(N * (Math.random() % 1));
+}
+
+function generateRandomCode(elementId){
+    var j, S = "", d;
+    for (j = 0; j < 10; j++) {
+    	d=Random(2);
+    	if (d==1)
+        	S += String.fromCharCode(65 + Random(26));
+        else
+        	S += String(Random(9));
+    }
+    document.getElementById(elementId).value=S;
+}
+</script>
+
+<inp2:coup_SaveWarning name="grid_save_warning"/>
+<inp2:coup_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="la_fld_Name" size="35"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="coup" field="Code" title="la_fld_CouponCode" size="35">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+					<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
+				</td>
+			</inp2:m_RenderElement>
+
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="la_fld_Expiration" size="10"/>
+
+			<inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="la_fld_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Amount" title="la_fld_Amount" size="4"/>
+
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="la_fld_LastUsedBy" size="15"/>
+			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="la_fld_LastUsedOn" size="10"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+					<inp2:m_Phrase label="la_comment_LeaveBlank" />
+				</td>
+			</inp2:m_RenderElement>
+
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/coupon_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/discount_items.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/discount_items.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/discount_items.tpl	(revision 16630)
@@ -0,0 +1,116 @@
+<inp2:adm_SetPopupSize width="870" height="600"/>
+
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_if check="di_IsEntireOrder">
+	<inp2:m_SetParam grid="Default"/>
+<inp2:m_else/>
+	<inp2:m_SetParam grid="DiscountItems"/>
+</inp2:m_if>
+
+<inp2:m_RenderElement name="combined_header" prefix="d" section="in-commerce:discounts" title_preset="discount_items" grid="$grid" pagination="1" pagination_prefix="di" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('d','<inp2:d_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('d','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('d', '<inp2:d_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('d', '<inp2:d_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>',
+						function() {
+							openSelector('di', '<inp2:adm_SelectorLink prefix="di" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
+						} ) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('di')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:entire_order', '<inp2:m_phrase label="la_ToolTip_EntireOrder" escape="1"/>',
+						function() {
+							if (inpConfirm('<inp2:m_phrase label="la_EntireOrderConfirmation"/>'))
+							{
+								submit_event('di', 'OnEntireOrder');
+							}
+						} ) );
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="d_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="d_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="d_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function edit()
+				{
+					// required for correct row selection
+				}
+
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="di" grid="$grid"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="grid_item_td">
+	<inp2:m_if check="FieldEquals" field="ItemType" value="1">
+		<inp2:Field field="ProductId" no_special="no_special"/>
+	<inp2:m_else/>
+		<inp2:Field field="CategoryId" no_special="no_special"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="di" IdField="DiscountItemId" grid="$grid"/>
+
+<script type="text/javascript">
+	<inp2:m_if check="di_IsEntireOrder" >
+			a_toolbar.DisableButton('new_item');
+	</inp2:m_if>
+
+	Grids['di'].SetDependantToolbarButtons( new Array('delete') );
+</script>
+
+<input type="hidden" name="main_prefix" id="main_prefix" value="di">
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/discount_items.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/discount_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/discount_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/discount_edit.tpl	(revision 16630)
@@ -0,0 +1,74 @@
+<inp2:adm_SetPopupSize width="870" height="600"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="d" section="in-commerce:discounts" title_preset="discount_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('d','<inp2:d_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('d','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('d', '<inp2:d_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('d', '<inp2:d_NextId/>');
+						}
+				 ) );
+
+				//a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="d_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					//a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="d_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="d_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:d_SaveWarning name="grid_save_warning"/>
+<inp2:d_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_label" prefix="d" field="DiscountId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Status" title="la_fld_Status"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Name" title="la_fld_Name" size="35"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="Start" title="la_fld_Start" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="d" field="End" title="la_fld_End" size="10"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="d" field="GroupId" title="la_fld_Group" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="d" field="Type" title="la_fld_Type"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="d" field="Amount" title="la_fld_Amount" size="4"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/discount_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/discounts_list_tabs.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/discounts_list_tabs.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/discounts_list_tabs.tpl	(revision 16630)
@@ -0,0 +1,5 @@
+<inp2:m_DefineElement name="discount_tabs">
+	<inp2:adm_ListTabs render_as="tab_direct" section_name="in-commerce:discounts_folder"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="discount_tabs"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/discounts_list_tabs.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/discounts/gift_certificate_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/discounts/gift_certificate_edit.tpl	(revision 16630)
@@ -0,0 +1,164 @@
+<inp2:adm_SetPopupSize width="780" height="640"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="gc" section="in-commerce:gift-certificates" title_preset="gift_certificates_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('gc','<inp2:gc_SaveEvent/>');
+						}
+					) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:save_and_print', '<inp2:m_phrase label="la_ToolTip_SaveAndPrint" escape="1"/>', function() {
+								set_hidden_field('print_certificate', 1);
+								submit_event('gc','<inp2:gc_SaveEvent/>');
+							}
+						) );
+
+
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('gc','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('gc', '<inp2:gc_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('gc', '<inp2:gc_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="gc_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="gc_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="gc_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<script language="JavaScript">
+function Random(N) {
+    return Math.floor(N * (Math.random() % 1));
+}
+
+function generateRandomCode(elementId){
+    var j, S = "", d;
+    for (j = 0; j < 10; j++) {
+    	d=Random(2);
+    	if (d==1)
+        	S += String.fromCharCode(65 + Random(26));
+        else
+        	S += String(Random(9));
+    }
+    document.getElementById(elementId).value=S;
+}
+</script>
+
+<inp2:gc_SaveWarning name="grid_save_warning"/>
+<inp2:gc_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="gc" field="GiftCertificateId" title="la_fld_Id"/>
+
+			<inp2:m_if check="gc_HasOrder">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
+
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
+
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_EmailDelivery"/>
+			<inp2:m_if check="gc_HasOrder">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_PostalDelivery"/>
+			<inp2:m_if check="gc_HasOrder">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientAddress1" title="la_fld_AddressLine1"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientAddress2" title="la_fld_AddressLine2"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientCity" title="la_fld_City"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientZipcode" title="la_fld_Zip"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientState" title="la_fld_State"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientCountry" title="la_fld_Country"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientPhone" title="la_fld_Phone"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientAddress1" title="la_fld_AddressLine1"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientAddress2" title="la_fld_AddressLine2"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientCity" title="la_fld_City"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientZipcode" title="la_fld_Zip"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientState" title="la_fld_State"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="gc" field="RecipientCountry" title="la_fld_Country" has_empty="1"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientPhone" title="la_fld_Phone"/>
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="la_fld_Status"/>
+
+			<inp2:m_if check="gc_HasOrder">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="la_fld_Code" size="35"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
+
+				<inp2:m_RenderElement design="form_row" prefix="gc" field="Code" title="la_fld_Code" size="35">
+					<td class="control-cell">
+						<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+						<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
+					</td>
+				</inp2:m_RenderElement>
+			</inp2:m_if>
+
+			<inp2:m_if check="gc_IsNewItem" inverse="inverse">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="la_fld_RemainingAmount" size="7"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="gc_HasOrder">
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
+			</inp2:m_if>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/discounts/gift_certificate_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/user_order_item_tab.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/user_order_item_tab.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/user_order_item_tab.tpl	(revision 16630)
@@ -0,0 +1,36 @@
+<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
+<inp2:m_DefineElement name="order_catalog_tab">
+	<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
+			<div id="orders_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-commerce/user_order_item_tab" edit_template="in-commerce/orders/orders_edit" dep_buttons="new_order" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
+			<script type="text/javascript">$Catalog.registerTab('orders');</script>
+		</inp2:m_if>
+		<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
+			<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
+		</inp2:m_if>
+	<inp2:m_else/>
+		<inp2:m_include t="incs/blocks"/>
+		<inp2:m_include t="incs/in-portal"/>
+		<inp2:m_include t="categories/ci_blocks"/>
+		<inp2:m_include template="in-commerce/orders/order_blocks"/>
+
+		<inp2:$prefix_InitList grid="$grid_name"/>
+
+		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_TotalRecords/>');
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
+		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+
+		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="OrderId" grid="$grid_name"/>
+
+		Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
+		$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
+		#separator#
+		<!-- orders tab: begin -->
+		<inp2:m_RenderElement name="kernel_form" form_name="orders_form"/>
+			<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="OrderId" grid="$grid_name" menu_filters="yes"/>
+		<inp2:m_RenderElement name="kernel_form_end"/>
+		<!-- orders tab: end -->
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:ord_InitCatalogTab render_as="order_catalog_tab" default_grid="Search" radio_grid="Radio"/>

Property changes on: releases/5.2.2-B2/admin_templates/user_order_item_tab.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.6
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.css
===================================================================
--- releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.css	(revision 0)
+++ releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.css	(revision 16630)
@@ -0,0 +1,59 @@
+.in-commerce-toolbar-sprite {
+	background: url("@templates_base@/../../modules/in-commerce/admin_templates/img/toolbar/toolbar-sprite.png") repeat-x scroll 0 0 transparent;
+	border: 0 none;
+	cursor: pointer;
+	padding: 0;
+}
+#in-commerce-tb-archive { background-position: -0px -0px; }
+#in-commerce-tb-archive.hover { background-position: -32px -0px; }
+#in-commerce-tb-archive.disabled { background-position: -64px -0px; }
+#in-commerce-tb-arrange { background-position: -0px -32px; }
+#in-commerce-tb-arrange.hover { background-position: -32px -32px; }
+#in-commerce-tb-clear_all { background-position: -0px -64px; }
+#in-commerce-tb-clear_all.hover { background-position: -32px -64px; }
+#in-commerce-tb-entire_order { background-position: -0px -96px; }
+#in-commerce-tb-entire_order.hover { background-position: -32px -96px; }
+#in-commerce-tb-flip { background-position: -0px -128px; }
+#in-commerce-tb-flip.hover { background-position: -32px -128px; }
+#in-commerce-tb-goto_order { background-position: -0px -160px; }
+#in-commerce-tb-goto_order.hover { background-position: -32px -160px; }
+#in-commerce-tb-goto_order.disabled { background-position: -64px -160px; }
+#in-commerce-tb-infinity { background-position: -0px -192px; }
+#in-commerce-tb-infinity.hover { background-position: -32px -192px; }
+#in-commerce-tb-modify { background-position: -0px -224px; }
+#in-commerce-tb-modify.hover { background-position: -32px -224px; }
+#in-commerce-tb-modify.disabled { background-position: -64px -224px; }
+#in-commerce-tb-more_brackets { background-position: -0px -256px; }
+#in-commerce-tb-more_brackets.hover { background-position: -32px -256px; }
+#in-commerce-tb-new_pricing { background-position: -0px -288px; }
+#in-commerce-tb-new_pricing.hover { background-position: -32px -288px; }
+#in-commerce-tb-new_product { background-position: -0px -320px; }
+#in-commerce-tb-new_product.hover { background-position: -32px -320px; }
+#in-commerce-tb-pay_out { background-position: -0px -352px; }
+#in-commerce-tb-pay_out.hover { background-position: -32px -352px; }
+#in-commerce-tb-place_order { background-position: -0px -384px; }
+#in-commerce-tb-place_order.hover { background-position: -32px -384px; }
+#in-commerce-tb-place_order.disabled { background-position: -64px -384px; }
+#in-commerce-tb-recalculate_order { background-position: -0px -416px; }
+#in-commerce-tb-recalculate_order.hover { background-position: -32px -416px; }
+#in-commerce-tb-recalculate_order.disabled { background-position: -64px -416px; }
+#in-commerce-tb-reset_to_billing { background-position: -0px -448px; }
+#in-commerce-tb-reset_to_billing.hover { background-position: -32px -448px; }
+#in-commerce-tb-reset_to_pending { background-position: -0px -480px; }
+#in-commerce-tb-reset_to_pending.hover { background-position: -32px -480px; }
+#in-commerce-tb-reset_to_pending.disabled { background-position: -64px -480px; }
+#in-commerce-tb-reset_to_shipping { background-position: -0px -512px; }
+#in-commerce-tb-reset_to_shipping.hover { background-position: -32px -512px; }
+#in-commerce-tb-save_and_print { background-position: -0px -544px; }
+#in-commerce-tb-save_and_print.hover { background-position: -32px -544px; }
+#in-commerce-tb-ship { background-position: -0px -576px; }
+#in-commerce-tb-ship.hover { background-position: -32px -576px; }
+#in-commerce-tb-ship.disabled { background-position: -64px -576px; }
+#in-commerce-tb-update_rates { background-position: -0px -608px; }
+#in-commerce-tb-update_rates.hover { background-position: -32px -608px; }
+#in-commerce-tb-update_rates.disabled { background-position: -64px -608px; }
+#in-commerce-tb-verify { background-position: -0px -640px; }
+#in-commerce-tb-verify.hover { background-position: -32px -640px; }
+#in-commerce-tb-verify.disabled { background-position: -64px -640px; }
+#in-commerce-tb-view_chart { background-position: -0px -672px; }
+#in-commerce-tb-view_chart.hover { background-position: -32px -672px; }

Property changes on: releases/5.2.2-B2/admin_templates/img/toolbar/toolbar-sprite.css
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_entire_order.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_entire_order.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_products.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_products.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_pending.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_pending.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/no_picture_list.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/no_picture_list.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_disabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_disabled.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_new.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/itemicons/icon16_product_new.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_manufacturers.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_manufacturers.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_discounts_coupons.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_discounts_coupons.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_shipping.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_shipping.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_taxes.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_taxes.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_orders.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_orders.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_ecommerce.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_ecommerce.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_ecommerce_general.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_ecommerce_general.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_sales_report.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_sales_report.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon46_ecommerce.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon46_ecommerce.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_products.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_products.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_ecommerce.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_ecommerce.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_payment_types.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_payment_types.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_affiliates.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_affiliates.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_currencies.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_currencies.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_download_log.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_download_log.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_transactions.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_transactions.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_contact_info.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/icons/icon24_conf_contact_info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/list_horiz_propagate.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/list_horiz_propagate.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/img/list_vertic_propagate.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/admin_templates/img/list_vertic_propagate.gif
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/admin_templates/payment_type/payment_type_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payment_type/payment_type_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payment_type/payment_type_edit.tpl	(revision 16630)
@@ -0,0 +1,73 @@
+<inp2:adm_SetPopupSize width="790" height="520"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="payment_type_edit" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('pt','<inp2:pt_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pt','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="pt_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="pt_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pt_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="ml_selector" prefix="pt"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:pt_SaveWarning name="grid_save_warning"/>
+<inp2:pt_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="pt" field="PaymentTypeId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Name" title="la_fld_Name" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_box_ml" prefix="pt" field="Description" title="la_fld_Description" size="40"/>
+		<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="pt" field="Instructions" title="la_fld_Instructions"  cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="pt" field="AdminComments" title="la_fld_AdminComments" cols="40" rows="5"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="Status" title="la_fld_Enabled"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="pt" field="PlacedOrdersEdit" title="la_fld_PlacedOrdersEdit"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="Priority" title="la_fld_Priority" size="3"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="pt" field="ProcessingFee" title="la_fld_ProcessingFee" size="4"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/payment_type/payment_type_edit.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.10.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/payment_type/payment_type_list.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payment_type/payment_type_list.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payment_type/payment_type_list.tpl	(revision 16630)
@@ -0,0 +1,104 @@
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="payment_type_list" pagination="1"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+  			//do not rename - this function is used in default grid for double click!
+  			function edit()
+  			{
+  				std_edit_item('pt', 'in-commerce/payment_type/payment_type_edit');
+  			}
+
+  			var a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_NewPaymentType" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+						function() {
+							std_precreate_item('pt', 'in-commerce/payment_type/payment_type_edit')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
+						function() {
+							std_delete_items('pt')
+						} ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_setPrimary" escape="1"/>', function() {
+							submit_event('pt','OnSetPrimary');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('approve', '<inp2:m_phrase label="la_ToolTip_Approve" escape="1"/>', function() {
+							submit_event('pt','OnMassApprove');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('decline', '<inp2:m_phrase label="la_ToolTip_Decline" escape="1"/>', function() {
+							submit_event('pt','OnMassDecline');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+
+				a_toolbar.AddButton( new ToolBarButton('move_up', '<inp2:m_phrase label="la_ToolTip_MoveUp" escape="1"/>', function() {
+							submit_event('pt','OnMassMoveUp');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarButton('move_down', '<inp2:m_phrase label="la_ToolTip_MoveDown" escape="1"/>', function() {
+							submit_event('pt','OnMassMoveDown');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep3') );
+
+				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
+							show_viewmenu(a_toolbar,'view');
+						}
+				) );
+
+				a_toolbar.Render();
+			</script>
+		</td>
+
+		<inp2:m_RenderElement name="search_main_toolbar" prefix="pt" grid="Default"/>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="payment_caption_td">
+	<inp2:Field field="$field" grid="$grid"/>
+	<span class="priority"><inp2:m_if check="FieldEquals" field="Priority" value="0"><inp2:m_else/><sup><inp2:Field field="Priority" /></sup></inp2:m_if></span>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="primary_type_delete_error">
+	<script type="text/javascript">
+		alert('<inp2:m_Phrase label="la_error_CannotDeletePaymentType"/>');
+	</script>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="pt" IdField="PaymentTypeId" grid="Default"/>
+<script type="text/javascript">
+	Grids['pt'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'setprimary', 'move_up', 'move_down') );
+
+</script>
+
+<inp2:m_DefineElement name="remove_unused_warning">
+	<input type="hidden" name="unused_ids" id="unused_ids" value="<inp2:m_param name="unused_ids" />">
+	<script type="text/javascript">
+		if(inpConfirm('<inp2:m_phrase label="la_WarningCurrenciesNotUsed" />: <inp2:m_param name="unused_iso" />. <inp2:m_phrase label="la_WarningRemoveUnusedCurrencies" />?'))
+		{
+			submit_event('curr', 'OnDisableUnused');
+		}
+	</script>
+</inp2:m_DefineElement>
+
+<inp2:curr_DisableUnusedWarning block="remove_unused_warning" />
+
+<inp2:pt_DeleteError block="primary_type_delete_error"/>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/payment_type/payment_type_list.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.4
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/payment_type/payment_type_groups.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payment_type/payment_type_groups.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payment_type/payment_type_groups.tpl	(revision 16630)
@@ -0,0 +1,116 @@
+<inp2:adm_SetPopupSize width="790" height="520"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="group_list" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							document.getElementById('<inp2:pt_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+							submit_event('pt','<inp2:pt_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pt','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="pt_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="pt_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pt_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+
+				function go_to_tab(prefix_special, tab)
+				{
+					set_hidden_field(prefix_special+'_GoTab', tab);
+					document.getElementById('<inp2:pt_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+					submit_event(prefix_special,'OnPreSaveAndGoToTab',null);
+				}
+
+				function go_to_id(prefix_special, id)
+				{
+					set_hidden_field(prefix_special+'_GoId', id);
+					document.getElementById('<inp2:pt_InputName field="PortalGroups"/>').value = select_to_string('selected_groups');
+				 	submit_event(prefix_special,'OnPreSaveAndGo')
+				}
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:pt_SaveWarning name="grid_save_warning"/>
+<inp2:pt_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="pt" field="PortalGroups" title="la_fld_UserGroups" size="40"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_label" prefix="pt" field="PaymentTypeId" title="la_fld_Id"/>
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_fld_UserGroups"/>:
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<table style="width: 300px">
+					<tr>
+						<td>
+							<inp2:m_DefineElement name="group_option">
+								<option value="<inp2:m_param name="GroupId"/>"><inp2:m_param name="Name"/></option>
+							</inp2:m_DefineElement>
+
+							<inp2:m_phrase label="la_fld_SelectedGroups"/>
+
+							<select id="selected_groups" name="selected_groups[]" multiple="multiple" size="15" style="width: 200px">
+								<inp2:pt_ListGroups mode="selected" render_as="group_option"/>
+							</select>
+						</td>
+						<td align="center">
+							<input type="button" value="&nbsp;&laquo;&laquo;&nbsp;" onclick="move_selected('available_groups', 'selected_groups'); select_sort('selected_groups')" class="button"><br>
+							<img src="img/s.gif" width="1" height="4" alt=""><br>
+							<input type="button" value="&nbsp;&raquo;&raquo;&nbsp;" onclick="move_selected('selected_groups', 'available_groups'); select_sort('available_groups');" class="button">
+						</td>
+						<td>
+							<inp2:m_phrase label="la_fld_AvailableGroups"/>
+
+							<select id="available_groups" name="available_groups[]" multiple="multiple" size="15" style="width: 200px">
+								<inp2:pt_ListGroups render_as="group_option"/>
+							</select>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/payment_type/payment_type_groups.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.3.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/payment_type/payment_type_gateway.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payment_type/payment_type_gateway.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payment_type/payment_type_gateway.tpl	(revision 16630)
@@ -0,0 +1,133 @@
+<inp2:adm_SetPopupSize width="790" height="520"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="gateway" tab_preset="Default"/>
+
+<inp2:m_DefineElement name="GatewayFieldsDiv">
+	<inp2:m_RenderElement name="grid_data_td" />
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="dummy">
+</inp2:m_DefineElement>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('pt','<inp2:pt_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pt','OnCancelEdit');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="pt_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="pt_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pt_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<script type="text/javascript">
+
+function refresh_fields() {
+	var $dropdown=document.getElementById('pt[<inp2:m_get name="pt_id" js_escape="1"/>][GatewayId]');
+	var $table=document.getElementById('gateway_fields');
+	var $display_style='';
+	var $i=0;
+
+
+	if (is.gecko || !is.ie) {
+		on_style = 'table-row';
+	}
+	else {
+		on_style = 'block';
+	}
+
+	while($i<$table.rows.length)
+	{
+		$row=$table.rows[$i];
+		if( isset($row.getAttribute('GatewayId')) )
+		{
+			$display_style=($row.getAttribute('GatewayId') == $dropdown.options[$dropdown.selectedIndex].value) ? on_style : 'none';
+//			alert('current display is '+$row.style.display+' setting it to '+$display_style);
+			$row.style.display = $display_style;
+//			alert('set');
+		}
+		$i++;
+	}
+}
+
+</script>
+
+<inp2:m_DefineElement name="gw_input_text">
+	<input type="text" name="<inp2:gwf_InputName field="Value"/>" id="<inp2:gwf_InputName field="Value"/>" value="<inp2:gwf_gwConfigValue/>" tabindex="<inp2:m_get param="tab_index"/>" style="width:80%">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="gw_input_select">
+	<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:gwf_InputName field="Value"/>" id="<inp2:gwf_InputName field="Value"/>">
+		<inp2:PredefinedOptions field="Value" block="inp_option_phrase" selected="selected"/>
+	</select>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="gw_input_checkbox">
+	<input type="hidden" id="<inp2:gwf_InputName field="Value"/>" name="<inp2:gwf_InputName field="Value"/>" value="<inp2:gwf_gwConfigValue/>">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:gwf_InputName field="Value"/>" name="_cb_<inp2:gwf_InputName field="Value"/>" <inp2:gwf_gwConfigValue checked="checked"/> class="<inp2:m_param name="class"/>" onchange="update_checkbox(this, document.getElementById('<inp2:gwf_InputName field="Value"/>'));">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="gateway_field">
+	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" GatewayId="<inp2:m_param name="gateway_id"/>" style="display: <inp2:m_param name="display"/>;">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell">
+			<inp2:gwf_Field field="FieldName"/>:
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<td class="control-cell">
+			<inp2:m_RenderElement name="$input_block" pass_params="true"/>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:gwf_initGWConfigValues/>
+
+<inp2:pt_SaveWarning name="grid_save_warning"/>
+<inp2:pt_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form" id="gateway_fields">
+		<inp2:m_RenderElement name="inp_edit_options" prefix="pt" field="GatewayId" title="la_fld_Gateway" onchange="refresh_fields()"/>
+		<inp2:gwf_PrintList block="gateway_field" input_block_prefix="gw_input_" per_page="-1"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/payment_type/payment_type_gateway.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.11.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/payment_type/payment_type_currencies.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/payment_type/payment_type_currencies.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/payment_type/payment_type_currencies.tpl	(revision 16630)
@@ -0,0 +1,83 @@
+<inp2:adm_SetPopupSize width="790" height="520"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" prefix="pt" section="in-commerce:payment_types" title_preset="payment_currencies_edit" tab_preset="Default"/>
+
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('pt','<inp2:pt_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							submit_event('pt','OnCancel');
+						}
+				 ) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('pt', '<inp2:pt_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="pt_IsSingle" >
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+					a_toolbar.HideButton('sep2');
+				<inp2:m_else/>
+					<inp2:m_if check="pt_IsLast" >
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="pt_IsFirst" >
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:m_DefineElement name="currency_option">
+	<option value="<inp2:curr.active_field field="CurrencyId" />" <inp2:m_if check="ptc.active_CurrencySelected"  >selected</inp2:m_if>>
+		<inp2:curr.active_field field="ISO" /> / <inp2:curr.active_phrasefield field="Name" />
+	</option>
+</inp2:m_DefineElement>
+
+
+<inp2:pt_SaveWarning name="grid_save_warning"/>
+<inp2:pt_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="label-cell">
+				<inp2:m_phrase label="la_fld_PaymentTypeCurrencies" />:
+			</td>
+			<td class="control-mid">&nbsp;</td>
+			<td class="control-cell">
+				<select multiple name="currency_list[]">
+					<inp2:curr.active_PrintList block="currency_option" />
+				</select>
+			</td>
+		</tr>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/admin_templates/payment_type/payment_type_currencies.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.9.2.3
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
--- releases/5.2.2-B2/admin_templates/site_domains/site_domain_edit.tpl	(revision 0)
+++ releases/5.2.2-B2/admin_templates/site_domains/site_domain_edit.tpl	(revision 16630)
@@ -0,0 +1,73 @@
+<inp2:adm_SetPopupSize width="750" height="560"/>
+
+<inp2:m_include t="incs/header"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:site_domains"  prefix="site-domain" title_preset="site_domain_edit_in_commerce" tab_preset="Default"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('site-domain', '<inp2:site-domain_SaveEvent/>');
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
+							cancel_edit('site-domain', 'OnCancelEdit','<inp2:site-domain_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+				 ) );
+
+			 a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
+						reset_form('site-domain', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+					}
+			 	) );
+
+				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
+
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							go_to_id('site-domain', '<inp2:site-domain_PrevId/>');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+							go_to_id('site-domain', '<inp2:site-domain_NextId/>');
+						}
+				 ) );
+
+				a_toolbar.Render();
+
+				<inp2:m_if check="site-domain_IsSingle">
+					a_toolbar.HideButton('prev');
+					a_toolbar.HideButton('next');
+					a_toolbar.HideButton('sep1');
+				<inp2:m_else/>
+					<inp2:m_if check="site-domain_IsLast">
+						a_toolbar.DisableButton('next');
+					</inp2:m_if>
+					<inp2:m_if check="site-domain_IsFirst">
+						a_toolbar.DisableButton('prev');
+					</inp2:m_if>
+				</inp2:m_if>
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<inp2:site-domain_SaveWarning name="grid_save_warning"/>
+<inp2:site-domain_ErrorWarning name="form_error_warning"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="BillingCountry" title="la_fld_BillingCountry" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="ShippingCountry" title="la_fld_ShippingCountry" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryCurrencyId" title="la_fld_Currency" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="Currencies" title="la_fld_Currencies" optprefix="curr" option_key_field="CurrencyId" option_value_field="Translation"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryPaymentTypeId" title="la_fld_PaymentType" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_picker" prefix="site-domain" field="PaymentTypes" title="la_fld_PaymentTypes" optprefix="pt" option_key_field="PaymentTypeId" option_value_field="Name"/>
+		<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
+<inp2:m_include t="incs/footer"/>

Property changes on: releases/5.2.2-B2/admin_templates/site_domains/site_domain_edit.tpl
___________________________________________________________________
Added: svn:eol-style
   + LF


Property changes on: releases/5.2.2-B2/admin_templates/site_domains
___________________________________________________________________
Added: bugtraq:url
   + http://tracker.in-portal.org/view.php?id=%BUGID%
Added: bugtraq:logregex
   + (?:[Bb]ugs?|[Ii]ssues?|[Rr]eports?|[Ff]ixe?s?|[Rr]esolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+
(\d+)

Index: releases/5.2.2-B2/install/install_order.txt
===================================================================
--- releases/5.2.2-B2/install/install_order.txt	(revision 0)
+++ releases/5.2.2-B2/install/install_order.txt	(revision 16630)
@@ -0,0 +1 @@
+105
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/install_order.txt
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/module_info.xml
===================================================================
--- releases/5.2.2-B2/install/module_info.xml	(revision 0)
+++ releases/5.2.2-B2/install/module_info.xml	(revision 16630)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<module_info>
+	<name>In-Commerce</name>
+	<description>Commercial Shopping Cart</description>
+	<image>modules/in-commerce/install/img/icon_shopping_cart.gif</image>
+</module_info>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/module_info.xml
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/upgrades.php
===================================================================
--- releases/5.2.2-B2/install/upgrades.php	(revision 0)
+++ releases/5.2.2-B2/install/upgrades.php	(revision 16630)
@@ -0,0 +1,193 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	$upgrade_class = 'InCommerceUpgrades';
+
+	/**
+	 * Class, that holds all upgrade scripts for "In-Commerce" module
+	 *
+	 */
+	class InCommerceUpgrades extends kUpgradeHelper {
+
+		public function __construct()
+		{
+			parent::__construct();
+
+			$this->dependencies = Array (
+				'4.3.9' => Array ('Core' => '4.3.9'),
+				'5.0.0' => Array ('Core' => '5.0.0'),
+				'5.0.1' => Array ('Core' => '5.0.1'),
+				'5.0.2-B1' => Array ('Core' => '5.0.2-B1'),
+				'5.0.2-B2' => Array ('Core' => '5.0.2-B2'),
+				'5.0.2-RC1' => Array ('Core' => '5.0.2-RC1'),
+				'5.0.2' => Array ('Core' => '5.0.2'),
+				'5.0.3-B1' => Array ('Core' => '5.0.3-B1'),
+				'5.0.3-B2' => Array ('Core' => '5.0.3-B2'),
+				'5.0.3-RC1' => Array ('Core' => '5.0.3-RC1'),
+				'5.0.3' => Array ('Core' => '5.0.3'),
+				'5.0.4-B1' => Array ('Core' => '5.0.4-B1'),
+				'5.0.4-B2' => Array ('Core' => '5.0.4-B2'),
+				'5.0.4' => Array ('Core' => '5.0.4'),
+				'5.1.0-B1' => Array ('Core' => '5.1.0-B1'),
+				'5.1.0-B2' => Array ('Core' => '5.1.0-B2'),
+				'5.1.0-RC1' => Array ('Core' => '5.1.0-RC1'),
+				'5.1.0' => Array ('Core' => '5.1.0'),
+				'5.1.1-B1' => Array ('Core' => '5.1.1-B1'),
+				'5.1.1-B2' => Array ('Core' => '5.1.1-B2'),
+				'5.1.1-RC1' => Array ('Core' => '5.1.1-RC1'),
+				'5.1.1' => Array ('Core' => '5.1.1'),
+				'5.1.2-B1' => Array ('Core' => '5.1.2-B1'),
+				'5.1.2-B2' => Array ('Core' => '5.1.2-B2'),
+				'5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'),
+				'5.1.2' => Array ('Core' => '5.1.2'),
+				'5.1.3-B1' => Array ('Core' => '5.1.3-B1'),
+				'5.1.3-B2' => Array ('Core' => '5.1.3-B2'),
+				'5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'),
+				'5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'),
+				'5.1.3' => Array ('Core' => '5.1.3'),
+				'5.2.0-B1' => Array ('Core' => '5.2.0-B1'),
+				'5.2.0-B2' => Array ('Core' => '5.2.0-B2'),
+				'5.2.0-B3' => Array ('Core' => '5.2.0-B3'),
+				'5.2.0-RC1' => Array ('Core' => '5.2.0-RC1'),
+				'5.2.0' => Array ('Core' => '5.2.0'),
+				'5.2.1-B1' => Array ('Core' => '5.2.1-B1'),
+				'5.2.1-B2' => Array ('Core' => '5.2.1-B2'),
+				'5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'),
+				'5.2.1' => Array ('Core' => '5.2.1'),
+				'5.2.2-B1' => Array ('Core' => '5.2.2-B1'),
+			);
+		}
+
+		/**
+		 * Changes table structure, where multilingual fields of TEXT type are present
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_5_0_0($mode)
+		{
+			if ($mode == 'after') {
+				// update icon
+				$root_category = $this->Application->findModule('Name', 'In-Commerce', 'RootCat');
+
+				$sql = 'UPDATE ' . $this->Application->getUnitOption('c', 'TableName') . '
+						SET UseMenuIconUrl = 1, MenuIconUrl = "in-commerce/img/menu_products.gif"
+						WHERE ' . $this->Application->getUnitOption('c', 'IDField') . ' = ' . $root_category;
+				$this->Conn->Query($sql);
+
+				$this->_updateDetailTemplate('p', 'in-commerce/product/details', 'in-commerce/designs/detail');
+
+				// copy store name to company name
+				$store_name = $this->Application->ConfigValue('Comm_StoreName');
+
+				$sql = 'UPDATE ' . TABLE_PREFIX . 'ConfigurationValues
+						SET VariableValue = ' . $this->Conn->qstr($store_name) . '
+						WHERE VariableName = "Comm_CompanyName"';
+				$this->Conn->Query($sql);
+			}
+		}
+
+		/**
+		 * Update to 5.0.1, update details template
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		function Upgrade_5_0_1($mode)
+		{
+			if ($mode == 'after') {
+				$this->_updateDetailTemplate('p', 'in-commerce/designs/detail', 'in-commerce/products/product_detail');
+
+				// clean incomplete orders 5+ hours old
+				// don't use ORDER_STATUS_INCOMPLETE constant, since it's not available upgrade
+				$delete_timestamp = time() - (3600 * 5);
+				$sql = 'SELECT OrderId FROM ' . TABLE_PREFIX . 'Orders
+							WHERE Status = ' . 0 . '
+							AND OrderDate < ' . $delete_timestamp;
+
+				$orders_to_delete = $this->Conn->GetCol($sql);
+
+				if ( $orders_to_delete && is_array($orders_to_delete) ) {
+
+					$this->Conn->Query( 'DELETE FROM ' . TABLE_PREFIX . 'OrderItems
+											WHERE OrderId IN ( ' . implode(',', $orders_to_delete) . ' )' );
+
+					$this->Conn->Query( 'DELETE FROM ' . TABLE_PREFIX . 'Orders
+											WHERE Status = ' . 0 . '
+											AND OrderDate < ' . $delete_timestamp );
+				}
+
+				// delete old events
+				$events_to_delete = Array ( 'SITE.SUGGEST' );
+
+				$sql = 'SELECT EventId FROM ' . TABLE_PREFIX . 'Events
+							WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
+				$event_ids = $this->Conn->GetCol($sql);
+
+				if ($event_ids) {
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
+								WHERE EventId IN (' . implode(',', $event_ids) . ')';
+					$this->Conn->Query($sql);
+
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
+								WHERE EventId IN (' . implode(',', $event_ids) . ')';
+					$this->Conn->Query($sql);
+
+					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+								WHERE Phrase IN ("la_event_user.suggest_site")';
+					$this->Conn->Query($sql);
+				}
+			}
+		}
+
+		/**
+		 * Update to 5.2.0-RC1
+		 *
+		 * @param string $mode when called mode {before, after)
+		 */
+		public function Upgrade_5_2_0_RC1($mode)
+		{
+			if ( $mode != 'before' ) {
+				return;
+			}
+
+			$table_name = $this->Application->getUnitOption('pt', 'TableName');
+			$table_structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field');
+
+			if ( isset($table_structure['Description']) ) {
+				$sql = 'UPDATE ' . $table_name . '
+						SET Description = ""
+						WHERE Description IS NULL';
+				$this->Conn->Query($sql);
+
+				$sql = 'ALTER TABLE ' . $table_name . '
+						CHANGE `Description` `Description` VARCHAR(255) NOT NULL DEFAULT ""';
+				$this->Conn->Query($sql);
+			}
+
+			/** @var kMultiLanguageHelper $ml_helper */
+			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
+
+			$ml_helper->createFields('pt');
+
+			if ( isset($table_structure['Description']) ) {
+				$sql = 'UPDATE ' . $table_name . '
+						SET
+							l' . $this->Application->GetDefaultLanguageId() . '_Description = Description,
+							l' . $this->Application->GetDefaultLanguageId() . '_Instructions = Instructions';
+				$this->Conn->Query($sql);
+
+				$sql = 'ALTER TABLE ' . $table_name . ' DROP Description, DROP Instructions';
+				$this->Conn->Query($sql);
+			}
+		}
+	}

Property changes on: releases/5.2.2-B2/install/upgrades.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.5
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/install_schema.sql
===================================================================
--- releases/5.2.2-B2/install/install_schema.sql	(revision 0)
+++ releases/5.2.2-B2/install/install_schema.sql	(revision 16630)
@@ -0,0 +1,747 @@
+CREATE TABLE Addresses (
+  AddressId int(11) NOT NULL auto_increment,
+  PortalUserId int(11) NOT NULL default '0',
+  `To` varchar(255) NOT NULL default '',
+  Company varchar(255) NOT NULL default '',
+  Phone varchar(255) NOT NULL default '',
+  Fax varchar(255) NOT NULL default '',
+  Email varchar(255) NOT NULL default '',
+  Address1 varchar(255) NOT NULL default '',
+  Address2 varchar(255) NOT NULL default '',
+  City varchar(255) NOT NULL default '',
+  State char(2) NOT NULL default '',
+  Zip varchar(20) NOT NULL default '',
+  Country char(3) NOT NULL default '',
+  LastUsedAsBilling tinyint(4) unsigned NOT NULL default '0',
+  LastUsedAsShipping tinyint(4) unsigned NOT NULL default '0',
+  IsProfileAddress tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (AddressId),
+  KEY PortalUserId (PortalUserId),
+  KEY LastUsedAsBilling (LastUsedAsBilling),
+  KEY LastUsedAsShipping (LastUsedAsShipping),
+  KEY IsProfileAddress (IsProfileAddress)
+);
+
+CREATE TABLE Currencies (
+  CurrencyId int(11) NOT NULL AUTO_INCREMENT,
+  ISO char(3) NOT NULL DEFAULT '',
+  Symbol varchar(255) DEFAULT NULL,
+  SymbolPosition tinyint(4) DEFAULT NULL,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  RateToPrimary double NOT NULL DEFAULT '1',
+  Modified int(11) DEFAULT NULL,
+  `Status` smallint(6) NOT NULL DEFAULT '1',
+  IsPrimary smallint(6) NOT NULL DEFAULT '0',
+  Priority int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (CurrencyId),
+  KEY Priority (Priority),
+  KEY IsPrimary (IsPrimary),
+  KEY Modified (Modified)
+);
+
+CREATE TABLE GatewayConfigFields (
+  GWConfigFieldId int(11) NOT NULL AUTO_INCREMENT,
+  SystemFieldName varchar(50) NOT NULL DEFAULT '',
+  FieldName varchar(100) NOT NULL DEFAULT '',
+  ElementType varchar(30) NOT NULL DEFAULT 'text',
+  ValueList mediumtext,
+  GatewayId int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (GWConfigFieldId),
+  KEY GatewayId (GatewayId)
+);
+
+CREATE TABLE GatewayConfigValues (
+  GWConfigValueId int(11) NOT NULL auto_increment,
+  GWConfigFieldId int(11) NOT NULL default '0',
+  PaymentTypeId int(11) NOT NULL default '0',
+  Value varchar(255) default NULL,
+  PRIMARY KEY  (GWConfigValueId),
+  KEY GWConfigFieldId (GWConfigFieldId),
+  KEY PaymentTypeId (PaymentTypeId)
+);
+
+CREATE TABLE Gateways (
+  GatewayId int(11) NOT NULL auto_increment,
+  Name varchar(100) NOT NULL default '',
+  ClassName varchar(150) NOT NULL default '',
+  ClassFile varchar(255) NOT NULL default '',
+  RequireCCFields tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (GatewayId)
+);
+
+CREATE TABLE Manufacturers (
+  ManufacturerId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Description text,
+  URL varchar(255) NOT NULL DEFAULT '',
+  Logo varchar(255) NOT NULL DEFAULT '',
+  IsPopular int(10) unsigned NOT NULL DEFAULT '0',
+  Address1 varchar(255) DEFAULT NULL,
+  Address2 varchar(255) DEFAULT NULL,
+  City varchar(255) DEFAULT NULL,
+  State varchar(50) DEFAULT NULL,
+  Zip varchar(50) DEFAULT NULL,
+  Country varchar(255) DEFAULT NULL,
+  Phone varchar(50) DEFAULT NULL,
+  Fax varchar(50) DEFAULT NULL,
+  Email varchar(255) DEFAULT NULL,
+  PRIMARY KEY (ManufacturerId)
+);
+
+CREATE TABLE OrderItems (
+  OrderItemId int(11) NOT NULL AUTO_INCREMENT,
+  OrderId int(11) NOT NULL DEFAULT '0',
+  ProductId int(11) NOT NULL DEFAULT '0',
+  ProductName varchar(255) NOT NULL DEFAULT '',
+  Quantity int(11) NOT NULL DEFAULT '0',
+  QuantityReserved int(11) DEFAULT NULL,
+  FlatPrice decimal(10,4) NOT NULL DEFAULT '0.0000',
+  Price decimal(10,4) NOT NULL DEFAULT '0.0000',
+  Cost double(10,4) NOT NULL DEFAULT '0.0000',
+  BackOrderFlag tinyint(4) DEFAULT '0',
+  Weight double DEFAULT NULL,
+  ShippingTypeId varchar(255) DEFAULT NULL,
+  ItemData text,
+  OptionsSalt bigint(11) DEFAULT '0',
+  SplitShippingGroup int(11) NOT NULL DEFAULT '0',
+  PackageNum int(11) NOT NULL DEFAULT '0',
+  ReturnType tinyint(3) unsigned NOT NULL DEFAULT '0',
+  ReturnAmount decimal(10,2) NOT NULL DEFAULT '0.00',
+  ReturnedOn int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (OrderItemId),
+  KEY OrderId (OrderId),
+  KEY ProductId (ProductId),
+  KEY BackOrderFlag (BackOrderFlag),
+  KEY PackageNum (PackageNum),
+  KEY ReturnType (ReturnType),
+  KEY ReturnedOn (ReturnedOn),
+  KEY Quantity (Quantity),
+  KEY QuantityReserved (QuantityReserved),
+  KEY OptionsSalt (OptionsSalt),
+  KEY SplitShippingGroup (SplitShippingGroup)
+);
+
+CREATE TABLE Orders (
+  OrderId int(11) NOT NULL AUTO_INCREMENT,
+  Number mediumint(9) NOT NULL DEFAULT '0',
+  SubNumber smallint(6) NOT NULL DEFAULT '0',
+  `Status` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  OnHold tinyint(3) unsigned NOT NULL DEFAULT '0',
+  OrderDate int(10) unsigned DEFAULT NULL,
+  PortalUserId int(11) NOT NULL DEFAULT '-1',
+  OrderIP varchar(30) NOT NULL DEFAULT '',
+  UserComment text,
+  AdminComment text,
+  BillingTo varchar(255) NOT NULL DEFAULT '',
+  BillingCompany varchar(255) NOT NULL DEFAULT '',
+  BillingPhone varchar(255) NOT NULL DEFAULT '',
+  BillingFax varchar(255) NOT NULL DEFAULT '',
+  BillingEmail varchar(255) NOT NULL DEFAULT '',
+  BillingAddress1 varchar(255) NOT NULL DEFAULT '',
+  BillingAddress2 varchar(255) NOT NULL DEFAULT '',
+  BillingCity varchar(255) NOT NULL DEFAULT '',
+  BillingState varchar(255) NOT NULL DEFAULT '',
+  BillingZip varchar(255) NOT NULL DEFAULT '',
+  BillingCountry varchar(255) NOT NULL DEFAULT 'USA',
+  VAT decimal(20,4) NOT NULL DEFAULT '0.0000',
+  VATPercent decimal(20,4) NOT NULL DEFAULT '0.0000',
+  PaymentType tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PaymentAccount varchar(255) NOT NULL DEFAULT '',
+  PaymentExpires int(10) unsigned DEFAULT NULL,
+  PaymentNameOnCard varchar(255) NOT NULL DEFAULT '',
+  PaymentCCExpDate varchar(5) NOT NULL DEFAULT '',
+  PaymentCardType varchar(255) NOT NULL DEFAULT '',
+  ShippingTo varchar(255) NOT NULL DEFAULT '',
+  ShippingCompany varchar(255) NOT NULL DEFAULT '',
+  ShippingPhone varchar(255) NOT NULL DEFAULT '',
+  ShippingFax varchar(255) NOT NULL DEFAULT '',
+  ShippingEmail varchar(255) NOT NULL DEFAULT '',
+  ShippingAddress1 varchar(255) NOT NULL DEFAULT '',
+  ShippingAddress2 varchar(255) NOT NULL DEFAULT '',
+  ShippingCity varchar(255) NOT NULL DEFAULT '',
+  ShippingState varchar(255) NOT NULL DEFAULT '',
+  ShippingZip varchar(255) NOT NULL DEFAULT '',
+  ShippingCountry varchar(255) NOT NULL DEFAULT 'USA',
+  ShippingType int(11) NOT NULL DEFAULT '0',
+  ShippingCost decimal(20,4) NOT NULL DEFAULT '0.0000',
+  ShippingCustomerAccount varchar(255) NOT NULL DEFAULT '',
+  ShippingTracking varchar(255) NOT NULL DEFAULT '',
+  ShippingDate int(11) DEFAULT NULL,
+  SubTotal decimal(20,4) unsigned NOT NULL DEFAULT '0.0000',
+  ReturnTotal decimal(20,4) NOT NULL DEFAULT '0.0000',
+  CostTotal decimal(20,4) NOT NULL DEFAULT '0.0000',
+  OriginalAmount decimal(20,4) NOT NULL DEFAULT '0.0000',
+  ShippingOption tinyint(4) NOT NULL DEFAULT '0',
+  ShippingInfo text,
+  CouponId int(11) DEFAULT NULL,
+  CouponDiscount decimal(20,4) NOT NULL DEFAULT '0.0000',
+  DiscountTotal decimal(10,4) NOT NULL DEFAULT '0.0000',
+  TransactionStatus tinyint(3) unsigned NOT NULL DEFAULT '2',
+  GWResult1 mediumtext,
+  GWResult2 mediumtext,
+  AffiliateId int(10) unsigned NOT NULL DEFAULT '0',
+  VisitId int(10) unsigned NOT NULL DEFAULT '0',
+  AffiliateCommission decimal(10,4) NOT NULL DEFAULT '0.0000',
+  ProcessingFee decimal(20,4) DEFAULT '0.0000',
+  InsuranceFee decimal(20,4) NOT NULL DEFAULT '0.0000',
+  ShippingTaxable tinyint(1) NOT NULL DEFAULT '0',
+  ProcessingTaxable tinyint(1) NOT NULL DEFAULT '0',
+  IsRecurringBilling tinyint(4) NOT NULL DEFAULT '0',
+  NextCharge int(10) unsigned DEFAULT NULL,
+  GroupId int(10) unsigned NOT NULL DEFAULT '0',
+  ChargeOnNextApprove tinyint(4) NOT NULL DEFAULT '0',
+  ShippingGroupOption tinyint(4) NOT NULL DEFAULT '0',
+  GiftCertificateId int(11) DEFAULT NULL,
+  GiftCertificateDiscount decimal(20,4) NOT NULL DEFAULT '0.0000',
+  GoogleOrderNumber bigint(20) unsigned DEFAULT NULL,
+  VATIncluded tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (OrderId),
+  KEY AffiliateId (AffiliateId),
+  KEY VisitId (VisitId),
+  KEY GoogleOrderNumber (GoogleOrderNumber),
+  KEY Number (Number),
+  KEY SubNumber (SubNumber),
+  KEY `Status` (`Status`),
+  KEY OrderDate (OrderDate),
+  KEY PaymentType (PaymentType),
+  KEY CouponId (CouponId),
+  KEY GroupId (GroupId),
+  KEY GiftCertificateId (GiftCertificateId)
+);
+
+CREATE TABLE GiftCertificates (
+  GiftCertificateId int(11) NOT NULL AUTO_INCREMENT,
+  OrderId int(11) DEFAULT '0',
+  Purchaser varchar(64) DEFAULT NULL,
+  Recipient varchar(64) DEFAULT NULL,
+  SendVia tinyint(1) NOT NULL DEFAULT '0',
+  RecipientEmail varchar(64) NOT NULL DEFAULT '',
+  RecipientFirstname varchar(128) DEFAULT NULL,
+  RecipientLastname varchar(128) DEFAULT NULL,
+  RecipientAddress1 varchar(255) DEFAULT NULL,
+  RecipientAddress2 varchar(255) DEFAULT NULL,
+  RecipientCity varchar(64) DEFAULT NULL,
+  RecipientState varchar(32) DEFAULT NULL,
+  RecipientZipcode varchar(32) DEFAULT NULL,
+  RecipientCountry char(3) NOT NULL DEFAULT 'USA',
+  RecipientPhone varchar(32) DEFAULT NULL,
+  Message text,
+  Amount decimal(12,2) DEFAULT '0.00',
+  Debit decimal(12,2) DEFAULT '0.00',
+  `Status` tinyint(1) NOT NULL DEFAULT '2',
+  AddDate int(11) DEFAULT '0',
+  Expiration int(11) DEFAULT NULL,
+  `Code` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (GiftCertificateId),
+  UNIQUE KEY `Code` (`Code`),
+  KEY OrderId (OrderId),
+  KEY `Status` (`Status`),
+  KEY AddDate (AddDate)
+);
+
+CREATE TABLE PaymentTypeCurrencies (
+  PaymentTypeCurrencyId int(11) NOT NULL auto_increment,
+  PaymentTypeId int(11) NOT NULL default '0',
+  CurrencyId int(11) NOT NULL default '0',
+  PRIMARY KEY  (PaymentTypeCurrencyId),
+  KEY PaymentTypeId (PaymentTypeId),
+  KEY CurrencyId (CurrencyId)
+);
+
+CREATE TABLE PaymentTypes (
+  PaymentTypeId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(100) NOT NULL DEFAULT '',
+  l1_Description varchar(255) DEFAULT '',
+  l2_Description varchar(255) DEFAULT '',
+  l3_Description varchar(255) DEFAULT '',
+  l4_Description varchar(255) DEFAULT '',
+  l5_Description varchar(255) DEFAULT '',
+  l1_Instructions text,
+  l2_Instructions text,
+  l3_Instructions text,
+  l4_Instructions text,
+  l5_Instructions text,
+  AdminComments text,
+  `Status` int(11) NOT NULL DEFAULT '0',
+  Priority int(11) NOT NULL DEFAULT '0',
+  IsPrimary tinyint(4) NOT NULL DEFAULT '0',
+  BuiltIn smallint(6) NOT NULL DEFAULT '0',
+  GatewayId int(11) NOT NULL DEFAULT '1',
+  PlacedOrdersEdit tinyint(4) NOT NULL DEFAULT '0',
+  ProcessingFee double NOT NULL DEFAULT '0',
+  PortalGroups text,
+  PRIMARY KEY (PaymentTypeId),
+  KEY `Status` (`Status`),
+  KEY Priority (Priority),
+  KEY GatewayId (GatewayId),
+  KEY BuiltIn (BuiltIn),
+  KEY IsPrimary (IsPrimary),
+  KEY l1_Description (l1_Description(5)),
+  KEY l2_Description (l2_Description(5)),
+  KEY l3_Description (l3_Description(5)),
+  KEY l4_Description (l4_Description(5)),
+  KEY l5_Description (l5_Description(5)),
+  KEY l1_Instructions (l1_Instructions(5)),
+  KEY l2_Instructions (l2_Instructions(5)),
+  KEY l3_Instructions (l3_Instructions(5)),
+  KEY l4_Instructions (l4_Instructions(5)),
+  KEY l5_Instructions (l5_Instructions(5))
+);
+
+CREATE TABLE Products (
+  ProductId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) DEFAULT '',
+  l1_Name varchar(255) DEFAULT NULL,
+  l2_Name varchar(255) DEFAULT NULL,
+  l3_Name varchar(255) DEFAULT NULL,
+  l4_Name varchar(255) DEFAULT NULL,
+  l5_Name varchar(255) DEFAULT NULL,
+  AutomaticFilename tinyint(3) unsigned NOT NULL DEFAULT '1',
+  SKU varchar(255) DEFAULT NULL,
+  `Type` tinyint(2) unsigned NOT NULL DEFAULT '1',
+  Description text,
+  l1_Description text,
+  l2_Description text,
+  l3_Description text,
+  l4_Description text,
+  l5_Description text,
+  DescriptionExcerpt text,
+  l1_DescriptionExcerpt text,
+  l2_DescriptionExcerpt text,
+  l3_DescriptionExcerpt text,
+  l4_DescriptionExcerpt text,
+  l5_DescriptionExcerpt text,
+  Weight double(10,4) DEFAULT NULL,
+  ManufacturerId int(11) NOT NULL DEFAULT '0',
+  MSRP double DEFAULT NULL,
+  BackOrder tinyint(3) unsigned NOT NULL DEFAULT '2',
+  BackOrderDate int(11) DEFAULT NULL,
+  CreatedOn int(10) unsigned DEFAULT NULL,
+  Modified int(10) unsigned DEFAULT NULL,
+  Expire int(10) unsigned DEFAULT NULL,
+  Hits double NOT NULL DEFAULT '0',
+  CachedRating varchar(10) NOT NULL DEFAULT '0',
+  CachedVotesQty int(11) NOT NULL DEFAULT '0',
+  CachedReviewsQty int(11) NOT NULL DEFAULT '0',
+  CreatedById int(11) DEFAULT NULL,
+  ModifiedById int(11) DEFAULT NULL,
+  Priority int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  EditorsPick tinyint(4) NOT NULL DEFAULT '0',
+  Featured tinyint(4) NOT NULL DEFAULT '0',
+  OnSale tinyint(1) NOT NULL DEFAULT '0',
+  ResourceId int(11) DEFAULT NULL,
+  HotItem tinyint(4) NOT NULL DEFAULT '2',
+  PopItem tinyint(4) NOT NULL DEFAULT '2',
+  NewItem tinyint(4) NOT NULL DEFAULT '2',
+  InventoryStatus tinyint(4) NOT NULL DEFAULT '0',
+  QtyInStock int(11) NOT NULL DEFAULT '0',
+  QtyInStockMin int(11) NOT NULL DEFAULT '0',
+  QtyReserved int(11) NOT NULL DEFAULT '0',
+  QtyBackOrdered int(11) NOT NULL DEFAULT '0',
+  QtyOnOrder int(11) NOT NULL DEFAULT '0',
+  InventoryComment text,
+  AccessGroupId int(11) DEFAULT NULL,
+  AccessDuration int(11) DEFAULT NULL,
+  AccessDurationType tinyint(4) DEFAULT NULL,
+  AccessStart int(11) DEFAULT NULL,
+  AccessEnd int(11) DEFAULT NULL,
+  Virtual tinyint(4) NOT NULL DEFAULT '0',
+  ProcessingData text,
+  PackageContent mediumtext,
+  OptionsSelectionMode tinyint(4) DEFAULT '0',
+  HasRequiredOptions tinyint(1) NOT NULL DEFAULT '0',
+  IsRecurringBilling tinyint(3) unsigned NOT NULL DEFAULT '0',
+  ShippingMode tinyint(1) NOT NULL DEFAULT '0',
+  ShippingLimitation text,
+  AssignedCoupon int(11) NOT NULL DEFAULT '0',
+  MinQtyFreePromoShipping int(11) NOT NULL DEFAULT '0',
+  MetaKeywords varchar(255) DEFAULT NULL,
+  MetaDescription text,
+  PRIMARY KEY (ProductId),
+  KEY ResourceId (ResourceId),
+  KEY Hits (Hits),
+  KEY `Name` (`Name`),
+  KEY EditorsPick (EditorsPick),
+  KEY CreatedOn (CreatedOn),
+  KEY Modified (Modified,CreatedOn),
+  KEY `Status` (`Status`),
+  KEY l1_Name (l1_Name),
+  KEY Priority (Priority),
+  KEY ManufacturerId (ManufacturerId),
+  KEY NewItem (NewItem),
+  KEY PopItem (PopItem),
+  KEY HotItem (HotItem),
+  KEY Featured (Featured),
+  KEY OnSale (OnSale),
+  KEY Expire (Expire),
+  KEY Virtual (Virtual),
+  KEY AccessGroupId (AccessGroupId)
+);
+
+CREATE TABLE ProductsCouponItems (
+  CouponItemId int(11) NOT NULL auto_increment,
+  CouponId int(11) default NULL,
+  ItemResourceId int(11) default NULL,
+  ItemType TINYINT(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY  (CouponItemId),
+  KEY DiscountId (CouponId),
+  KEY ItemResourceId (ItemResourceId),
+  KEY ItemType (ItemType)
+);
+
+CREATE TABLE ProductsCoupons (
+  CouponId int(11) NOT NULL auto_increment,
+  `Status` tinyint(4) NOT NULL default '1',
+  Name varchar(255) default NULL,
+  Code varchar(255) default NULL,
+  Expiration int(11) default NULL,
+  GroupId int(11) default NULL,
+  `Type` tinyint(1) NOT NULL default '1',
+  Amount double default NULL,
+  LastUsedBy int(11) default NULL,
+  LastUsedOn int(11) default NULL,
+  NumberOfUses int(11) default '1',
+  PRIMARY KEY  (CouponId),
+  KEY `Status` (`Status`),
+  KEY Code (Code)
+);
+
+CREATE TABLE ProductsDiscountItems (
+  DiscountItemId int(11) NOT NULL auto_increment,
+  DiscountId int(11) default NULL,
+  ItemResourceId int(11) default NULL,
+  ItemType TINYINT(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY  (DiscountItemId),
+  KEY DiscountId (DiscountId),
+  KEY ItemResourceId (ItemResourceId),
+  KEY ItemType (ItemType)
+);
+
+CREATE TABLE ProductsDiscounts (
+  DiscountId int(11) NOT NULL auto_increment,
+  `Status` tinyint(4) default '2',
+  `Name` varchar(255) default NULL,
+  `Start` int(11) default NULL,
+  `End` int(11) default NULL,
+  GroupId int(11) default NULL,
+  `Type` tinyint(1) default '1',
+  Amount double default NULL,
+  PRIMARY KEY  (DiscountId),
+  KEY `Status` (`Status`)
+);
+
+CREATE TABLE ProductsPricing (
+  PriceId int(11) NOT NULL auto_increment,
+  ProductId int(11) NOT NULL default '0',
+  MinQty int(11) default NULL,
+  MaxQty int(11) default NULL,
+  Cost decimal(10,4) default NULL,
+  Price decimal(10,4) NOT NULL default '0.0000',
+  Negotiated tinyint(1) default NULL,
+  Points int(11) default NULL,
+  AccessDuration int(11) NOT NULL default '0',
+  AccessUnit int(11) NOT NULL default '0',
+  Description varchar(255) default NULL,
+  IsPrimary tinyint(4) NOT NULL default '0',
+  GroupId int(11) NOT NULL default '0',
+  PRIMARY KEY  (PriceId),
+  KEY ProductId (ProductId),
+  KEY GroupId (GroupId),
+  KEY IsPrimary (IsPrimary)
+);
+
+CREATE TABLE ProductFiles (
+  FileId int(11) NOT NULL AUTO_INCREMENT,
+  ProductId int(11) NOT NULL DEFAULT '0',
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Version varchar(100) NOT NULL DEFAULT '',
+  FilePath varchar(255) NOT NULL DEFAULT '',
+  RealPath varchar(255) NOT NULL DEFAULT '',
+  Size int(11) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '0',
+  IsPrimary tinyint(4) NOT NULL DEFAULT '0',
+  Priority smallint(6) NOT NULL DEFAULT '0',
+  AddedOn int(11) DEFAULT NULL,
+  AddedById int(11) DEFAULT NULL,
+  MIMEType varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (FileId),
+  KEY ProductId (ProductId),
+  KEY `Status` (`Status`),
+  KEY IsPrimary (IsPrimary),
+  KEY Priority (Priority),
+  KEY AddedOn (AddedOn)
+);
+
+CREATE TABLE UserFileAccess (
+  FileAccessId int(11) NOT NULL AUTO_INCREMENT,
+  ProductId int(11) NOT NULL DEFAULT '0',
+  PortalUserId int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (FileAccessId),
+  KEY ProductId (ProductId),
+  KEY PortalUserId (PortalUserId)
+);
+
+CREATE TABLE UserDownloads (
+  DownloadId int(11) NOT NULL AUTO_INCREMENT,
+  PortalUserId int(11) NOT NULL DEFAULT '0',
+  Username varchar(255) NOT NULL DEFAULT '',
+  ProductId int(11) NOT NULL DEFAULT '0',
+  ProductName varchar(255) NOT NULL DEFAULT '',
+  FileId int(11) NOT NULL DEFAULT '0',
+  Filename varchar(255) NOT NULL DEFAULT '',
+  IPAddress varchar(100) NOT NULL DEFAULT '',
+  StartedOn int(11) DEFAULT NULL,
+  EndedOn int(11) DEFAULT NULL,
+  PRIMARY KEY (DownloadId),
+  KEY PortalUserId (PortalUserId),
+  KEY ProductId (ProductId)
+);
+
+CREATE TABLE ShippingBrackets (
+  BracketId int(11) NOT NULL auto_increment,
+  ShippingTypeID int(11) NOT NULL default '0',
+  Start double NOT NULL default '0',
+  End double NOT NULL default '0',
+  PRIMARY KEY  (BracketId),
+  KEY ShippingTypeID (ShippingTypeID),
+  KEY Start (Start),
+  KEY End (End)
+);
+
+CREATE TABLE ShippingCosts (
+  ShippingCostId int(11) NOT NULL auto_increment,
+  ZoneID int(11) NOT NULL default '0',
+  BracketId int(11) NOT NULL default '0',
+  Flat decimal(10,4) default NULL,
+  PerUnit decimal(10,4) default NULL,
+  PRIMARY KEY  (ShippingCostId),
+  KEY ZoneID (ZoneID),
+  KEY BracketId (BracketId)
+);
+
+CREATE TABLE ShippingQuoteEngines (
+  EngineId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  FlatSurcharge double NOT NULL DEFAULT '0',
+  PercentSurcharge double NOT NULL DEFAULT '0',
+  `Status` smallint(6) NOT NULL DEFAULT '0',
+  Properties text,
+  ClassName varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (EngineId),
+  KEY `Status` (`Status`)
+);
+
+CREATE TABLE ShippingType (
+  ShippingID int(11) NOT NULL AUTO_INCREMENT,
+  `Code` varchar(25) NOT NULL DEFAULT '',
+  `Name` varchar(100) NOT NULL DEFAULT '',
+  SpeedCode varchar(25) NOT NULL DEFAULT '',
+  LocationFrom int(11) NOT NULL DEFAULT '1',
+  `Type` int(11) NOT NULL DEFAULT '1',
+  BaseFee double NOT NULL DEFAULT '0',
+  CODFlatSurcharge double NOT NULL DEFAULT '0',
+  CODPercentSurcharge double NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '1',
+  CostType tinyint(4) NOT NULL DEFAULT '1',
+  ZeroIfEmpty tinyint(4) NOT NULL DEFAULT '1',
+  PrecisionBeforeSep tinyint(4) NOT NULL DEFAULT '2',
+  PrecisionAfterSep tinyint(4) NOT NULL DEFAULT '2',
+  PortalGroups text,
+  FreeShippingMinAmount double(10,4) NOT NULL DEFAULT '0.0000',
+  IsFreePromoShipping tinyint(1) NOT NULL DEFAULT '0',
+  InsuranceFee decimal(10,2) DEFAULT NULL,
+  InsuranceType tinyint(1) NOT NULL DEFAULT '2',
+  PRIMARY KEY (ShippingID),
+  KEY `Type` (`Type`),
+  KEY `Status` (`Status`)
+);
+
+CREATE TABLE ShippingZones (
+  ZoneID int(11) NOT NULL auto_increment,
+  ShippingTypeID int(11) NOT NULL default '0',
+  Name varchar(100) NOT NULL default '',
+  Type int(11) NOT NULL default '1',
+  CODallowed smallint(6) NOT NULL default '1',
+  PRIMARY KEY  (ZoneID),
+  KEY ShippingTypeID (ShippingTypeID),
+  KEY `Type` (`Type`)
+);
+
+CREATE TABLE ShippingZonesDestinations (
+  ZoneDestId int(11) NOT NULL auto_increment,
+  ShippingZoneId int(11) NOT NULL default '0',
+  StdDestId int(11) default '0',
+  DestValue varchar(255) default NULL,
+  PRIMARY KEY  (ZoneDestId),
+  KEY ShippingZoneId (ShippingZoneId),
+  KEY StdDestId (StdDestId)
+);
+
+CREATE TABLE TaxZones (
+  TaxZoneId int(11) NOT NULL auto_increment,
+  Name varchar(100) NOT NULL default '',
+  Type int(11) NOT NULL default '1',
+  TaxValue double NOT NULL default '0',
+  ApplyToShipping TINYINT( 1 ) NOT NULL DEFAULT '0',
+  ApplyToProcessing TINYINT( 1 ) NOT NULL DEFAULT '0',
+  PRIMARY KEY  (TaxZoneId)
+);
+
+CREATE TABLE TaxZonesDestinations (
+  TaxZoneDestId int(11) NOT NULL auto_increment,
+  TaxZoneId int(11) NOT NULL default '0',
+  StdDestId int(11) default '0',
+  DestValue varchar(255) default NULL,
+  PRIMARY KEY  (TaxZoneDestId),
+  KEY TaxZoneId (TaxZoneId),
+  KEY StdDestId (StdDestId)
+);
+
+CREATE TABLE AffiliatePayments (
+  AffiliatePaymentId int(11) NOT NULL AUTO_INCREMENT,
+  AffiliateId int(10) unsigned NOT NULL DEFAULT '0',
+  PaymentDate int(10) unsigned DEFAULT NULL,
+  Amount decimal(10,2) NOT NULL DEFAULT '0.00',
+  `Comment` text,
+  PaymentReference varchar(255) NOT NULL DEFAULT '',
+  PaymentTypeId int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (AffiliatePaymentId),
+  KEY AffiliateId (AffiliateId),
+  KEY PaymentDate (PaymentDate),
+  KEY PaymentTypeId (PaymentTypeId)
+);
+
+CREATE TABLE AffiliatePaymentTypes (
+  PaymentTypeId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Description text,
+  IsPrimary tinyint(4) NOT NULL DEFAULT '0',
+  `Status` tinyint(4) NOT NULL DEFAULT '0',
+  Priority tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (PaymentTypeId),
+  KEY IsPrimary (IsPrimary),
+  KEY `Status` (`Status`),
+  KEY Priority (Priority)
+);
+
+CREATE TABLE AffiliatePlans (
+  AffiliatePlanId int(11) NOT NULL auto_increment,
+  Name varchar(255) NOT NULL default '',
+  PlanType tinyint(3) unsigned NOT NULL default '1',
+  ResetInterval int(10) unsigned NOT NULL default '0',
+  PaymentType tinyint(4) NOT NULL default '0',
+  MinPaymentAmount varchar(255) NOT NULL default '',
+  Enabled tinyint(4) unsigned NOT NULL default '0',
+  IsPrimary tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (AffiliatePlanId),
+  KEY PaymentType (PaymentType),
+  KEY Enabled (Enabled),
+  KEY IsPrimary (IsPrimary)
+);
+
+CREATE TABLE AffiliatePlansBrackets (
+  AffiliateBracketId int(11) NOT NULL auto_increment,
+  AffiliatePlanId int(11) NOT NULL default '0',
+  FromAmount decimal(10,4) NOT NULL default '0.0000',
+  ToAmount decimal(10,4) NOT NULL default '0.0000',
+  Percent decimal(10,2) NOT NULL default '0.00',
+  PRIMARY KEY  (AffiliateBracketId),
+  KEY AffiliatePlanId (AffiliatePlanId)
+);
+
+CREATE TABLE AffiliatePlansItems (
+  AffiliateItemId int(11) NOT NULL auto_increment,
+  AffiliatePlanId int(11) NOT NULL default '0',
+  ItemResourceId int(10) unsigned NOT NULL default '0',
+  ItemType tinyint(4) NOT NULL default '1',
+  PRIMARY KEY  (AffiliateItemId),
+  KEY AffiliatePlanId (AffiliatePlanId),
+  KEY ItemResourceId (ItemResourceId),
+  KEY ItemType (ItemType)
+);
+
+CREATE TABLE Affiliates (
+  AffiliateId int(11) NOT NULL AUTO_INCREMENT,
+  PortalUserId int(10) DEFAULT NULL,
+  AffiliatePlanId int(10) unsigned NOT NULL DEFAULT '0',
+  AccumulatedAmount decimal(10,2) NOT NULL DEFAULT '0.00',
+  AmountToPay decimal(10,2) NOT NULL DEFAULT '0.00',
+  LastPaymentDate int(11) unsigned DEFAULT NULL,
+  LastOrderDate int(11) unsigned DEFAULT NULL,
+  `Status` tinyint(4) NOT NULL DEFAULT '2',
+  AffiliateCode varchar(30) NOT NULL DEFAULT '',
+  ItemsSold int(10) unsigned NOT NULL DEFAULT '0',
+  PaymentTypeId int(11) NOT NULL DEFAULT '0',
+  SSN varchar(100) NOT NULL DEFAULT '',
+  Comments text,
+  CreatedOn int(11) DEFAULT NULL,
+  PRIMARY KEY (AffiliateId),
+  UNIQUE KEY AffiliateCode (AffiliateCode),
+  UNIQUE KEY PortalUserId (PortalUserId),
+  KEY LastOrderDate (LastOrderDate),
+  KEY AffiliatePlanId (AffiliatePlanId),
+  KEY `Status` (`Status`),
+  KEY PaymentTypeId (PaymentTypeId),
+  KEY CreatedOn (CreatedOn)
+);
+
+CREATE TABLE ProductOptionCombinations (
+  CombinationId int(11) NOT NULL AUTO_INCREMENT,
+  ProductId int(11) NOT NULL DEFAULT '0',
+  Combination text,
+  CombinationCRC bigint(11) NOT NULL DEFAULT '0',
+  PriceType tinyint(1) DEFAULT '3',
+  Price float DEFAULT NULL,
+  WeightType tinyint(1) DEFAULT '3',
+  Weight float DEFAULT NULL,
+  Availability tinyint(1) NOT NULL DEFAULT '1',
+  Priority int(11) NOT NULL DEFAULT '0',
+  QtyInStock int(11) NOT NULL DEFAULT '0',
+  QtyReserved int(11) NOT NULL DEFAULT '0',
+  QtyBackOrdered int(11) NOT NULL DEFAULT '0',
+  QtyOnOrder int(11) NOT NULL DEFAULT '0',
+  SKU varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (CombinationId),
+  KEY CombinationCRC (CombinationCRC),
+  KEY ProductId (ProductId),
+  KEY Availability (Availability)
+);
+
+CREATE TABLE ProductOptions (
+  ProductOptionId int(11) NOT NULL auto_increment,
+  ProductId int(11) NOT NULL default '0',
+  Name varchar(255) NOT NULL default '',
+  OptionType TINYINT(4) NOT NULL DEFAULT '0',
+  Required tinyint(4) NOT NULL default '0',
+  Listable tinyint(4) NOT NULL default '0',
+  Priority int(11) NOT NULL default '0',
+  `Values` text,
+  Prices text,
+  PriceTypes text,
+  PRIMARY KEY  (ProductOptionId),
+  KEY ProductId (ProductId,Priority),
+  KEY OptionType (OptionType),
+  KEY Listable (Listable)
+);
+
+CREATE TABLE ProductsCustomData (
+  CustomDataId int(11) NOT NULL auto_increment,
+  ResourceId int(10) unsigned NOT NULL default '0',
+  KEY ResourceId (ResourceId),
+  PRIMARY KEY  (CustomDataId)
+);
+
+ALTER TABLE SiteDomains
+	ADD COLUMN BillingCountry varchar(3) NOT NULL DEFAULT '',
+	ADD COLUMN ShippingCountry varchar(3) NOT NULL DEFAULT '',
+	ADD COLUMN PrimaryCurrencyId int(11) NOT NULL DEFAULT '0',
+	ADD COLUMN Currencies varchar(255) NOT NULL DEFAULT '',
+	ADD COLUMN PrimaryPaymentTypeId int(11) NOT NULL DEFAULT '0',
+	ADD COLUMN PaymentTypes varchar(255) NOT NULL DEFAULT '',
+	ADD INDEX (BillingCountry),
+	ADD INDEX (ShippingCountry),
+	ADD INDEX (PrimaryCurrencyId),
+	ADD INDEX (Currencies),
+	ADD INDEX (PrimaryPaymentTypeId),
+	ADD INDEX (PaymentTypes);
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/install_schema.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.2
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/upgrades.sql
===================================================================
--- releases/5.2.2-B2/install/upgrades.sql	(revision 0)
+++ releases/5.2.2-B2/install/upgrades.sql	(revision 16630)
@@ -0,0 +1,304 @@
+# ===== v 4.3.9 =====
+
+INSERT INTO ImportScripts VALUES (DEFAULT, 'Products from CSV file [In-Commerce]', '', 'p', 'In-Commerce', '', 'CSV', '1');
+
+ALTER TABLE Products ADD OnSale TINYINT(1) NOT NULL default '0' AFTER Featured, ADD INDEX (OnSale);
+
+UPDATE Phrase SET Module = 'In-Commerce' WHERE Phrase IN ('lu_comm_Images', 'lu_comm_ImagesHeader');
+
+# ===== v 5.0.0 =====
+UPDATE Category SET Template = '/in-commerce/designs/section' WHERE Template = 'in-commerce/store/category';
+UPDATE Category SET CachedTemplate = '/in-commerce/designs/section' WHERE CachedTemplate = 'in-commerce/store/category';
+
+UPDATE ConfigurationValues SET VariableValue = '/in-commerce/designs/section' WHERE VariableName = 'p_CategoryTemplate';
+UPDATE ConfigurationValues SET VariableValue = 'in-commerce/designs/detail' WHERE VariableName = 'p_ItemTemplate';
+
+DELETE FROM PersistantSessionData WHERE VariableName IN ('affil_columns_.', 'ap_columns_.', 'apayments_columns_.', 'apayments.log_columns_.', 'd_columns_.', 'coup_columns_.', 'file_columns_.', 'po_columns_.', 'z_columns_.', 'tax_columns_.');
+DELETE FROM PersistantSessionData WHERE VariableName LIKE '%ord.%';
+
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:products.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:setting_folder.view', 11, 1, 1, 0);
+
+INSERT INTO ShippingQuoteEngines VALUES (DEFAULT, 'USPS.com', 0, 0, 0, 'a:21:{s:12:"AccountLogin";s:0:"";s:15:"AccountPassword";N;s:10:"UPSEnabled";N;s:10:"UPSAccount";s:0:"";s:11:"UPSInvoiced";N;s:10:"FDXEnabled";N;s:10:"FDXAccount";s:0:"";s:10:"DHLEnabled";N;s:10:"DHLAccount";s:0:"";s:11:"DHLInvoiced";N;s:10:"USPEnabled";N;s:10:"USPAccount";s:0:"";s:11:"USPInvoiced";N;s:10:"ARBEnabled";N;s:10:"ARBAccount";s:0:"";s:11:"ARBInvoiced";N;s:10:"1DYEnabled";N;s:10:"2DYEnabled";N;s:10:"3DYEnabled";N;s:10:"GNDEnabled";N;s:10:"ShipMethod";N;}', 'USPS');
+
+INSERT INTO ConfigurationAdmin VALUES ('Comm_CompanyName', 'la_Text_ContactsGeneral', 'la_text_CompanyName', 'text', NULL, NULL, 10.01, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Comm_CompanyName', '', 'In-Commerce', 'in-commerce:contacts');
+
+UPDATE ConfigurationAdmin SET prompt = 'la_text_StoreName', DisplayOrder = 10.02 WHERE VariableName = 'Comm_StoreName';
+
+INSERT INTO ConfigurationAdmin VALUES ('Comm_Contacts_Name', 'la_Text_ContactsGeneral', 'la_text_ContactName', 'text', NULL, NULL, 10.03, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Comm_Contacts_Name', '', 'In-Commerce', 'in-commerce:contacts');
+
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.04 WHERE VariableName = 'Comm_Contacts_Phone';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.05 WHERE VariableName = 'Comm_Contacts_Fax';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.06 WHERE VariableName = 'Comm_Contacts_Email';
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.07 WHERE VariableName = 'Comm_Contacts_Additional';
+
+DELETE FROM Phrase WHERE Phrase IN ('la_fld_ManufacturerId', 'la_fld_DiscountId', 'la_fld_CouponId', 'la_fld_AffiliatePlanId', 'la_fld_AffiliateId', 'la_fld_ZoneId', 'la_fld_EngineId', 'la_fld_ShippingId', 'la_fld_ProductId', 'la_fld_OptionId', 'la_fld_CurrencyId', 'la_fld_Zone_Name');
+
+UPDATE Phrase SET Module = 'In-Commerce' WHERE ((Phrase LIKE '%Product%' OR Phrase LIKE '%Shipping%' OR Phrase LIKE '%Coupon%' OR Phrase LIKE '%Discount%' OR Phrase LIKE '%Report%' OR Phrase LIKE '%Currency%' OR Phrase LIKE '%Cart%') AND (Module = 'Core'));
+
+# ===== v 5.0.1 =====
+UPDATE ConfigurationValues SET VariableValue = 'in-commerce/products/product_detail' WHERE VariableName = 'p_ItemTemplate';
+
+UPDATE ConfigurationAdmin SET ValueList = '1=la_opt_Session,2=la_opt_PermanentCookie' WHERE VariableName = 'Comm_AffiliateStorageMethod';
+
+UPDATE ConfigurationAdmin SET ValueList = 'ASC=la_common_Ascending,DESC=la_common_Descending'
+WHERE VariableName IN ('product_OrderProductsByDir', 'product_OrderProductsThenByDir');
+
+UPDATE ConfigurationAdmin SET ValueList = '1=la_opt_PriceCalculationByPrimary,2=la_opt_PriceCalculationByOptimal'
+WHERE VariableName = 'Comm_PriceBracketCalculation';
+
+UPDATE ConfigurationAdmin
+SET ValueList = '1=la_opt_Sec,60=la_opt_Min,3600=la_opt_Hour,86400=la_opt_Day,604800=la_opt_Week,2419200=la_opt_Month,29030400=la_opt_Year'
+WHERE VariableName IN ('product_ReviewDelay_Interval', 'product_RatingDelay_Interval');
+
+UPDATE CustomField SET FieldLabel = 'la_fld_cust_p_ItemTemplate', Prompt = 'la_fld_cust_p_ItemTemplate' WHERE FieldName = 'p_ItemTemplate';
+
+UPDATE Events SET Type = 1 WHERE Event = 'BACKORDER.FULLFILL';
+
+UPDATE ConfigurationAdmin SET ValueList = 'style="width: 50px;"' WHERE VariableName IN ('product_RatingDelay_Value', 'product_ReviewDelay_Value');
+
+# ===== v 5.0.2-B1 =====
+ALTER TABLE AffiliatePayments
+	CHANGE Comment Comment text NULL,
+	CHANGE PaymentDate PaymentDate INT(10) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE AffiliatePaymentTypes CHANGE Description Description text NULL;
+
+ALTER TABLE Affiliates
+	CHANGE Comments Comments text NULL,
+	CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE Manufacturers CHANGE Description Description text NULL;
+
+ALTER TABLE Orders
+	CHANGE UserComment UserComment text NULL,
+	CHANGE AdminComment AdminComment text NULL,
+	CHANGE GWResult1 GWResult1 MEDIUMTEXT NULL,
+	CHANGE GWResult2 GWResult2 MEDIUMTEXT NULL,
+	CHANGE OrderDate OrderDate INT(10) UNSIGNED NULL DEFAULT NULL,
+	CHANGE PaymentExpires PaymentExpires INT(10) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE PaymentTypes CHANGE PortalGroups PortalGroups text NULL;
+ALTER TABLE ProductOptionCombinations CHANGE Combination Combination text NULL;
+
+ALTER TABLE Products
+	CHANGE ShippingLimitation ShippingLimitation text NULL,
+	CHANGE PackageContent PackageContent MEDIUMTEXT NULL;
+
+ALTER TABLE ShippingQuoteEngines CHANGE Properties Properties text NULL;
+ALTER TABLE ShippingType CHANGE PortalGroups PortalGroups text NULL;
+
+ALTER TABLE ProductFiles
+	CHANGE ProductId ProductId INT(11) NOT NULL DEFAULT '0',
+	CHANGE `Name` `Name` VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE Version Version VARCHAR(100) NOT NULL DEFAULT '',
+	CHANGE FilePath FilePath VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE RealPath RealPath VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE Size Size INT(11) NOT NULL DEFAULT '0',
+	CHANGE AddedOn AddedOn INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE UserFileAccess
+	CHANGE ProductId ProductId INT( 11 ) NOT NULL DEFAULT '0',
+	CHANGE PortalUserId PortalUserId INT( 11 ) NOT NULL DEFAULT '0';
+
+ALTER TABLE GatewayConfigFields CHANGE ValueList ValueList MEDIUMTEXT NULL;
+
+ALTER TABLE Currencies
+	CHANGE `Status` `Status` SMALLINT(6) NOT NULL DEFAULT '1',
+	CHANGE Modified Modified INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE GiftCertificates CHANGE `Status` `Status` TINYINT(1) NOT NULL DEFAULT '2';
+
+ALTER TABLE UserDownloads
+	CHANGE StartedOn StartedOn INT(11) NULL DEFAULT NULL,
+	CHANGE EndedOn EndedOn INT(11) NULL DEFAULT NULL;
+
+# ===== v 5.0.2-B2 =====
+
+# ===== v 5.0.2-RC1 =====
+
+# ===== v 5.0.2 =====
+
+# ===== v 5.0.3-B1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+	'la_ship_All_Together', 'la_ship_Backorders_Upon_Avail', 'la_ship_Backorder_Separately',
+	'lu_ship_Shipment', 'lu_ship_ShippingType'
+);
+
+# ===== v 5.0.3-B2 =====
+
+# ===== v 5.0.3-RC1 =====
+
+# ===== v 5.0.3 =====
+
+# ===== v 5.0.4-B1 =====
+
+# ===== v 5.0.4-B2 =====
+
+# ===== v 5.0.4 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce';
+
+UPDATE ConfigurationValues
+SET ValueList = '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, IsoCode AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>'
+WHERE ValueList = '0=lu_none||<SQL>SELECT DestName AS OptionName, DestAbbr AS OptionValue FROM <PREFIX>StdDestinations WHERE DestParentId IS NULL Order BY OptionName</SQL>';
+
+ALTER TABLE SiteDomains
+	ADD COLUMN BillingCountry varchar(3) NOT NULL DEFAULT '',
+	ADD COLUMN ShippingCountry varchar(3) NOT NULL DEFAULT '',
+	ADD COLUMN PrimaryCurrencyId int(11) NOT NULL DEFAULT '0',
+	ADD COLUMN Currencies varchar(255) NOT NULL DEFAULT '',
+	ADD COLUMN PrimaryPaymentTypeId int(11) NOT NULL DEFAULT '0',
+	ADD COLUMN PaymentTypes varchar(255) NOT NULL DEFAULT '',
+	ADD INDEX (BillingCountry),
+	ADD INDEX (ShippingCountry),
+	ADD INDEX (PrimaryCurrencyId),
+	ADD INDEX (Currencies),
+	ADD INDEX (PrimaryPaymentTypeId),
+	ADD INDEX (PaymentTypes);
+
+UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_btn_Add', 'la_fld_RecipientName', 'la_fld_SenderName');
+DELETE FROM Permissions WHERE Permission LIKE 'in-commerce:incommerce_configemail%';
+
+# ===== v 5.1.0-B2 =====
+
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+	'la_col_Qty', 'la_col_QtyBackordered', 'la_ItemBackordered', 'la_ship_all_together',
+	'la_ship_backorders_upon_avail', 'la_ship_backorder_separately', 'la_tooltip_New_Coupon',
+	'la_tooltip_New_Discount'
+);
+
+DELETE FROM Phrase WHERE Phrase = 'la_comm_ProductsByManuf';
+
+# ===== v 5.1.0 =====
+ALTER TABLE Products CHANGE CachedRating CachedRating varchar(10) NOT NULL default '0';
+
+# ===== v 5.1.1-B1 =====
+ALTER TABLE Orders CHANGE ShippingOption ShippingOption TINYINT(4) NOT NULL DEFAULT '0';
+
+ALTER TABLE ProductFiles CHANGE AddedById AddedById INT(11) NULL DEFAULT NULL;
+UPDATE ProductFiles SET AddedById = NULL WHERE AddedById = 0;
+
+ALTER TABLE Products
+	CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL ,
+	CHANGE ModifiedById ModifiedById INT(11) NULL DEFAULT NULL;
+UPDATE Products SET CreatedById = NULL WHERE CreatedById = 0;
+UPDATE Products SET ModifiedById = NULL WHERE ModifiedById = 0;
+
+# ===== v 5.1.1-B2 =====
+
+# ===== v 5.1.1-RC1 =====
+
+# ===== v 5.1.1 =====
+
+# ===== v 5.1.2-B1 =====
+DELETE FROM Phrase WHERE PhraseKey = 'LA_TITLE_ADDING_ORDER_ITEM';
+
+# ===== v 5.1.2-B2 =====
+UPDATE Phrase SET l<%PRIMARY_LANGUAGE%>_Translation = REPLACE(l<%PRIMARY_LANGUAGE%>_Translation, 'Discounts & Coupons', 'Discounts & Certificates') WHERE PhraseKey = 'LA_TAB_DISCOUNTSANDCOUPONS';
+
+# ===== v 5.1.2-RC1 =====
+UPDATE Phrase SET Module = 'Core' WHERE PhraseKey = 'LA_FLD_ISOCODE' OR PhraseKey = 'LA_COL_ISOCODE';
+
+# ===== v 5.1.2 =====
+
+# ===== v 5.1.3-B1 =====
+ALTER TABLE AffiliatePlansBrackets CHANGE Percent Percent DECIMAL (10,2) NOT NULL DEFAULT '0.00';
+
+# ===== v 5.1.3-B2 =====
+
+# ===== v 5.1.3-RC1 =====
+UPDATE ConfigurationValues
+SET VariableValue = 'in-commerce/products/product_detail'
+WHERE VariableName = 'p_ItemTemplate' AND VariableValue = 'in-commerce/designs/detail';
+
+# ===== v 5.1.3-RC2 =====
+
+# ===== v 5.1.3 =====
+
+# ===== v 5.2.0-B1 =====
+UPDATE SearchConfig
+SET DisplayName = REPLACE(DisplayName, 'lu_', 'lc_')
+WHERE DisplayName IN ('lu_field_descriptionex', 'lu_field_manufacturer', 'lu_field_qtysold', 'lu_field_topseller');
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.12, '0', '0', NULL);
+
+ALTER TABLE Orders ADD VATIncluded TINYINT(1) UNSIGNED NOT NULL DEFAULT '0';
+
+INSERT INTO ItemFilters VALUES
+	(DEFAULT, 'p', 'ManufacturerId', 'checkbox', 1, NULL),
+	(DEFAULT, 'p', 'Price', 'range', 1, 11),
+	(DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
+
+DELETE FROM LanguageLabels WHERE PhraseKey = 'LA_COL_ITEMNAME';
+
+DELETE FROM LanguageLabels
+WHERE PhraseKey IN ('LA_ALLOWORDERINGINNONPRIMARYCURRENCY', 'LA_ALLOWORDERDIFFERENTTYPES');
+
+DELETE FROM SystemSettings
+WHERE VariableName IN ('Comm_AllowOrderingInNonPrimaryCurrency', 'Comm_Allow_Order_Different_Types');
+
+UPDATE SystemSettings
+SET DisplayOrder = 20.01
+WHERE VariableName = 'Comm_ExchangeRateSource';
+
+UPDATE SystemSettings
+SET DisplayOrder = DisplayOrder - 0.01
+WHERE VariableName IN (
+	'Comm_Enable_Backordering', 'Comm_Process_Backorders_Auto', 'Comm_Next_Order_Number', 'Comm_Order_Number_Format_P',
+	'Comm_Order_Number_Format_S', 'Comm_RecurringChargeInverval', 'Comm_AutoProcessRecurringOrders', 'MaxAddresses',
+	'Comm_MaskProcessedCreditCards', 'OrderVATIncluded'
+);
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'MaxCompareProducts', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_config_MaxCompareProducts', 'text', NULL, NULL, 10.12, 0, 1, NULL);
+
+# ===== v 5.2.0-B2 =====
+UPDATE Products main_table
+SET main_table.CachedReviewsQty = (SELECT COUNT(*) FROM <%TABLE_PREFIX%>CatalogReviews review_table WHERE review_table.ItemId = main_table.ResourceId);
+
+# ===== v 5.2.0-B3 =====
+ALTER TABLE OrderItems CHANGE OptionsSalt OptionsSalt BIGINT(11) NULL DEFAULT '0';
+UPDATE OrderItems
+SET OptionsSalt = CAST((OptionsSalt & 0xFFFFFFFF) AS UNSIGNED INTEGER)
+WHERE OptionsSalt < 0;
+
+ALTER TABLE ProductOptionCombinations CHANGE CombinationCRC CombinationCRC BIGINT(11) NOT NULL DEFAULT '0';
+UPDATE ProductOptionCombinations
+SET CombinationCRC = CAST((CombinationCRC & 0xFFFFFFFF) AS UNSIGNED INTEGER)
+WHERE CombinationCRC < 0;
+
+# ===== v 5.2.0-RC1 =====
+DELETE FROM Currencies WHERE ISO = 'NZD' LIMIT 1;
+
+# ===== v 5.2.0 =====
+INSERT INTO Permissions VALUES(DEFAULT, 'in-commerce:general.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES(DEFAULT, 'in-commerce:output.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES(DEFAULT, 'in-commerce:contacts.add', 11, 1, 1, 0);
+
+# ===== v 5.2.1-B1 =====
+ALTER TABLE Affiliates CHANGE PortalUserId PortalUserId INT(10) NULL DEFAULT NULL;
+UPDATE Affiliates SET PortalUserId = NULL WHERE PortalUserId = 0;
+
+# ===== v 5.2.1-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\InCommerce'
+WHERE `Name` = 'In-Commerce';
+
+# ===== v 5.2.1-RC1 =====
+
+# ===== v 5.2.1 =====
+
+# ===== v 5.2.2-B1 =====
+
+# ===== v 5.2.2-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'InPortal\\Modules\\InCommerce'
+WHERE `Name` = 'In-Commerce';

Property changes on: releases/5.2.2-B2/install/upgrades.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.11
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/english.lang
===================================================================
--- releases/5.2.2-B2/install/english.lang	(revision 0)
+++ releases/5.2.2-B2/install/english.lang	(revision 16630)
@@ -0,0 +1,1048 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LANGUAGES Version="6">
+	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" ShortDateFormat="m/d" TimeFormat="g:i A" ShortTimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
+		<EMAILDESIGNS>
+			<HTML>JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg==</HTML>
+		</EMAILDESIGNS>
+		<PHRASES>
+			<PHRASE Label="la_AccountLogin" Module="In-Commerce" Type="1">QWNjb3VudA==</PHRASE>
+			<PHRASE Label="la_AddressLine1" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
+			<PHRASE Label="la_AddressLine2" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
+			<PHRASE Label="la_ADP" Module="In-Commerce" Type="1">QW5kb3JyYW4gUGVzZXRh</PHRASE>
+			<PHRASE Label="la_AED" Module="In-Commerce" Type="1">VUFFIERpcmhhbQ==</PHRASE>
+			<PHRASE Label="la_AFA" Module="In-Commerce" Type="1">QWZnaGFuaQ==</PHRASE>
+			<PHRASE Label="la_affiliate_already_exists" Module="In-Commerce" Type="1">YWZmaWxpYXRlIGFscmVhZHkgZXhpc3Rz</PHRASE>
+			<PHRASE Label="la_AFN" Module="In-Commerce" Type="1">QWZnaGFuaQ==</PHRASE>
+			<PHRASE Label="la_ALL" Module="In-Commerce" Type="1">TGVjaw==</PHRASE>
+			<PHRASE Label="la_Allowed" Module="In-Commerce" Type="1">QWxsb3dlZA==</PHRASE>
+			<PHRASE Label="la_AllowOrderMoreThanAvailable" Module="In-Commerce" Type="1">QWxsb3cgb3JkZXJpbmcgb2YgbW9yZSBxdWFudGl0eSB0aGFuIGF2YWlsYWJsZSBhcyBiYWNrb3JkZXI=</PHRASE>
+			<PHRASE Label="la_AMD" Module="In-Commerce" Type="1">QXJtZW5pYW4gRHJhbQ==</PHRASE>
+			<PHRASE Label="la_ANG" Module="In-Commerce" Type="1">TmV0aGVybGFuZHMgQW50aWxsYW4gR3VpbGRlcg==</PHRASE>
+			<PHRASE Label="la_AOA" Module="In-Commerce" Type="1">S3dhbnph</PHRASE>
+			<PHRASE Label="la_Archived" Module="In-Commerce" Type="1">QXJjaGl2ZWQ=</PHRASE>
+			<PHRASE Label="la_ARS" Module="In-Commerce" Type="1">QXJnZW50aW5lIFBlc28=</PHRASE>
+			<PHRASE Label="la_AUD" Module="In-Commerce" Type="1">QXVzdHJhbGlhbiBEb2xsYXI=</PHRASE>
+			<PHRASE Label="la_AutoBackorder" Module="In-Commerce" Type="1">QXV0byBCYWNrb3JkZXI=</PHRASE>
+			<PHRASE Label="la_AutoProcessRecurringOrders" Module="In-Commerce" Type="1">QXV0b21hdGljYWxseSBQcm9jZXNzIFJlY3VycmluZyBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_Availability" Module="In-Commerce" Type="1">QXZhaWxhYmlsaXR5</PHRASE>
+			<PHRASE Label="la_AWG" Module="In-Commerce" Type="1">QXJ1YmFuIEd1aWxkZXI=</PHRASE>
+			<PHRASE Label="la_AZM" Module="In-Commerce" Type="1">QXplcmJhaWphbmlhbiBNYW5hdA==</PHRASE>
+			<PHRASE Label="la_BackOrders" Module="In-Commerce" Type="1">QmFja09yZGVycw==</PHRASE>
+			<PHRASE Label="la_BAM" Module="In-Commerce" Type="1">Q29udmVydGlibGUgTWFya3M=</PHRASE>
+			<PHRASE Label="la_BankOfLatvia" Module="In-Commerce" Type="1">QmFuayBvZiBMYXR2aWEgLSB3d3cuYmFuay5sdg==</PHRASE>
+			<PHRASE Label="la_Base_Fee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
+			<PHRASE Label="la_BBD" Module="In-Commerce" Type="1">QmFyYmFkb3MgRG9sbGFy</PHRASE>
+			<PHRASE Label="la_BDT" Module="In-Commerce" Type="1">VGFrYQ==</PHRASE>
+			<PHRASE Label="la_BGL" Module="In-Commerce" Type="1">TGV2</PHRASE>
+			<PHRASE Label="la_BGN" Module="In-Commerce" Type="1">QnVsZ2FyaWFuIExldg==</PHRASE>
+			<PHRASE Label="la_BHD" Module="In-Commerce" Type="1">QmFocmFpbmkgRGluYXI=</PHRASE>
+			<PHRASE Label="la_BIF" Module="In-Commerce" Type="1">QnVydW5kaSBGcmFuYw==</PHRASE>
+			<PHRASE Label="la_BMD" Module="In-Commerce" Type="1">QmVybXVkaWFuIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_BND" Module="In-Commerce" Type="1">QnJ1bmVpIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_BOB" Module="In-Commerce" Type="1">Qm9saXZpYW5v</PHRASE>
+			<PHRASE Label="la_BOV" Module="In-Commerce" Type="1">TXZkb2w=</PHRASE>
+			<PHRASE Label="la_BRL" Module="In-Commerce" Type="1">QnJhemlsaWFuIFJlYWw=</PHRASE>
+			<PHRASE Label="la_BSD" Module="In-Commerce" Type="1">QmFoYW1pYW4gRG9sbGFy</PHRASE>
+			<PHRASE Label="la_BTN" Module="In-Commerce" Type="1">Tmd1bHRydW0=</PHRASE>
+			<PHRASE Label="la_btn_AddLocation" Module="In-Commerce" Type="1">QWRkIExvY2F0aW9u</PHRASE>
+			<PHRASE Label="la_btn_CancelOrder" Module="In-Commerce" Type="1">Q2FuY2VsIE9yZGVy</PHRASE>
+			<PHRASE Label="la_btn_Order" Module="In-Commerce" Type="1">T3JkZXI=</PHRASE>
+			<PHRASE Label="la_btn_ReceiveOrder" Module="In-Commerce" Type="1">UmVjZWl2ZSBPcmRlcg==</PHRASE>
+			<PHRASE Label="la_btn_Remove" Module="In-Commerce" Type="1">UmVtb3Zl</PHRASE>
+			<PHRASE Label="la_btn_RemoveLocations" Module="In-Commerce" Type="1">UmVtb3ZlIExvY2F0aW9ucw==</PHRASE>
+			<PHRASE Label="la_BuiltIn" Module="In-Commerce" Type="1">QnVpbHQtSW4=</PHRASE>
+			<PHRASE Label="la_button_add" Module="In-Commerce" Type="1">QWRk</PHRASE>
+			<PHRASE Label="la_button_receive_order" Module="In-Commerce" Type="1">UmVjZWl2ZSBvcmRlcg==</PHRASE>
+			<PHRASE Label="la_button_remove" Module="In-Commerce" Type="1">UmVtb3Zl</PHRASE>
+			<PHRASE Label="la_Button_Save" Module="In-Commerce" Type="1">U2F2ZQ==</PHRASE>
+			<PHRASE Label="la_BWP" Module="In-Commerce" Type="1">UHVsYQ==</PHRASE>
+			<PHRASE Label="la_ByAmount" Module="In-Commerce" Type="1">YnkgYW1vdW50</PHRASE>
+			<PHRASE Label="la_ByCategory" Module="In-Commerce" Type="1">QnkgU2VjdGlvbg==</PHRASE>
+			<PHRASE Label="la_ByCountry" Module="In-Commerce" Type="1">QnkgQ291bnRyeQ==</PHRASE>
+			<PHRASE Label="la_ByItem" Module="In-Commerce" Type="1">YnkgaXRlbQ==</PHRASE>
+			<PHRASE Label="la_byProduct" Module="In-Commerce" Type="1">QnkgUHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_BYR" Module="In-Commerce" Type="1">QmVsYXJ1c3NpYW4gUnVibGU=</PHRASE>
+			<PHRASE Label="la_ByState" Module="In-Commerce" Type="1">QnkgU3RhdGU=</PHRASE>
+			<PHRASE Label="la_ByUser" Module="In-Commerce" Type="1">QnkgVXNlcg==</PHRASE>
+			<PHRASE Label="la_ByWeight" Module="In-Commerce" Type="1">Ynkgd2VpZ2h0</PHRASE>
+			<PHRASE Label="la_ByZIP" Module="In-Commerce" Type="1">QnkgWklQ</PHRASE>
+			<PHRASE Label="la_by_amount" Module="In-Commerce" Type="1">YnkgYW1vdW50</PHRASE>
+			<PHRASE Label="la_by_items_sold" Module="In-Commerce" Type="1">YnkgaXRlbXMgc29sZA==</PHRASE>
+			<PHRASE Label="la_by_options" Module="In-Commerce" Type="1">QnkgUHJvZHVjdCBPcHRpb25z</PHRASE>
+			<PHRASE Label="la_by_product" Module="In-Commerce" Type="1">QnkgUHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_by_request" Module="In-Commerce" Type="1">QnkgUmVxdWVzdA==</PHRASE>
+			<PHRASE Label="la_BZD" Module="In-Commerce" Type="1">QmVsaXplIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_CAD" Module="In-Commerce" Type="1">Q2FuYWRpYW4gRG9sbGFy</PHRASE>
+			<PHRASE Label="la_CDF" Module="In-Commerce" Type="1">RnJhbmMgQ29uZ29sYWlz</PHRASE>
+			<PHRASE Label="la_CHF" Module="In-Commerce" Type="1">U3dpc3MgRnJhbmM=</PHRASE>
+			<PHRASE Label="la_City" Module="In-Commerce" Type="1">Q2l0eQ==</PHRASE>
+			<PHRASE Label="la_ClearCostsWarning" Module="In-Commerce" Type="1">RG8geW91IHJlYWxseSB3YW50IHRvIHJlc2V0IHdob2xlIGNvc3RzIHRhYmxlPw==</PHRASE>
+			<PHRASE Label="la_CLF" Module="In-Commerce" Type="1">VW5pZGFkZXMgZGUgZm9tZW50bw==</PHRASE>
+			<PHRASE Label="la_CloneCoupon" Module="In-Commerce" Type="1">Q2xvbmluZyBhIENvdXBvbg==</PHRASE>
+			<PHRASE Label="la_CLP" Module="In-Commerce" Type="1">Q2hpbGVhbiBQZXNv</PHRASE>
+			<PHRASE Label="la_CNY" Module="In-Commerce" Type="1">Q2hpbmEgWXVhbiBSZW5taW5iaQ==</PHRASE>
+			<PHRASE Label="la_COD" Module="In-Commerce" Type="1">Q09E</PHRASE>
+			<PHRASE Label="la_COD_Flat_Surcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_COD_Percent_Surcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_col_BuiltIn" Module="In-Commerce" Type="1">QnVpbHQtSW4=</PHRASE>
+			<PHRASE Label="la_col_CODFlatSurecharge" Module="In-Commerce" Type="1">Q09EIGZsYXQgc3VyZWNoYXJnZQ==</PHRASE>
+			<PHRASE Label="la_col_Combination" Module="In-Commerce" Type="1">Q29tYmluYXRpb24=</PHRASE>
+			<PHRASE Label="la_col_Commission" Module="In-Commerce" Type="1">QWZmaWxsaWF0ZSBDb21taXNzaW9u</PHRASE>
+			<PHRASE Label="la_col_CouponItemType" Module="In-Commerce" Type="1">Q291cG9uIEl0ZW0gVHlwZQ==</PHRASE>
+			<PHRASE Label="la_col_CustomerName" Module="In-Commerce" Type="1">Q3VzdG9tZXIgTmFtZQ==</PHRASE>
+			<PHRASE Label="la_col_DownloadedFileName" Module="In-Commerce" Type="1">RmlsZW5hbWU=</PHRASE>
+			<PHRASE Label="la_col_DownloadedProductName" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1l</PHRASE>
+			<PHRASE Label="la_col_EndedOn" Module="In-Commerce" Type="1">RW5kZWQgT24=</PHRASE>
+			<PHRASE Label="la_col_ExtendedPrice" Module="In-Commerce" Type="1">RXh0LiBQcmljZQ==</PHRASE>
+			<PHRASE Label="la_col_FromUser" Module="In-Commerce" Type="1">RnJvbSBVc2Vy</PHRASE>
+			<PHRASE Label="la_col_GMV" Module="In-Commerce" Type="1">R01W</PHRASE>
+			<PHRASE Label="la_col_ItemType" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbSBUeXBl</PHRASE>
+			<PHRASE Label="la_col_LastUpdated" Module="In-Commerce" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
+			<PHRASE Label="la_col_ManufacturerName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_col_Marketplace" Module="In-Commerce" Type="1">TWFya2V0cGxhY2U=</PHRASE>
+			<PHRASE Label="la_col_OrderDate" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
+			<PHRASE Label="la_col_OrderTotal" Module="In-Commerce" Type="1">T3JkZXIgVG90YWw=</PHRASE>
+			<PHRASE Label="la_col_PaymentTypeName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_col_Percent" Module="In-Commerce" Type="1">UGVyY2VudA==</PHRASE>
+			<PHRASE Label="la_col_PlanName" Module="In-Commerce" Type="1">UGxhbiBOYW1l</PHRASE>
+			<PHRASE Label="la_col_Processing" Module="In-Commerce" Type="1">UHJvY2Vzc2luZw==</PHRASE>
+			<PHRASE Label="la_col_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_col_ProductBackOrderDate" Module="In-Commerce" Type="1">QmFja09yZGVyIERhdGU=</PHRASE>
+			<PHRASE Label="la_col_ProductCreatedOn" Module="In-Commerce" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
+			<PHRASE Label="la_col_ProductName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_col_ProductNameId" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1lIChJRCk=</PHRASE>
+			<PHRASE Label="la_col_ProductSKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
+			<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
+			<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
+			<PHRASE Label="la_col_Quantity" Module="In-Commerce" Type="1">UXR5Lg==</PHRASE>
+			<PHRASE Label="la_col_QuantityAvailable" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
+			<PHRASE Label="la_col_QuantityReserved" Module="In-Commerce" Type="1">UmVzZXJ2ZWQ=</PHRASE>
+			<PHRASE Label="la_col_ReturnAmount" Module="In-Commerce" Type="1">UmV0LiBBbW91bnQ=</PHRASE>
+			<PHRASE Label="la_col_ReturnedOn" Module="In-Commerce" Type="1">UmV0LiBEYXRl</PHRASE>
+			<PHRASE Label="la_col_ReturnType" Module="In-Commerce" Type="1">UmV0LiBUeXBl</PHRASE>
+			<PHRASE Label="la_col_Shipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_col_ShippingFromLocation" Module="In-Commerce" Type="1">RnJvbSBMb2NhdGlvbg==</PHRASE>
+			<PHRASE Label="la_col_Size" Module="In-Commerce" Type="1">U2l6ZQ==</PHRASE>
+			<PHRASE Label="la_col_StartedOn" Module="In-Commerce" Type="1">U3RhcnRlZCBPbg==</PHRASE>
+			<PHRASE Label="la_col_Tax" Module="In-Commerce" Type="1">VGF4</PHRASE>
+			<PHRASE Label="la_Combined" Module="In-Commerce" Type="1">Q29tYmluZWQ=</PHRASE>
+			<PHRASE Label="la_comment_LeaveBlank" Module="In-Commerce" Type="1">KGxlYXZlIGJsYW5rIGZvciB1bmxpbWl0ZWQp</PHRASE>
+			<PHRASE Label="la_comm_Any" Module="In-Commerce" Type="1">QW55</PHRASE>
+			<PHRASE Label="la_comm_OrderContents" Module="In-Commerce" Type="1">T3JkZXIgQ29udGVudHM=</PHRASE>
+			<PHRASE Label="la_comm_ShippingBillingInfo" Module="In-Commerce" Type="1">U2hpcHBpbmcgJiBCaWxsaW5nIEluZm9ybWF0aW9u</PHRASE>
+			<PHRASE Label="la_comm_Timeframe" Module="In-Commerce" Type="1">VGltZWZyYW1l</PHRASE>
+			<PHRASE Label="la_config_MaxCompareProducts" Module="In-Commerce" Type="1">TWF4aW1hbCBudW1iZXIgb2YgcHJvZHVjdHMgaW4gY29tcGFyaXNvbiBsaXN0</PHRASE>
+			<PHRASE Label="la_config_OrderVATIncluded" Module="In-Commerce" Type="1">VGF4ZXMgaW5jbHVkZWQgaW4gcHJvZHVjdCBwcmljZSwgc2hpcHBpbmcgY29zdCAmIHByb2Nlc3NpbmcgZmVl</PHRASE>
+			<PHRASE Label="la_config_ShowProductImagesInOrders" Module="In-Commerce" Type="1">U2hvdyBQcm9kdWN0IEltYWdlcyBpbiBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_conf_DaysToBeNew" Module="In-Commerce" Type="1">TnVtYmVyIG9mIGRheXMgZm9yIGEgcHJvZHVjdCB0byBiZSBOZXc=</PHRASE>
+			<PHRASE Label="la_conf_DefaultCouponDuration" Module="In-Commerce" Type="1">RGVmYXVsdCBjb3Vwb24gZHVyYXRpb24gKGRheXMp</PHRASE>
+			<PHRASE Label="la_conf_EditorPicksAboveRegular" Module="In-Commerce" Type="1">RGlzcGxheSBFZGl0b3IgUGlja3MgYWJvdmUgcmVndWxhciBwcm9kdWN0cw==</PHRASE>
+			<PHRASE Label="la_conf_OrderProductsBy" Module="In-Commerce" Type="1">T3JkZXIgcHJvZHVjdHMgYnk=</PHRASE>
+			<PHRASE Label="la_conf_ThenBy" Module="In-Commerce" Type="1">VGhlbiBCeQ==</PHRASE>
+			<PHRASE Label="la_COP" Module="In-Commerce" Type="1">Q29sb21iaWFuIFBlc28=</PHRASE>
+			<PHRASE Label="la_COU" Module="In-Commerce" Type="1">Q09V</PHRASE>
+			<PHRASE Label="la_couldnt_retrieve_rate" Module="In-Commerce" Type="1">Q291bGRuJ3QgcmV0cmlldmUgY3VycmVuY3kgcmF0ZSE=</PHRASE>
+			<PHRASE Label="la_Country" Module="In-Commerce" Type="1">Q291bnRyeQ==</PHRASE>
+			<PHRASE Label="la_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
+			<PHRASE Label="la_CRC" Module="In-Commerce" Type="1">Q29zdGEgUmljYW4gQ29sb24=</PHRASE>
+			<PHRASE Label="la_CreditDirect" Module="In-Commerce" Type="1">Q3JlZGl0IERpcmVjdA==</PHRASE>
+			<PHRASE Label="la_CreditPreAuthorize" Module="In-Commerce" Type="1">Q3JlZGl0IFByZS1BdXRob3JpemU=</PHRASE>
+			<PHRASE Label="la_CSD" Module="In-Commerce" Type="1">Q1NE</PHRASE>
+			<PHRASE Label="la_CUP" Module="In-Commerce" Type="1">Q3ViYW4gUGVzbw==</PHRASE>
+			<PHRASE Label="la_CVE" Module="In-Commerce" Type="1">Q2FwZSBWZXJkZSBFc2N1ZG8=</PHRASE>
+			<PHRASE Label="la_CYP" Module="In-Commerce" Type="1">Q3lwcnVzIFBvdW5k</PHRASE>
+			<PHRASE Label="la_CZK" Module="In-Commerce" Type="1">Q3plY2ggS29ydW5h</PHRASE>
+			<PHRASE Label="la_day" Module="In-Commerce" Type="1">ZGF5</PHRASE>
+			<PHRASE Label="la_Denied" Module="In-Commerce" Type="1">RGVuaWVk</PHRASE>
+			<PHRASE Label="la_Details" Module="In-Commerce" Type="1">VmlldyBEZXRhaWxz</PHRASE>
+			<PHRASE Label="la_Discount" Module="In-Commerce" Type="1">RGlzY291bnQ=</PHRASE>
+			<PHRASE Label="la_DJF" Module="In-Commerce" Type="1">RGppYm91dGkgRnJhbmM=</PHRASE>
+			<PHRASE Label="la_DKK" Module="In-Commerce" Type="1">RGFuaXNoIEtyb25l</PHRASE>
+			<PHRASE Label="la_DOP" Module="In-Commerce" Type="1">RG9taW5pY2FuIFBlc28=</PHRASE>
+			<PHRASE Label="la_DZD" Module="In-Commerce" Type="1">QWxnZXJpYW4gRGluYXI=</PHRASE>
+			<PHRASE Label="la_ECS" Module="In-Commerce" Type="1">U3VjcmU=</PHRASE>
+			<PHRASE Label="la_ECV" Module="In-Commerce" Type="1">VW5pZGFkIGRlIFZhbG9yIENvbnN0YW50ZSAoVVZDKQ==</PHRASE>
+			<PHRASE Label="la_Edit_User" Module="In-Commerce" Type="1">RWRpdCBVc2Vy</PHRASE>
+			<PHRASE Label="la_EEK" Module="In-Commerce" Type="1">S3Jvb24=</PHRASE>
+			<PHRASE Label="la_EGP" Module="In-Commerce" Type="1">RWd5cHRpYW4gUG91bmQ=</PHRASE>
+			<PHRASE Label="la_EnableBackorderAvailabilityDate" Module="In-Commerce" Type="1">RW5hYmxlIGJhY2tvcmRlciBhdmFpbGFiaWxpdHkgZGF0ZQ==</PHRASE>
+			<PHRASE Label="la_EnableBackordering" Module="In-Commerce" Type="1">RW5hYmxlIEJhY2tvcmRlcmluZw==</PHRASE>
+			<PHRASE Label="la_enable_html" Module="In-Commerce" Type="1">RW5hYmxlIEhUTUw/</PHRASE>
+			<PHRASE Label="la_EnterNumberOfCopies" Module="In-Commerce" Type="1">TnVtYmVyIE9mIENvcGllcw==</PHRASE>
+			<PHRASE Label="la_EntireOrderConfirmation" Module="In-Commerce" Type="1">VGhpcyB3aWxsIHJlbW92ZSBhbGwgc2VsZWN0ZWQgcHJvZHVjdHMhIEFyZSB5b3Ugc3VyZT8=</PHRASE>
+			<PHRASE Label="la_ERN" Module="In-Commerce" Type="1">TmFrZmE=</PHRASE>
+			<PHRASE Label="la_error_CannotDeletePaymentType" Module="In-Commerce" Type="1">VGhlIHByaW1hcnkgcGF5bWVudCB0eXBlIGNhbm5vdCBiZSBkZWxldGVkIQ==</PHRASE>
+			<PHRASE Label="la_error_EnableCurlFirst" Module="In-Commerce" Type="1">RW5hYmxlIENVUkwgZmlyc3Q=</PHRASE>
+			<PHRASE Label="la_error_FillInShippingFromAddress" Module="In-Commerce" Type="1">RmlsbCBpbiBTaGlwcGluZyBGcm9tIGFkZHJlc3MgaW4gQ29udGFjdCBJbmZvcm1hdGlvbiBiZWZvcmUgZW5hYmxpbmcgSW50ZXJzaGlwcGVy</PHRASE>
+			<PHRASE Label="la_ETB" Module="In-Commerce" Type="1">RXRoaW9waWFuIEJpcnI=</PHRASE>
+			<PHRASE Label="la_EUR" Module="In-Commerce" Type="1">RXVybw==</PHRASE>
+			<PHRASE Label="la_EuropeanCentralBank" Module="In-Commerce" Type="1">RXVyb3BlYW4gQ2VudHJhbCBCYW5rIC0gd3d3LmVjYi5pbnQ=</PHRASE>
+			<PHRASE Label="la_ExchangeRateSource" Module="In-Commerce" Type="1">Q2hvb3NlIHRoZSBleGNoYW5nZSByYXRlIHNvdXJjZQ==</PHRASE>
+			<PHRASE Label="la_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_Features" Module="In-Commerce" Type="1">RmVhdHVyZXM=</PHRASE>
+			<PHRASE Label="la_FederalReserveBank" Module="In-Commerce" Type="1">RmVkZXJhbCBSZXNlcnZlIEJhbmsgb2YgTmV3IFlvcmsgLSB3d3cubnkuZnJiLm9yZw==</PHRASE>
+			<PHRASE Label="la_FJD" Module="In-Commerce" Type="1">RmlqaSBEb2xsYXI=</PHRASE>
+			<PHRASE Label="la_FKP" Module="In-Commerce" Type="1">RmFsa2xhbmQgSXNsYW5kcyBQb3VuZA==</PHRASE>
+			<PHRASE Label="la_Flat" Module="In-Commerce" Type="1">RmxhdA==</PHRASE>
+			<PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9u">QWNjZXNzIER1cmF0aW9u</PHRASE>
+			<PHRASE Label="la_fld_AccessDurationType" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9uIFVuaXQ=">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
+			<PHRASE Label="la_fld_AccessEnd" Module="In-Commerce" Type="1">QWNjZXNzIEVuZA==</PHRASE>
+			<PHRASE Label="la_fld_AccessGroup" Module="In-Commerce" Type="1">QWNjZXNzIEdyb3Vw</PHRASE>
+			<PHRASE Label="la_fld_AccessStart" Module="In-Commerce" Type="1">QWNjZXNzIFN0YXJ0</PHRASE>
+			<PHRASE Label="la_fld_AccumulatedAmount" Module="In-Commerce" Type="1">QWNjdW11bGF0ZWQgQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1" Column="QWRkZWQgT24=">QWRkZWQgT24=</PHRASE>
+			<PHRASE Label="la_fld_Address1" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
+			<PHRASE Label="la_fld_Address2" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
+			<PHRASE Label="la_fld_AdminComment" Module="In-Commerce" Type="1">QWRtaW4gQ29tbWVudA==</PHRASE>
+			<PHRASE Label="la_fld_AdminComments" Module="In-Commerce" Type="1">QWRtaW4gQ29tbWVudHM=</PHRASE>
+			<PHRASE Label="la_fld_AffiliateCode" Module="In-Commerce" Type="1">QWZmaWxpYXRlIENvZGU=</PHRASE>
+			<PHRASE Label="la_fld_AffiliateCommission" Module="In-Commerce" Type="1">QWZmaWxpYXRlIENvbW1pc3Npb24=</PHRASE>
+			<PHRASE Label="la_fld_AffiliateLink" Module="In-Commerce" Type="1">QWZmaWxpYXRlIExpbms=</PHRASE>
+			<PHRASE Label="la_fld_AffiliatePlan" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW4=</PHRASE>
+			<PHRASE Label="la_fld_AffiliatePlanPayment" Module="In-Commerce" Type="1">UGF5bWVudA==</PHRASE>
+			<PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1" Column="QWZmaWxpYXRlIFVzZXI=">QWZmaWxpYXRlIFVzZXI=</PHRASE>
+			<PHRASE Label="la_fld_AllowedShippingTypes" Module="In-Commerce" Type="1">U2VsZWN0ZWQ=</PHRASE>
+			<PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1" Column="QW1vdW50">QW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_AmountToPay" Module="In-Commerce" Type="1">QW1vdW50IFRvIFBheQ==</PHRASE>
+			<PHRASE Label="la_fld_AssignedCoupon" Module="In-Commerce" Type="1">QXNzaWduZWQgQ291cG9u</PHRASE>
+			<PHRASE Label="la_fld_AuthorizationResult" Module="In-Commerce" Type="1">QXV0aG9yaXphdGlvbiBSZXN1bHQ=</PHRASE>
+			<PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1" Column="QXZhaWwu">QXZhaWxhYmxl</PHRASE>
+			<PHRASE Label="la_fld_AvailableGroups" Module="In-Commerce" Type="1">QXZhaWxhYmxlIFVzZXIgR3JvdXBz</PHRASE>
+			<PHRASE Label="la_fld_AvailableShippingTypes" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
+			<PHRASE Label="la_fld_BackOrder" Module="In-Commerce" Type="1">QmFja09yZGVy</PHRASE>
+			<PHRASE Label="la_fld_BackOrderDate" Module="In-Commerce" Type="1">QmFja29yZGVyIGF2YWlsYWJpbGl0eSBkYXRl</PHRASE>
+			<PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1" Column="QmFzZSBGZWU=">QmFzZSBGZWU=</PHRASE>
+			<PHRASE Label="la_fld_BillingAddress1" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMQ==</PHRASE>
+			<PHRASE Label="la_fld_BillingAddress2" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMg==</PHRASE>
+			<PHRASE Label="la_fld_BillingCity" Module="In-Commerce" Type="1">QmlsbGluZyBDaXR5</PHRASE>
+			<PHRASE Label="la_fld_BillingCompany" Module="In-Commerce" Type="1">QmlsbGluZyBDb21wYW55</PHRASE>
+			<PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1" Column="QmlsbGluZyBDb3VudHJ5">QmlsbGluZyBDb3VudHJ5</PHRASE>
+			<PHRASE Label="la_fld_BillingEmail" Module="In-Commerce" Type="1">QmlsbGluZyBFbWFpbA==</PHRASE>
+			<PHRASE Label="la_fld_BillingFax" Module="In-Commerce" Type="1">QmlsbGluZyBGYXg=</PHRASE>
+			<PHRASE Label="la_fld_BillingPhone" Module="In-Commerce" Type="1">QmlsbGluZyBQaG9uZQ==</PHRASE>
+			<PHRASE Label="la_fld_BillingState" Module="In-Commerce" Type="1">QmlsbGluZyBTdGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_BillingTo" Module="In-Commerce" Type="1">QmlsbGluZyBUbw==</PHRASE>
+			<PHRASE Label="la_fld_BillingZip" Module="In-Commerce" Type="1">QmlsbGluZyBaaXBjb2Rl</PHRASE>
+			<PHRASE Label="la_fld_BlockShippingAddress" Module="In-Commerce" Type="1">QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n</PHRASE>
+			<PHRASE Label="la_fld_CaptureResult" Module="In-Commerce" Type="1">Q2FwdHVyZSBSZXN1bHQ=</PHRASE>
+			<PHRASE Label="la_fld_ChargeOnNextApprove" Module="In-Commerce" Type="1">Q2hhcmdlIG9uIE5leHQgQXBwcm92ZQ==</PHRASE>
+			<PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1" Column="Q09EIEFsbG93ZWQ=">Q09EIEFsbG93ZWQ=</PHRASE>
+			<PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1" Column="Q29kZQ==">Q29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1" Column="Q09EIEZsYXQgU3VyZWNoYXJnZQ==">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1" Column="Q09EIFBlcmNlbnQgU3VyY2hhcmdl">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+			<PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1" Column="Q29zdA==">Q29zdA==</PHRASE>
+			<PHRASE Label="la_fld_CostType" Module="In-Commerce" Type="1">Q29zdCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1" Column="Q291cG9uIENvZGU=">Q291cG9uIENvZGU=</PHRASE>
+			<PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1" Column="Q3JlZGl0IENhcmQgTnVtYmVy">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
+			<PHRASE Label="la_fld_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
+			<PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1" Column="Q3VycmVuY3k=">Q3VycmVuY3k=</PHRASE>
+			<PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1" Column="U3ltYm9s">U3ltYm9s</PHRASE>
+			<PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1" Column="U3ltYm9sIFBvc2l0aW9u">U3ltYm9sIFBvc2l0aW9u</PHRASE>
+			<PHRASE Label="la_fld_cust_p_ItemTemplate" Module="In-Commerce" Type="1">UHJvZHVjdCBJdGVtIFRlbXBsYXRl</PHRASE>
+			<PHRASE Label="la_fld_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_DeliveryMethod" Module="In-Commerce" Type="1">RGVsaXZlcnkgTWV0aG9k</PHRASE>
+			<PHRASE Label="la_fld_DescriptionExcerpt" Module="In-Commerce" Type="1">RXhjZXJwdA==</PHRASE>
+			<PHRASE Label="la_fld_Discount" Module="In-Commerce" Type="1">RGlzY291bnQ=</PHRASE>
+			<PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1" Column="RGlzcGxheSBvbiBGcm9udC1FbmQ=">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
+			<PHRASE Label="la_fld_EmptyCellsAre" Module="In-Commerce" Type="1">RW1wdHkgQ2VsbHMgQXJl</PHRASE>
+			<PHRASE Label="la_fld_End" Module="In-Commerce" Type="1" Column="RW5k">RW5kIERhdGU=</PHRASE>
+			<PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1" Column="RXhwaXJhdGlvbg==">RXhwaXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_fld_Featured" Module="In-Commerce" Type="1">RmVhdHVyZWQ=</PHRASE>
+			<PHRASE Label="la_fld_FirstDayDelivery" Module="In-Commerce" Type="1">Rmlyc3QgRGF5</PHRASE>
+			<PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1" Column="RmxhdCBTdXJjaGFyZ2U=">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
+			<PHRASE Label="la_fld_FreeShippingMinAmount" Module="In-Commerce" Type="1">TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
+			<PHRASE Label="la_fld_From" Module="In-Commerce" Type="1">RnJvbQ==</PHRASE>
+			<PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1" Column="RnJvbSBBbW91bnQ=">RnJvbSBBbW91bnQ=</PHRASE>
+			<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
+			<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
+			<PHRASE Label="la_fld_GiftCertificateAmountApplied" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ=</PHRASE>
+			<PHRASE Label="la_fld_GiftCertificateNumber" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBudW1iZXI=</PHRASE>
+			<PHRASE Label="la_fld_GroundDelivery" Module="In-Commerce" Type="1">R3JvdW5kIERlbGl2ZXJ5</PHRASE>
+			<PHRASE Label="la_fld_Groups" Module="In-Commerce" Type="1">VXNlciBHcm91cHMgU2VsZWN0aW9u</PHRASE>
+			<PHRASE Label="la_fld_Instructions" Module="In-Commerce" Type="1">SW5zdHJ1Y3Rpb25z</PHRASE>
+			<PHRASE Label="la_fld_InsuranceFee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
+			<PHRASE Label="la_fld_Insurance_Fee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
+			<PHRASE Label="la_fld_Insurance_Type" Module="In-Commerce" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_InventoryStatus" Module="In-Commerce" Type="1">RW5hYmxlZA==</PHRASE>
+			<PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1" Column="UHJvbW8=">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_fld_IsProfileAddress" Module="In-Commerce" Type="1" Column="UHJvZmlsZSBBZGRyZXNz">UHJvZmlsZSBBZGRyZXNz</PHRASE>
+			<PHRASE Label="la_fld_IsRecurringBilling" Module="In-Commerce" Type="1">UmVjdXJyaW5nIEJpbGxpbmc=</PHRASE>
+			<PHRASE Label="la_fld_ItemsSold" Module="In-Commerce" Type="1">SXRlbXMgU29sZA==</PHRASE>
+			<PHRASE Label="la_fld_LastPaymentDate" Module="In-Commerce" Type="1">TGFzdCBQYXltZW50IERhdGU=</PHRASE>
+			<PHRASE Label="la_fld_LastUsedAsBilling" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIGFzIFNoaXBwaW5n">TGFzdCBVc2VkIGFzIEJpbGxpbmc=</PHRASE>
+			<PHRASE Label="la_fld_LastUsedAsShipping" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIGFzIFNoaXBwaW5n">TGFzdCBVc2VkIGFzIFNoaXBwaW5n</PHRASE>
+			<PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIEJ5">TGFzdCBVc2VkIEJ5</PHRASE>
+			<PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIE9u">TGFzdCBVc2VkIE9u</PHRASE>
+			<PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1" Column="TGlzdGFibGU=">TGlzdGFibGU=</PHRASE>
+			<PHRASE Label="la_fld_ManageCombinations" Module="In-Commerce" Type="1">TWFuYWdlIE9wdGlvbnMgQ29tYmluYXRpb25z</PHRASE>
+			<PHRASE Label="la_fld_ManageShipping" Module="In-Commerce" Type="1">TWFuYWdlIFNoaXBwaW5nIFR5cGVz</PHRASE>
+			<PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1" Column="TWFudWZhY3R1cmVy">TWFudWZhY3R1cmVy</PHRASE>
+			<PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1" Column="TWF4IFF0eQ==">TWF4IFF0eQ==</PHRASE>
+			<PHRASE Label="la_fld_MinimumPaymentAmount" Module="In-Commerce" Type="1">TWluaW1hbCBQYXltZW50IEFtb3VudA==</PHRASE>
+			<PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1" Column="TWluIFF0eQ==">TWluIFF0eQ==</PHRASE>
+			<PHRASE Label="la_fld_MSRP" Module="In-Commerce" Type="1">TVNSUA==</PHRASE>
+			<PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1" Column="TmVnb3RpYXRlZA==">TmVnb3RpYXRlZA==</PHRASE>
+			<PHRASE Label="la_fld_NextCharge" Module="In-Commerce" Type="1">TmV4dCBDaGFyZ2UgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1" Column="TnVtYmVyIE9mIFVzZXM=">TnVtYmVyIE9mIFVzZXM=</PHRASE>
+			<PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1" Column="T24gSG9sZA==">T24gSG9sZA==</PHRASE>
+			<PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1" Column="T24gU2FsZQ==">UHJvZHVjdCBvbiBTYWxl</PHRASE>
+			<PHRASE Label="la_fld_OptionPrice" Module="In-Commerce" Type="1">T3B0aW9uIFByaWNl</PHRASE>
+			<PHRASE Label="la_fld_OptionsSelectionMode" Module="In-Commerce" Type="1">T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ==</PHRASE>
+			<PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1" Column="T3B0aW9uIFR5cGU=">T3B0aW9uIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_OptionValue" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVl</PHRASE>
+			<PHRASE Label="la_fld_OptionValues" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVlcw==</PHRASE>
+			<PHRASE Label="la_fld_OrderId" Module="In-Commerce" Type="1">T3JkZXIgSUQ=</PHRASE>
+			<PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
+			<PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1" Column="TnVtYmVy">TnVtYmVy</PHRASE>
+			<PHRASE Label="la_fld_Original" Module="In-Commerce" Type="1">T3JpZ2luYWw=</PHRASE>
+			<PHRASE Label="la_fld_OriginalAmount" Module="In-Commerce" Type="1">T3JpZ2luYWwgQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_PaymentAccount" Module="In-Commerce" Type="1">UGF5bWVudCBBY2NvdW50</PHRASE>
+			<PHRASE Label="la_fld_PaymentCardType" Module="In-Commerce" Type="1">Q2FyZCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_PaymentCCExpDate" Module="In-Commerce" Type="1">Q2FyZCBFeHBpcmF0aW9u</PHRASE>
+			<PHRASE Label="la_fld_PaymentCVV2" Module="In-Commerce" Type="1">Q1ZWMg==</PHRASE>
+			<PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1" Column="UGF5bWVudCBEYXRl">UGF5bWVudCBEYXRl</PHRASE>
+			<PHRASE Label="la_fld_PaymentExpires" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRlL0V4cGlyYXRpb24=</PHRASE>
+			<PHRASE Label="la_fld_PaymentInterval" Module="In-Commerce" Type="1">UGF5bWVudCBJbnRlcnZhbA==</PHRASE>
+			<PHRASE Label="la_fld_PaymentNameOnCard" Module="In-Commerce" Type="1">TmFtZSBvbiB0aGUgQ2FyZA==</PHRASE>
+			<PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1" Column="UGF5bWVudCBSZWZlcmVuY2U=">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
+			<PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1" Column="UGF5bWVudCBUeXBl">UGF5bWVudCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_PaymentTypeCurrencies" Module="In-Commerce" Type="1">QXZhaWxhYmxlIEN1cnJlbmNpZXM=</PHRASE>
+			<PHRASE Label="la_fld_PaymentTypeId" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlIElk</PHRASE>
+			<PHRASE Label="la_fld_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
+			<PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1" Column="UGVyY2VudCBTdXJjaGFyZ2U=">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
+			<PHRASE Label="la_fld_Period" Module="In-Commerce" Type="1">UGVyaW9k</PHRASE>
+			<PHRASE Label="la_fld_PlacedOrdersEdit" Module="In-Commerce" Type="1">QWxsb3cgUGxhY2VkIE9yZGVycyBFZGl0aW5n</PHRASE>
+			<PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1" Column="UGxhbiBUeXBl">UGxhbiBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1" Column="UG9pbnRz">UG9pbnRz</PHRASE>
+			<PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1" Column="UHJpY2U=">UHJpY2U=</PHRASE>
+			<PHRASE Label="la_fld_PriceType" Module="In-Commerce" Type="1">UHJpY2UgTW9kaWZpZXIgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_ProcessingFee" Module="In-Commerce" Type="1">UHJvY2Vzc2luZyBGZWU=</PHRASE>
+			<PHRASE Label="la_fld_ProductFreeShipping" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
+			<PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1" Column="VHlwZQ==">UHJvZHVjdCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_Product_MaxHotNumber" Module="In-Commerce" Type="1">TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw==</PHRASE>
+			<PHRASE Label="la_fld_Product_MinPopRating" Module="In-Commerce" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A=</PHRASE>
+			<PHRASE Label="la_fld_Product_MinPopVotes" Module="In-Commerce" Type="1">TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA==</PHRASE>
+			<PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1" Column="QmFja29yZGVyZWQ=">UXR5IEJhY2tPcmRlcmVk</PHRASE>
+			<PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1" Column="UXR5IEluIFN0b2Nr">UXR5IEluIFN0b2Nr</PHRASE>
+			<PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1" Column="UXR5SW5TdG9ja01pbg==">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
+			<PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1" Column="UXR5IE9uIE9yZGVy">UXR5IE9uIE9yZGVy</PHRASE>
+			<PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1" Column="UXR5IFJlc2VydmVk">UXR5IFJlc2VydmVk</PHRASE>
+			<PHRASE Label="la_fld_QtySold" Module="In-Commerce" Type="1">UXR5IFNvbGQ=</PHRASE>
+			<PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1" Column="UmF0ZSBUbyBQcmltYXJ5">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
+			<PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1" Column="UmVnaXN0ZXJlZCBPbg==">UmVnaXN0ZXJlZCBPbg==</PHRASE>
+			<PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1" Column="UmVtYWluaW5nIEFtb3VudA==">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
+			<PHRASE Label="la_fld_ReportType" Module="In-Commerce" Type="1">UmVwb3J0IFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_SecondDayDelivery" Module="In-Commerce" Type="1">U2Vjb25kIERheQ==</PHRASE>
+			<PHRASE Label="la_fld_SelectedGroups" Module="In-Commerce" Type="1">U2VsZWN0ZWQgVXNlciBHcm91cHM=</PHRASE>
+			<PHRASE Label="la_fld_ShipMethod" Module="In-Commerce" Type="1">U2hpcCBNZXRob2Q=</PHRASE>
+			<PHRASE Label="la_fld_ShippingAddress1" Module="In-Commerce" Type="1">U2hpcHBpbmcgQWRkcmVzcyBMaW5lIDE=</PHRASE>
+			<PHRASE Label="la_fld_ShippingAddress2" Module="In-Commerce" Type="1">U2hpcHBpbmcgQWRkcmVzcyBMaW5lIDI=</PHRASE>
+			<PHRASE Label="la_fld_ShippingCity" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ2l0eQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCode" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCompany" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29tcGFueQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingControl" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29udHJvbA==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCost" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29zdA==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgQ291bnRyeQ==">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCustomerAccount" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ3VzdG9tZXIgQWNjb3VudA==</PHRASE>
+			<PHRASE Label="la_fld_ShippingDate" Module="In-Commerce" Type="1">U2hpcHBpbmcgRGF0ZS9UaW1l</PHRASE>
+			<PHRASE Label="la_fld_ShippingEmail" Module="In-Commerce" Type="1">U2hpcHBpbmcgRW1haWw=</PHRASE>
+			<PHRASE Label="la_fld_ShippingFax" Module="In-Commerce" Type="1">U2hpcHBpbmcgRmF4</PHRASE>
+			<PHRASE Label="la_fld_ShippingMode" Module="In-Commerce" Type="1">QWxsb3dlZCBTaGlwcGluZyBUeXBlcw==</PHRASE>
+			<PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingOption" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9u</PHRASE>
+			<PHRASE Label="la_fld_ShippingOptions" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9ucw==</PHRASE>
+			<PHRASE Label="la_fld_ShippingPhone" Module="In-Commerce" Type="1">U2hpcHBpbmcgUGhvbmU=</PHRASE>
+			<PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingState" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3RhdGU=</PHRASE>
+			<PHRASE Label="la_fld_ShippingTo" Module="In-Commerce" Type="1">U2hpcHBpbmcgVG8=</PHRASE>
+			<PHRASE Label="la_fld_ShippingTracking" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHJhY2tpbmcvUmVmZXJlbmNl</PHRASE>
+			<PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1" Column="VHlwZQ==">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingTypeId" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZSBJRA==</PHRASE>
+			<PHRASE Label="la_fld_ShippingTypes" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZXM=</PHRASE>
+			<PHRASE Label="la_fld_ShippingZip" Module="In-Commerce" Type="1">U2hpcHBpbmcgWmlwY29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgWm9uZSBOYW1l">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
+			<PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1" Column="U0tV">U0tV</PHRASE>
+			<PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgU3BlZWQ=">U3BlZWQgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_SSN" Module="In-Commerce" Type="1">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
+			<PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1" Column="U3RhcnQ=">U3RhcnQgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
+			<PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gUHJvY2Vzc2luZw==">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
+			<PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gU2hpcHBpbmc=">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1" Column="VGF4IFZhbHVl">VGF4IFZhbHVl</PHRASE>
+			<PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1" Column="VGF4IFpvbmUgTmFtZQ==">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
+			<PHRASE Label="la_fld_ThirdDayDelivery" Module="In-Commerce" Type="1">VGhpcmQgRGF5</PHRASE>
+			<PHRASE Label="la_fld_Time" Module="In-Commerce" Type="1">VGltZQ==</PHRASE>
+			<PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1" Column="VG8gQW1vdW50">VG8gQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_ToDateTime" Module="In-Commerce" Type="1">VG8gZGF0ZS90aW1l</PHRASE>
+			<PHRASE Label="la_fld_TopSeller" Module="In-Commerce" Type="1">VG9wIFNlbGxlcg==</PHRASE>
+			<PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1" Column="VG90YWwgQW1vdW50">VG90YWwgQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_TotalReturns" Module="In-Commerce" Type="1">VG90YWwgUmV0dXJucw==</PHRASE>
+			<PHRASE Label="la_fld_TotalSavings" Module="In-Commerce" Type="1">VG90YWwgU2F2aW5ncw==</PHRASE>
+			<PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1" Column="TGltaXQ=">TGluaXQ=</PHRASE>
+			<PHRASE Label="la_fld_UserComment" Module="In-Commerce" Type="1">VXNlciBDb21tZW50</PHRASE>
+			<PHRASE Label="la_fld_VAT" Module="In-Commerce" Type="1">U2FsZXMgVGF4L1ZBVA==</PHRASE>
+			<PHRASE Label="la_fld_VATIncluded" Module="In-Commerce" Type="1">VkFUIEluY2x1ZGVk</PHRASE>
+			<PHRASE Label="la_fld_VerificationResult" Module="In-Commerce" Type="1">VmVyaWZpY2F0aW9uIFJlc3VsdA==</PHRASE>
+			<PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1" Column="V2VpZ2h0">V2VpZ2h0</PHRASE>
+			<PHRASE Label="la_fld_WeightType" Module="In-Commerce" Type="1">V2VpZ2h0IE1vZGlmaWVyIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1" Column="Wm9uZSBOYW1l">Wm9uZSBOYW1l</PHRASE>
+			<PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1" Column="Wm9uZSBUeXBl">VHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_Zone_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
+			<PHRASE Label="la_FontColor" Module="In-Commerce" Type="1">Rm9udCBDb2xvcg==</PHRASE>
+			<PHRASE Label="la_FreeShipping" Module="In-Commerce" Type="1">RnJlZSBTaGlwcGluZw==</PHRASE>
+			<PHRASE Label="la_GBP" Module="In-Commerce" Type="1">UG91bmQgU3Rlcmxpbmc=</PHRASE>
+			<PHRASE Label="la_GEL" Module="In-Commerce" Type="1">TGFyaQ==</PHRASE>
+			<PHRASE Label="la_GenerateCode" Module="In-Commerce" Type="1">R2VuZXJhdGUgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_GHC" Module="In-Commerce" Type="1">Q2VkaQ==</PHRASE>
+			<PHRASE Label="la_GIP" Module="In-Commerce" Type="1">R2licmFsdGFyIFBvdW5k</PHRASE>
+			<PHRASE Label="la_GMD" Module="In-Commerce" Type="1">RGFsYXNp</PHRASE>
+			<PHRASE Label="la_GNF" Module="In-Commerce" Type="1">R3VpbmVhIEZyYW5j</PHRASE>
+			<PHRASE Label="la_GTQ" Module="In-Commerce" Type="1">UXVldHphbA==</PHRASE>
+			<PHRASE Label="la_GWP" Module="In-Commerce" Type="1">R3VpbmVhLUJpc3NhdSBQZXNv</PHRASE>
+			<PHRASE Label="la_GYD" Module="In-Commerce" Type="1">R3V5YW5hIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_Handling" Module="In-Commerce" Type="1">aGFuZGxpbmc=</PHRASE>
+			<PHRASE Label="la_Help" Module="In-Commerce" Type="1">SGVscA==</PHRASE>
+			<PHRASE Label="la_HKD" Module="In-Commerce" Type="1">SG9uZyBLb25nIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_HNL" Module="In-Commerce" Type="1">TGVtcGlyYQ==</PHRASE>
+			<PHRASE Label="la_HRK" Module="In-Commerce" Type="1">Q3JvYXRpYW4ga3VuYQ==</PHRASE>
+			<PHRASE Label="la_HTG" Module="In-Commerce" Type="1">R291cmRl</PHRASE>
+			<PHRASE Label="la_HUF" Module="In-Commerce" Type="1">Rm9yaW50</PHRASE>
+			<PHRASE Label="la_IDR" Module="In-Commerce" Type="1">UnVwaWFo</PHRASE>
+			<PHRASE Label="la_ILS" Module="In-Commerce" Type="1">TmV3IElzcmFlbGkgU2hlcWVs</PHRASE>
+			<PHRASE Label="la_In-commerce" Module="In-Commerce" Type="1">SW4tQ29tbWVyY2U=</PHRASE>
+			<PHRASE Label="la_Incomplete" Module="In-Commerce" Type="1">SW5jb21wbGV0ZQ==</PHRASE>
+			<PHRASE Label="la_INR" Module="In-Commerce" Type="1">SW5kaWFuIFJ1cGVl</PHRASE>
+			<PHRASE Label="la_Insurance_Fee" Module="In-Commerce" Type="1">SW5zdXJhbmNl</PHRASE>
+			<PHRASE Label="la_InvalidState" Module="In-Commerce" Type="1">U3RhdGUgaXMgaW52YWxpZA==</PHRASE>
+			<PHRASE Label="la_Invoiced" Module="In-Commerce" Type="1">SW52b2ljZWQ=</PHRASE>
+			<PHRASE Label="la_IQD" Module="In-Commerce" Type="1">SXJhcWkgRGluYXI=</PHRASE>
+			<PHRASE Label="la_IRR" Module="In-Commerce" Type="1">SXJhbmlhbiBSaWFs</PHRASE>
+			<PHRASE Label="la_ISK" Module="In-Commerce" Type="1">SWNlbGFuZCBLcm9uYQ==</PHRASE>
+			<PHRASE Label="la_ISOUsedIfBlank" Module="In-Commerce" Type="1">SVNPIENvZGUgd2lsbCBiZSB1c2VkIGlmIGxlZnQgYmxhbms=</PHRASE>
+			<PHRASE Label="la_ItemBackordered" Module="In-Commerce" Type="1">YmFja29yZGVyZWQ=</PHRASE>
+			<PHRASE Label="la_ItemTab_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
+			<PHRASE Label="la_JMD" Module="In-Commerce" Type="1">SmFtYWljYW4gRG9sbGFy</PHRASE>
+			<PHRASE Label="la_JOD" Module="In-Commerce" Type="1">Sm9yZGFuaWFuIERpbmFy</PHRASE>
+			<PHRASE Label="la_JPY" Module="In-Commerce" Type="1">WWVu</PHRASE>
+			<PHRASE Label="la_KES" Module="In-Commerce" Type="1">S2VueWFuIFNoaWxsaW5n</PHRASE>
+			<PHRASE Label="la_kg" Module="In-Commerce" Type="1">a2c=</PHRASE>
+			<PHRASE Label="la_KGS" Module="In-Commerce" Type="1">U29t</PHRASE>
+			<PHRASE Label="la_KHR" Module="In-Commerce" Type="1">UmllbA==</PHRASE>
+			<PHRASE Label="la_KMF" Module="In-Commerce" Type="1">Q29tb3JvIEZyYW5j</PHRASE>
+			<PHRASE Label="la_KPW" Module="In-Commerce" Type="1">Tm9ydGggS29yZWFuIFdvbg==</PHRASE>
+			<PHRASE Label="la_KRW" Module="In-Commerce" Type="1">V29u</PHRASE>
+			<PHRASE Label="la_KWD" Module="In-Commerce" Type="1">S3V3YWl0aSBEaW5hcg==</PHRASE>
+			<PHRASE Label="la_KYD" Module="In-Commerce" Type="1">Q2F5bWFuIElzbGFuZHMgRG9sbGFy</PHRASE>
+			<PHRASE Label="la_KZT" Module="In-Commerce" Type="1">VGVuZ2U=</PHRASE>
+			<PHRASE Label="la_LAK" Module="In-Commerce" Type="1">S2lw</PHRASE>
+			<PHRASE Label="la_LBP" Module="In-Commerce" Type="1">TGViYW5lc2UgUG91bmQ=</PHRASE>
+			<PHRASE Label="la_lbs" Module="In-Commerce" Type="1">cG91bmRz</PHRASE>
+			<PHRASE Label="la_Left" Module="In-Commerce" Type="1">TGVmdA==</PHRASE>
+			<PHRASE Label="la_LKR" Module="In-Commerce" Type="1">U3JpIExhbmthIFJ1cGVl</PHRASE>
+			<PHRASE Label="la_LRD" Module="In-Commerce" Type="1">TGliZXJpYW4gRG9sbGFy</PHRASE>
+			<PHRASE Label="la_LSL" Module="In-Commerce" Type="1">TG90aQ==</PHRASE>
+			<PHRASE Label="la_LTL" Module="In-Commerce" Type="1">TGl0aHVhbmlhbiBMaXR1cw==</PHRASE>
+			<PHRASE Label="la_LVL" Module="In-Commerce" Type="1">TGF0dmlhbiBMYXRz</PHRASE>
+			<PHRASE Label="la_LYD" Module="In-Commerce" Type="1">THliaWFuIERpbmFy</PHRASE>
+			<PHRASE Label="la_MAD" Module="In-Commerce" Type="1">TW9yb2NjYW4gRGlyaGFt</PHRASE>
+			<PHRASE Label="la_Manual" Module="In-Commerce" Type="1">TWFudWFs</PHRASE>
+			<PHRASE Label="la_MaskProcessedCreditCards" Module="In-Commerce" Type="1">TWFzayBQcm9jZXNzZWQgQ3JlZGl0IENhcmRz</PHRASE>
+			<PHRASE Label="la_MaxAddresses" Module="In-Commerce" Type="1">TnVtYmVyIG9mIGFsbG93ZWQgYWRkcmVzc2Vz</PHRASE>
+			<PHRASE Label="la_MDL" Module="In-Commerce" Type="1">TW9sZG92YW4gTGV1</PHRASE>
+			<PHRASE Label="la_MGA" Module="In-Commerce" Type="1">TUdB</PHRASE>
+			<PHRASE Label="la_MGF" Module="In-Commerce" Type="1">TWFsYWdhc3kgRnJhbmM=</PHRASE>
+			<PHRASE Label="la_MKD" Module="In-Commerce" Type="1">RGVuYXI=</PHRASE>
+			<PHRASE Label="la_MMK" Module="In-Commerce" Type="1">S3lhdA==</PHRASE>
+			<PHRASE Label="la_MNT" Module="In-Commerce" Type="1">VHVncmlr</PHRASE>
+			<PHRASE Label="la_ModifyByValue" Module="In-Commerce" Type="1">VmFsdWU=</PHRASE>
+			<PHRASE Label="la_ModifyOperation" Module="In-Commerce" Type="1">T3BlcmF0aW9u</PHRASE>
+			<PHRASE Label="la_month" Module="In-Commerce" Type="1">bW9udGg=</PHRASE>
+			<PHRASE Label="la_MOP" Module="In-Commerce" Type="1">UGF0YWNh</PHRASE>
+			<PHRASE Label="la_MRO" Module="In-Commerce" Type="1">T3VndWl5YQ==</PHRASE>
+			<PHRASE Label="la_msg_ConfirmDeletePricing" Module="In-Commerce" Type="1">UGxlYXNlIGNvbmZpcm0geW91IHdhbnQgdG8gZGVsZXRlIHRoZSBQcmljaW5nIGZvciB0aGlzIFVzZXIgR3JvdXAuIENsaWNrIE9LIHRvIHByb2NlZWQgd2l0aCBkZWxldGlvbiwgb3IgY2xpY2sgQ2FuY2VsIHRvIGNhbmNlbCBpdC4=</PHRASE>
+			<PHRASE Label="la_MTL" Module="In-Commerce" Type="1">TWFsdGVzZSBMaXJh</PHRASE>
+			<PHRASE Label="la_MUR" Module="In-Commerce" Type="1">TWF1cml0aXVzIFJ1cGVl</PHRASE>
+			<PHRASE Label="la_MVR" Module="In-Commerce" Type="1">UnVmaXlhYQ==</PHRASE>
+			<PHRASE Label="la_MWK" Module="In-Commerce" Type="1">S3dhY2hh</PHRASE>
+			<PHRASE Label="la_MXN" Module="In-Commerce" Type="1">TWV4aWNhbiBQZXNv</PHRASE>
+			<PHRASE Label="la_MXV" Module="In-Commerce" Type="1">TWV4aWNhbiBVbmlkYWQgZGUgSW52ZXJzaW9uIChVREkp</PHRASE>
+			<PHRASE Label="la_MYR" Module="In-Commerce" Type="1">TWFsYXlzaWFuIFJpbmdnaXQ=</PHRASE>
+			<PHRASE Label="la_MZM" Module="In-Commerce" Type="1">TWV0aWNhbA==</PHRASE>
+			<PHRASE Label="la_NAD" Module="In-Commerce" Type="1">TmFtaWJpYSBEb2xsYXI=</PHRASE>
+			<PHRASE Label="la_NGN" Module="In-Commerce" Type="1">TmFpcmE=</PHRASE>
+			<PHRASE Label="la_NIO" Module="In-Commerce" Type="1">Q29yZG9iYSBPcm8=</PHRASE>
+			<PHRASE Label="la_NOK" Module="In-Commerce" Type="1">Tm9yd2VnaWFuIEtyb25l</PHRASE>
+			<PHRASE Label="la_NoShipments" Module="In-Commerce" Type="1">Tm8gU2hpcG1lbnRz</PHRASE>
+			<PHRASE Label="la_NotAllowed" Module="In-Commerce" Type="1">Tm90IEFsbG93ZWQ=</PHRASE>
+			<PHRASE Label="la_NoZonesOrBrackets" Module="In-Commerce" Type="1">WW91IG11c3QgaGF2ZSBib3RoIHpvbmVzIGFuZCBicmFja2V0cyBkZWZpbmVkIGJlZm9yZSBlZGl0aW5nIHNoaXBwaW5nIGNvc3Rz</PHRASE>
+			<PHRASE Label="la_NPR" Module="In-Commerce" Type="1">TmVwYWxlc2UgUnVwZWU=</PHRASE>
+			<PHRASE Label="la_NZD" Module="In-Commerce" Type="1">TmV3IFplYWxhbmQgRG9sbGFy</PHRASE>
+			<PHRASE Label="la_OMR" Module="In-Commerce" Type="1">UmlhbCBPbWFuaQ==</PHRASE>
+			<PHRASE Label="la_OnlineStore" Module="In-Commerce" Type="1">T25saW5lIFN0b3Jl</PHRASE>
+			<PHRASE Label="la_opt_AutoGroupShipments" Module="In-Commerce" Type="1">QXV0by1ncm91cCBzaGlwbWVudHM=</PHRASE>
+			<PHRASE Label="la_opt_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
+			<PHRASE Label="la_opt_Exchange" Module="In-Commerce" Type="1">RXhjaGFuZ2U=</PHRASE>
+			<PHRASE Label="la_opt_Interval" Module="In-Commerce" Type="1">SW50ZXJ2YWw=</PHRASE>
+			<PHRASE Label="la_opt_List" Module="In-Commerce" Type="1">TGlzdGluZw==</PHRASE>
+			<PHRASE Label="la_opt_ManualGroupShipments" Module="In-Commerce" Type="1">R3JvdXAgc2hpcG1lbnRzIG1hbnVhbGx5</PHRASE>
+			<PHRASE Label="la_opt_PermanentCookie" Module="In-Commerce" Type="1">UGVybWFuZW50IENvb2tpZQ==</PHRASE>
+			<PHRASE Label="la_opt_PostalMail" Module="In-Commerce" Type="1">UG9zdGFsIE1haWw=</PHRASE>
+			<PHRASE Label="la_opt_PriceCalculationByOptimal" Module="In-Commerce" Type="1">T3B0aW1hbCBQcmljZQ==</PHRASE>
+			<PHRASE Label="la_opt_PriceCalculationByPrimary" Module="In-Commerce" Type="1">UHJpbWFyeSBQcmljZQ==</PHRASE>
+			<PHRASE Label="la_opt_Refund" Module="In-Commerce" Type="1">UmVmdW5k</PHRASE>
+			<PHRASE Label="la_opt_Selection" Module="In-Commerce" Type="1">U2VsZWN0aW9u</PHRASE>
+			<PHRASE Label="la_opt_Session" Module="In-Commerce" Type="1">U2Vzc2lvbg==</PHRASE>
+			<PHRASE Label="la_opt_Verified" Module="In-Commerce" Type="1">VmVyaWZpZWQ=</PHRASE>
+			<PHRASE Label="la_opt_Warranty" Module="In-Commerce" Type="1">V2FycmFudHk=</PHRASE>
+			<PHRASE Label="la_OrderMainNumberDigits" Module="In-Commerce" Type="1">T3JkZXIgbWFpbiBudW1iZXIgZGlnaXRz</PHRASE>
+			<PHRASE Label="la_OrderSecNumberDigits" Module="In-Commerce" Type="1">T3JkZXIgc3VibnVtYmVyIGRpZ2l0cw==</PHRASE>
+			<PHRASE Label="la_OrderSubtotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
+			<PHRASE Label="la_orders_NextOrderNumber" Module="In-Commerce" Type="1">TmV4dCBPcmRlciBOdW1iZXI=</PHRASE>
+			<PHRASE Label="la_orders_RequireLogin" Module="In-Commerce" Type="1">UmVxdWlyZSBsb2dpbiBiZWZvcmUgY2hlY2tvdXQ=</PHRASE>
+			<PHRASE Label="la_Order_Billing_Information" Module="In-Commerce" Type="1">T3JkZXIgQmlsbGluZyBJbmZvcm1hdGlvbg==</PHRASE>
+			<PHRASE Label="la_Order_Preview" Module="In-Commerce" Type="1">T3JkZXIgUHJldmlldw==</PHRASE>
+			<PHRASE Label="la_Overall" Module="In-Commerce" Type="1">T3ZlcmFsbA==</PHRASE>
+			<PHRASE Label="la_oz" Module="In-Commerce" Type="1">b3VuY2Vz</PHRASE>
+			<PHRASE Label="la_PAB" Module="In-Commerce" Type="1">QmFsYm9h</PHRASE>
+			<PHRASE Label="la_PEN" Module="In-Commerce" Type="1">TnVldm8gU29s</PHRASE>
+			<PHRASE Label="la_Percent" Module="In-Commerce" Type="1">UGVyY2VudA==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliates.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIEFmZmlsaWF0ZXM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliates.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBBZmZpbGlhdGVz</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_payment_types.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_payment_types.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBBZmZpbGlhdGUgUGF5bWVudCBUeXBl</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_payment_types.advanced:move_down" Module="In-Commerce" Type="1">TW92ZS1kb3duIEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_payment_types.advanced:move_up" Module="In-Commerce" Type="1">TW92ZS11cCBBZmZpbGlhdGUgUGF5bWVudCBUeXBl</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_payment_types.advanced:set_primary" Module="In-Commerce" Type="1">U2V0IFByaW1hcnkgQWZmaWxpYXRlIFBheW1lbnQgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_plans.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIEFmZmlsaWF0ZSBQbGFucw==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_plans.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBBZmZpbGlhdGUgUGxhbnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:affiliate_plans.advanced:set_primary" Module="In-Commerce" Type="1">U2V0IFByaW1hcnkgQWZmaWxpYXRlIFBsYW4=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:coupons.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIENvdXBvbnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:coupons.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBDb3Vwb25z</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:currencies.advanced:move_down" Module="In-Commerce" Type="1">TW92ZS1kb3duIFByaW9yaXR5IGZvciBDdXJyZW5jeQ==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:currencies.advanced:move_up" Module="In-Commerce" Type="1">TW92ZS11cCBQcmlvcml0eSBmb3IgQ3VycmVuY3k=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:currencies.advanced:set_primary" Module="In-Commerce" Type="1">U2V0IFByaW1hcnkgQ3VycmVuY3k=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:currencies.advanced:update_rate" Module="In-Commerce" Type="1">VXBkYXRlIEN1cnJlbmN5IFJhdGVz</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:discounts.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIERpc2NvdW50cw==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:discounts.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBEaXNjb3VudHM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:gift-certificates.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIEdpZnQgQ2VydGlmaWNhdGVz</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:gift-certificates.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBHaWZ0IENlcnRpZmljYXRlcw==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:approve" Module="In-Commerce" Type="1">QXBwcm92ZSBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:archive" Module="In-Commerce" Type="1">QXJjaGl2ZSBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:deny" Module="In-Commerce" Type="1">RGVueSBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:place" Module="In-Commerce" Type="1">UGxhY2UgT3JkZXJz</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:process" Module="In-Commerce" Type="1">UHJvY2VzcyBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:reset_to_pending" Module="In-Commerce" Type="1">UmVzZXQgT3JkZXJzIHRvIFBlbmRpbmc=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:orders.advanced:ship" Module="In-Commerce" Type="1">U2hpcCBPcmRlcnM=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:shipping.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIFNoaXBwaW5nIFR5cGU=</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:shipping.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBUeXBl</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIFNoaXBwaW5nIFF1b3RpbmcgRW5naW5lcw==</PHRASE>
+			<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBRdW90aW5nIEVuZ2luZXM=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Add_desc" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Delete_desc" Module="In-Commerce" Type="1">RGVsZXRlIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Modify_desc" Module="In-Commerce" Type="1">TW9kaWZ5IFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Rate_desc" Module="In-Commerce" Type="1">UmF0ZSBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
+			<PHRASE Label="la_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_Perpage_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZQ==</PHRASE>
+			<PHRASE Label="la_Perpage_Manufacturers_Short" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZSBvbiBhIHNob3J0IGxpc3Rpbmc=</PHRASE>
+			<PHRASE Label="la_Perpage_Products" Module="In-Commerce" Type="1">TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdl</PHRASE>
+			<PHRASE Label="la_Perpage_Products_Shortlist" Module="In-Commerce" Type="1">TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdlIG9uIGEgc2hvcnQgbGlzdGluZw==</PHRASE>
+			<PHRASE Label="la_PerUnit" Module="In-Commerce" Type="1">UGVyIFVuaXQ=</PHRASE>
+			<PHRASE Label="la_PGK" Module="In-Commerce" Type="1">S2luYQ==</PHRASE>
+			<PHRASE Label="la_PHP" Module="In-Commerce" Type="1">UGhpbGlwcGluZSBQZXNv</PHRASE>
+			<PHRASE Label="la_PKR" Module="In-Commerce" Type="1">UGFraXN0YW4gUnVwZWU=</PHRASE>
+			<PHRASE Label="la_PLN" Module="In-Commerce" Type="1">WmxvdHk=</PHRASE>
+			<PHRASE Label="la_Precision" Module="In-Commerce" Type="1">UHJlY2lzaW9u</PHRASE>
+			<PHRASE Label="la_prefix_ord" Module="In-Commerce" Type="1">T3JkZXI=</PHRASE>
+			<PHRASE Label="la_ProcessBackorderingAuto" Module="In-Commerce" Type="1">UHJvY2VzcyBiYWNrb3JkZXJzIGF1dG9tYXRpY2FsbHk=</PHRASE>
+			<PHRASE Label="la_Processed" Module="In-Commerce" Type="1">UHJvY2Vzc2Vk</PHRASE>
+			<PHRASE Label="la_ProcessingFee" Module="In-Commerce" Type="1">UHJvY2Vzc2luZyBGZWU=</PHRASE>
+			<PHRASE Label="la_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_ProductDeleted" Module="In-Commerce" Type="1">UHJvZHVjdCBEZWxldGVk</PHRASE>
+			<PHRASE Label="la_product_downloadable" Module="In-Commerce" Type="1">RG93bmxvYWRhYmxl</PHRASE>
+			<PHRASE Label="la_product_package" Module="In-Commerce" Type="1">UGFja2FnZQ==</PHRASE>
+			<PHRASE Label="la_product_service" Module="In-Commerce" Type="1">U2VydmljZQ==</PHRASE>
+			<PHRASE Label="la_product_subscription" Module="In-Commerce" Type="1">U3Vic2NyaXB0aW9u</PHRASE>
+			<PHRASE Label="la_product_tangible" Module="In-Commerce" Type="1">VGFuZ2libGU=</PHRASE>
+			<PHRASE Label="la_prompt_affiliate_cookie_duration" Module="In-Commerce" Type="1">QWZmaWxpYXRlIENvb2tpZSBEdXJhdGlvbiAoaW4gZGF5cyk=</PHRASE>
+			<PHRASE Label="la_prompt_affiliate_group" Module="In-Commerce" Type="1">QWZmaWxpYXRlIEdyb3Vw</PHRASE>
+			<PHRASE Label="la_prompt_affiliate_storage_method" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFN0b3JhZ2UgTWV0aG9k</PHRASE>
+			<PHRASE Label="la_prompt_Multilingual" Module="In-Commerce" Type="1">TXVsdGlsaW5ndWFs</PHRASE>
+			<PHRASE Label="la_prompt_PriceBracketCalculation" Module="In-Commerce" Type="1">Q2FsY3VsYXRlIFByaWNpbmcgYnk=</PHRASE>
+			<PHRASE Label="la_prompt_register_as_affiliate" Module="In-Commerce" Type="1">QWxsb3cgcmVnaXN0cmF0aW9uIGFzIGFmZmlsaWF0ZQ==</PHRASE>
+			<PHRASE Label="la_PropagateValues" Module="In-Commerce" Type="1">UHJvcGFnYXRlIFZhbHVlcw==</PHRASE>
+			<PHRASE Label="la_PYG" Module="In-Commerce" Type="1">R3VhcmFuaQ==</PHRASE>
+			<PHRASE Label="la_QAR" Module="In-Commerce" Type="1">UWF0YXJpIFJpYWw=</PHRASE>
+			<PHRASE Label="la_quartely" Module="In-Commerce" Type="1">cXVhcnRlcg==</PHRASE>
+			<PHRASE Label="la_RecalculateOrder" Module="In-Commerce" Type="1">UmVjYWxjdWxhdGUgT3JkZXI=</PHRASE>
+			<PHRASE Label="la_RecurringChargeInverval" Module="In-Commerce" Type="1">Q2hhcmdlIFJlY3VycmluZyBPcmRlcnMgKGRheXMgaW4gYWR2YW5jZSk=</PHRASE>
+			<PHRASE Label="la_RecurringOrderDenied" Module="In-Commerce" Type="1">UmVjdXJyaW5nIE9yZGVyIERlbmllZA==</PHRASE>
+			<PHRASE Label="la_RecurringOrderProcessed" Module="In-Commerce" Type="1">UmVjdXJyaW5nIE9yZGVyIFByb2Nlc3NlZA==</PHRASE>
+			<PHRASE Label="la_ResetBackorderFlag" Module="In-Commerce" Type="1">UmVzZXQgYmFja29yZGVyIGZsYWcgYXV0b21hdGljYWxseSB3aGVuIEF2YWlsYWJsZSBxdWFudGl0eSBpcyBlcXVhbCB0bywgb3IgYWJvdmU=</PHRASE>
+			<PHRASE Label="la_reset_to_base" Module="In-Commerce" Type="1">UmVzZXQgVG8gQmFzZQ==</PHRASE>
+			<PHRASE Label="la_Right" Module="In-Commerce" Type="1">UmlnaHQ=</PHRASE>
+			<PHRASE Label="la_ROL" Module="In-Commerce" Type="1">TGV1</PHRASE>
+			<PHRASE Label="la_RUB" Module="In-Commerce" Type="1">UnVzc2lhbiBSdWJsZQ==</PHRASE>
+			<PHRASE Label="la_RUR" Module="In-Commerce" Type="1">UnVzc2lhbiBSdWJsZQ==</PHRASE>
+			<PHRASE Label="la_RWF" Module="In-Commerce" Type="1">UndhbmRhIEZyYW5j</PHRASE>
+			<PHRASE Label="la_SAR" Module="In-Commerce" Type="1">U2F1ZGkgUml5YWw=</PHRASE>
+			<PHRASE Label="la_SBD" Module="In-Commerce" Type="1">U29sb21vbiBJc2xhbmRzIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_SCR" Module="In-Commerce" Type="1">U2V5Y2hlbGxlcyBSdXBlZQ==</PHRASE>
+			<PHRASE Label="la_SDD" Module="In-Commerce" Type="1">U3VkYW5lc2UgRGluYXI=</PHRASE>
+			<PHRASE Label="la_section_AdvertisingMaterials" Module="In-Commerce" Type="1">QWR2ZXJ0aXNpbmcgTWF0ZXJpYWxz</PHRASE>
+			<PHRASE Label="la_section_Affiliate" Module="In-Commerce" Type="1">QWZmaWxpYXRl</PHRASE>
+			<PHRASE Label="la_section_Backordering" Module="In-Commerce" Type="1">QmFja29yZGVyaW5n</PHRASE>
+			<PHRASE Label="la_section_Comments" Module="In-Commerce" Type="1">Q29tbWVudHM=</PHRASE>
+			<PHRASE Label="la_section_CreditCard" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQ=</PHRASE>
+			<PHRASE Label="la_section_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
+			<PHRASE Label="la_section_EmailDelivery" Module="In-Commerce" Type="1">U2VuZCB2aWEgRS1tYWlsIHRv</PHRASE>
+			<PHRASE Label="la_section_Files" Module="In-Commerce" Type="1">RmlsZXM=</PHRASE>
+			<PHRASE Label="la_section_help_file_missing" Module="In-Commerce" Type="1">IFRoaXMgaGVscCBzZWN0aW9uIGRvZXMgbm90IHlldCBleGlzdCwgaXQncyBjb21pbmcgc29vbiE=</PHRASE>
+			<PHRASE Label="la_section_OrderBilling" Module="In-Commerce" Type="1">QmlsbGluZyBJbmZvcm1hdGlvbg==</PHRASE>
+			<PHRASE Label="la_section_OrderShipping" Module="In-Commerce" Type="1">U2hpcHBpbmcgSW5mb3JtYXRpb24=</PHRASE>
+			<PHRASE Label="la_section_PostalDelivery" Module="In-Commerce" Type="1">U2VuZCB2aWEgUG9zdGFsIE1haWwgdG8=</PHRASE>
+			<PHRASE Label="la_section_PriceBracket" Module="In-Commerce" Type="1">UHJpY2UgQnJhY2tldA==</PHRASE>
+			<PHRASE Label="la_section_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_section_ShippingCosts" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29zdHM=</PHRASE>
+			<PHRASE Label="la_section_ShippingZone" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZQ==</PHRASE>
+			<PHRASE Label="la_section_Statistics" Module="In-Commerce" Type="1">U3RhdGlzdGljcw==</PHRASE>
+			<PHRASE Label="la_section_StoreSettings" Module="In-Commerce" Type="1">U3RvcmUgU2V0dGluZ3M=</PHRASE>
+			<PHRASE Label="la_section_TaxZone" Module="In-Commerce" Type="1">VGF4IFpvbmU=</PHRASE>
+			<PHRASE Label="la_SEK" Module="In-Commerce" Type="1">U3dlZGlzaCBLcm9uYQ==</PHRASE>
+			<PHRASE Label="la_SelectedOnly" Module="In-Commerce" Type="1">U2VsZWN0ZWQgUHJvZHVjdHMgT25seQ==</PHRASE>
+			<PHRASE Label="la_SetBackorderFlag" Module="In-Commerce" Type="1">U2V0IGJhY2tvcmRlciBmbGFnIGF1dG9tYXRpY2FsbHkgd2hlbiBBdmFpbGFibGUgcXVhbnRpdHkgaXMgZXF1YWwgdG8=</PHRASE>
+			<PHRASE Label="la_SGD" Module="In-Commerce" Type="1">U2luZ2Fwb3JlIERvbGxhcg==</PHRASE>
+			<PHRASE Label="la_ShippingHandling" Module="In-Commerce" Type="1">U2hpcHBpbmcgYW5kIEhhbmRsaW5n</PHRASE>
+			<PHRASE Label="la_ShippingId" Module="In-Commerce" Type="1">SUQ=</PHRASE>
+			<PHRASE Label="la_shipping_AnyAndSelected" Module="In-Commerce" Type="1">QW55ICsgU2VsZWN0ZWQ=</PHRASE>
+			<PHRASE Label="la_Shipping_Code" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_Shipping_From_Location" Module="In-Commerce" Type="1">RnJvbSBMb2NhdGlvbg==</PHRASE>
+			<PHRASE Label="la_shipping_Limited" Module="In-Commerce" Type="1">U2VsZWN0ZWQgT25seQ==</PHRASE>
+			<PHRASE Label="la_Shipping_Name" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_Shipping_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
+			<PHRASE Label="la_ship_All_Together" Module="In-Commerce" Type="1">U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI=</PHRASE>
+			<PHRASE Label="la_ship_Backorders_Upon_Avail" Module="In-Commerce" Type="1">U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl</PHRASE>
+			<PHRASE Label="la_ship_Backorder_Separately" Module="In-Commerce" Type="1">U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5</PHRASE>
+			<PHRASE Label="la_SHP" Module="In-Commerce" Type="1">U2FpbnQgSGVsZW5hIFBvdW5k</PHRASE>
+			<PHRASE Label="la_SIT" Module="In-Commerce" Type="1">VG9sYXI=</PHRASE>
+			<PHRASE Label="la_SKK" Module="In-Commerce" Type="1">U2xvdmFrIEtvcnVuYQ==</PHRASE>
+			<PHRASE Label="la_SLL" Module="In-Commerce" Type="1">TGVvbmU=</PHRASE>
+			<PHRASE Label="la_SOS" Module="In-Commerce" Type="1">U29tYWxpIFNoaWxsaW5n</PHRASE>
+			<PHRASE Label="la_Speed_Code" Module="In-Commerce" Type="1">U3BlZWQgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_SRD" Module="In-Commerce" Type="1">U1JE</PHRASE>
+			<PHRASE Label="la_SRG" Module="In-Commerce" Type="1">U3VyaW5hbWUgR3VpbGRlcg==</PHRASE>
+			<PHRASE Label="la_StartingOrderNumber" Module="In-Commerce" Type="1">U3RhcnRpbmcgb3JkZXIgbnVtYmVy</PHRASE>
+			<PHRASE Label="la_State" Module="In-Commerce" Type="1">U3RhdGU=</PHRASE>
+			<PHRASE Label="la_STD" Module="In-Commerce" Type="1">RG9icmE=</PHRASE>
+			<PHRASE Label="la_StoreName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
+			<PHRASE Label="la_SVC" Module="In-Commerce" Type="1">RWwgU2FsdmFkb3IgQ29sb24=</PHRASE>
+			<PHRASE Label="la_SYP" Module="In-Commerce" Type="1">U3lyaWFuIFBvdW5k</PHRASE>
+			<PHRASE Label="la_SZL" Module="In-Commerce" Type="1">TGlsYW5nZW5p</PHRASE>
+			<PHRASE Label="la_tab_Access" Module="In-Commerce" Type="1">QWNjZXNz</PHRASE>
+			<PHRASE Label="la_tab_AccessAndPricing" Module="In-Commerce" Type="1">QWNjZXNzICYgUHJpY2luZw==</PHRASE>
+			<PHRASE Label="la_tab_Addresses" Module="In-Commerce" Type="1">QWRkcmVzc2Vz</PHRASE>
+			<PHRASE Label="la_tab_AffiliatePaymentTypes" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnQgVHlwZXM=</PHRASE>
+			<PHRASE Label="la_tab_AffiliatePlans" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW5z</PHRASE>
+			<PHRASE Label="la_tab_Affiliates" Module="In-Commerce" Type="1">QWZmaWxpYXRlcw==</PHRASE>
+			<PHRASE Label="la_tab_Archived" Module="In-Commerce" Type="1">QXJjaGl2ZWQ=</PHRASE>
+			<PHRASE Label="la_tab_Backorders" Module="In-Commerce" Type="1">QmFja29yZGVycw==</PHRASE>
+			<PHRASE Label="la_tab_Billing" Module="In-Commerce" Type="1">QmlsbGluZw==</PHRASE>
+			<PHRASE Label="la_tab_Brackets" Module="In-Commerce" Type="1">QnJhY2tldHM=</PHRASE>
+			<PHRASE Label="la_tab_ConfigContacts" Module="In-Commerce" Type="1">Q29udGFjdCBJbmZvcm1hdGlvbg==</PHRASE>
+			<PHRASE Label="la_tab_Costs" Module="In-Commerce" Type="1">Q29zdHM=</PHRASE>
+			<PHRASE Label="la_tab_Coupons" Module="In-Commerce" Type="1">Q291cG9ucw==</PHRASE>
+			<PHRASE Label="la_tab_CouponsItems" Module="In-Commerce" Type="1">SXRlbXM=</PHRASE>
+			<PHRASE Label="la_tab_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
+			<PHRASE Label="la_tab_CustomShippingTypes" Module="In-Commerce" Type="1">Q3VzdG9tIFNoaXBwaW5nIFR5cGVz</PHRASE>
+			<PHRASE Label="la_tab_Denied" Module="In-Commerce" Type="1">RGVuaWVk</PHRASE>
+			<PHRASE Label="la_tab_DiscountItems" Module="In-Commerce" Type="1">SXRlbXM=</PHRASE>
+			<PHRASE Label="la_tab_Discounts" Module="In-Commerce" Type="1">RGlzY291bnRz</PHRASE>
+			<PHRASE Label="la_tab_DiscountsAndCoupons" Module="In-Commerce" Type="1">RGlzY291bnRzICYgQ2VydGlmaWNhdGVz</PHRASE>
+			<PHRASE Label="la_tab_DownloadLog" Module="In-Commerce" Type="1">RG93bmxvYWQgTG9n</PHRASE>
+			<PHRASE Label="la_tab_Editing_Shipping_type" Module="In-Commerce" Type="1">RWRpdGluZyBTaGlwcGluZyB0eXBl</PHRASE>
+			<PHRASE Label="la_tab_FilesAndPricing" Module="In-Commerce" Type="1">RmlsZXMgJiBQcmljaW5n</PHRASE>
+			<PHRASE Label="la_tab_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
+			<PHRASE Label="la_tab_GiftCertificates" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZXM=</PHRASE>
+			<PHRASE Label="la_tab_Incomplete" Module="In-Commerce" Type="1">SW5jb21wbGV0ZQ==</PHRASE>
+			<PHRASE Label="la_tab_Inventory" Module="In-Commerce" Type="1">SW52ZW50b3J5</PHRASE>
+			<PHRASE Label="la_tab_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycw==</PHRASE>
+			<PHRASE Label="la_tab_NewRegional" Module="In-Commerce" Type="1">TkVXIFJlZ2lvbmFs</PHRASE>
+			<PHRASE Label="la_tab_Options" Module="In-Commerce" Type="1">T3B0aW9ucw==</PHRASE>
+			<PHRASE Label="la_tab_Orders" Module="In-Commerce" Type="1">T3JkZXJz</PHRASE>
+			<PHRASE Label="la_tab_PaymentLog" Module="In-Commerce" Type="1">VHJhbnNhY3Rpb25z</PHRASE>
+			<PHRASE Label="la_tab_Payments" Module="In-Commerce" Type="1">UGF5bWVudHM=</PHRASE>
+			<PHRASE Label="la_tab_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
+			<PHRASE Label="la_tab_Pending" Module="In-Commerce" Type="1">UGVuZGluZw==</PHRASE>
+			<PHRASE Label="la_tab_Preview" Module="In-Commerce" Type="1">UHJldmlldw==</PHRASE>
+			<PHRASE Label="la_tab_Pricing" Module="In-Commerce" Type="1">UHJpY2luZw==</PHRASE>
+			<PHRASE Label="la_tab_Processed" Module="In-Commerce" Type="1">UHJvY2Vzc2Vk</PHRASE>
+			<PHRASE Label="la_tab_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
+			<PHRASE Label="la_tab_Returns" Module="In-Commerce" Type="1">UmV0dXJuZWQ=</PHRASE>
+			<PHRASE Label="la_tab_SaleReports" Module="In-Commerce" Type="1">U2FsZXMgUmVwb3J0</PHRASE>
+			<PHRASE Label="la_tab_Shipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_tab_ShippingQuoteEngines" Module="In-Commerce" Type="1">U2hpcHBpbmcgUXVvdGUgRW5naW5lcw==</PHRASE>
+			<PHRASE Label="la_tab_ShippingZones" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZXM=</PHRASE>
+			<PHRASE Label="la_tab_Shipping_Types" Module="In-Commerce" Type="1">RWRpdGluZyBTaGlwcGluZyBUeXBlcw==</PHRASE>
+			<PHRASE Label="la_tab_Taxes" Module="In-Commerce" Type="1">VGF4ZXM=</PHRASE>
+			<PHRASE Label="la_tab_ToShip" Module="In-Commerce" Type="1">VG8gU2hpcA==</PHRASE>
+			<PHRASE Label="la_tab_UserGroups" Module="In-Commerce" Type="1">VXNlciBHcm91cHM=</PHRASE>
+			<PHRASE Label="la_text_Additional" Module="In-Commerce" Type="1">QWRkaXRpb25hbA==</PHRASE>
+			<PHRASE Label="la_Text_Affiliates" Module="In-Commerce" Type="1">QWZmaWxpYXRlcw==</PHRASE>
+			<PHRASE Label="la_Text_Carriers" Module="In-Commerce" Type="1">Q2FycmllcnM=</PHRASE>
+			<PHRASE Label="la_Text_Combination" Module="In-Commerce" Type="1">Q29tYmluYXRpb24=</PHRASE>
+			<PHRASE Label="la_text_CompanyName" Module="In-Commerce" Type="1">Q29tcGFueSBOYW1l</PHRASE>
+			<PHRASE Label="la_text_ContactName" Module="In-Commerce" Type="1">Q29udGFjdCBOYW1l</PHRASE>
+			<PHRASE Label="la_Text_ContactsGeneral" Module="In-Commerce" Type="1">R2VuZXJhbCBjb250YWN0IGluZm9ybWF0aW9u</PHRASE>
+			<PHRASE Label="la_Text_Coupons" Module="In-Commerce" Type="1">Q291cG9ucw==</PHRASE>
+			<PHRASE Label="la_Text_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
+			<PHRASE Label="la_Text_Delivery" Module="In-Commerce" Type="1">RGVsaXZlcnk=</PHRASE>
+			<PHRASE Label="la_text_Fax" Module="In-Commerce" Type="1">RmF4</PHRASE>
+			<PHRASE Label="la_Text_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycw==</PHRASE>
+			<PHRASE Label="la_Text_Option" Module="In-Commerce" Type="1">T3B0aW9u</PHRASE>
+			<PHRASE Label="la_Text_Orders" Module="In-Commerce" Type="1">T3JkZXJz</PHRASE>
+			<PHRASE Label="la_Text_Other" Module="In-Commerce" Type="1">T3RoZXI=</PHRASE>
+			<PHRASE Label="la_text_Others" Module="In-Commerce" Type="1">T3RoZXJz</PHRASE>
+			<PHRASE Label="la_Text_PricingCalculation" Module="In-Commerce" Type="1">UHJpY2UgQnJha2V0IENhbGN1bGF0aW9u</PHRASE>
+			<PHRASE Label="la_text_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
+			<PHRASE Label="la_Text_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
+			<PHRASE Label="la_Text_Properties" Module="In-Commerce" Type="1">UHJvcGVydGllcw==</PHRASE>
+			<PHRASE Label="la_text_ReportByTopProductCategories" Module="In-Commerce" Type="1">UHJvZHVjdCBDYXRlZ29yaWVzIGJ5</PHRASE>
+			<PHRASE Label="la_text_ReportByTopProducts" Module="In-Commerce" Type="1">UHJvZHVjdHMgYnk=</PHRASE>
+			<PHRASE Label="la_Text_ShippingAddress" Module="In-Commerce" Type="1">U2hpcHBpbmcgRnJvbSBhZGRyZXNz</PHRASE>
+			<PHRASE Label="la_Text_Shipping_Type" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_Text_StoreAddress" Module="In-Commerce" Type="1">Q29udGFjdCBBZGRyZXNz</PHRASE>
+			<PHRASE Label="la_text_StoreName" Module="In-Commerce" Type="1">U3RvcmUgTmFtZQ==</PHRASE>
+			<PHRASE Label="la_Text_TopSellers" Module="In-Commerce" Type="1">VG9wIHNlbGxlcnM=</PHRASE>
+			<PHRASE Label="la_THB" Module="In-Commerce" Type="1">QmFodA==</PHRASE>
+			<PHRASE Label="la_title_AddingAddress" Module="In-Commerce" Type="1">QWRkaW5nIEFkZHJlc3M=</PHRASE>
+			<PHRASE Label="la_title_AddingCurrency" Module="In-Commerce" Type="1">QWRkaW5nIEN1cnJlbmN5</PHRASE>
+			<PHRASE Label="la_title_AddingGiftCertificate" Module="In-Commerce" Type="1">QWRkaW5nIEdpZnQgQ2VydGlmaWNhdGU=</PHRASE>
+			<PHRASE Label="la_title_AddingManufacturer" Module="In-Commerce" Type="1">QWRkaW5nIG1hbnVmYWN0dXJlcg==</PHRASE>
+			<PHRASE Label="la_title_AddingPaymentType" Module="In-Commerce" Type="1">QWRkaW5nIFBheW1lbnQgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_title_AddingShippingType" Module="In-Commerce" Type="1">QWRkaW5nIFNoaXBwaW5nIFR5cGU=</PHRASE>
+			<PHRASE Label="la_title_AddingShippingZone" Module="In-Commerce" Type="1">QWRkaW5nIFNoaXBwaW5nIFpvbmU=</PHRASE>
+			<PHRASE Label="la_title_AddingTaxZone" Module="In-Commerce" Type="1">QWRkaW5nIFRheCBab25l</PHRASE>
+			<PHRASE Label="la_title_Adding_Affiliate" Module="In-Commerce" Type="1">QWRkaW5nIEFmZmlsaWF0ZQ==</PHRASE>
+			<PHRASE Label="la_title_Adding_Affiliate_Payment_Type" Module="In-Commerce" Type="1">QWRkaW5nIEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_title_Adding_Affiliate_Plan" Module="In-Commerce" Type="1">QWRkaW5nIEFmZmlsaWF0ZSBQbGFu</PHRASE>
+			<PHRASE Label="la_title_Adding_Coupon" Module="In-Commerce" Type="1">QWRkaW5nIENvdXBvbg==</PHRASE>
+			<PHRASE Label="la_title_Adding_Discount" Module="In-Commerce" Type="1">QWRkaW5nIERpc2NvdW50</PHRASE>
+			<PHRASE Label="la_title_Adding_File" Module="In-Commerce" Type="1">QWRkaW5nIEZpbGU=</PHRASE>
+			<PHRASE Label="la_title_Adding_Option" Module="In-Commerce" Type="1">QWRkaW5nIE9wdGlvbg==</PHRASE>
+			<PHRASE Label="la_title_Adding_Order" Module="In-Commerce" Type="1">QWRkaW5nIE9yZGVy</PHRASE>
+			<PHRASE Label="la_title_Adding_PriceBracket" Module="In-Commerce" Type="1">QWRkaW5nIFByaWNlIEJyYWNrZXQ=</PHRASE>
+			<PHRASE Label="la_title_Adding_Product" Module="In-Commerce" Type="1">QWRkaW5nIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_title_Addresses" Module="In-Commerce" Type="1">QWRkcmVzc2Vz</PHRASE>
+			<PHRASE Label="la_title_AffiliatePayments" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnRz</PHRASE>
+			<PHRASE Label="la_title_AffiliatePaymentTypes" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBheW1lbnQgVHlwZXM=</PHRASE>
+			<PHRASE Label="la_title_AffiliatePlans" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW5z</PHRASE>
+			<PHRASE Label="la_title_AffiliatePlansBrackets" Module="In-Commerce" Type="1">QnJhY2tldHM=</PHRASE>
+			<PHRASE Label="la_title_Affiliates" Module="In-Commerce" Type="1">QWZmaWxpYXRlcw==</PHRASE>
+			<PHRASE Label="la_title_ApplyModifier" Module="In-Commerce" Type="1">QXBwbHkgTW9kaWZpZXI=</PHRASE>
+			<PHRASE Label="la_title_BackOrders" Module="In-Commerce" Type="1">QmFja29yZGVycyBMaXN0</PHRASE>
+			<PHRASE Label="la_title_Brackets" Module="In-Commerce" Type="1">QnJhY2tldHM=</PHRASE>
+			<PHRASE Label="la_title_Costs" Module="In-Commerce" Type="1">Q29zdHM=</PHRASE>
+			<PHRASE Label="la_title_CouponItems" Module="In-Commerce" Type="1">Q291cG9uIEl0ZW1z</PHRASE>
+			<PHRASE Label="la_title_Coupons" Module="In-Commerce" Type="1">Q291cG9ucw==</PHRASE>
+			<PHRASE Label="la_title_CouponSelector" Module="In-Commerce" Type="1">Q291cG9uIFNlbGVjdG9y</PHRASE>
+			<PHRASE Label="la_title_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
+			<PHRASE Label="la_title_DiscountItems" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbXM=</PHRASE>
+			<PHRASE Label="la_title_Discounts" Module="In-Commerce" Type="1">RGlzY291bnRz</PHRASE>
+			<PHRASE Label="la_title_EditingAddress" Module="In-Commerce" Type="1">RWRpdGluZyBBZGRyZXNz</PHRASE>
+			<PHRASE Label="la_title_EditingCurrency" Module="In-Commerce" Type="1">RWRpdGluZyBDdXJyZW5jeQ==</PHRASE>
+			<PHRASE Label="la_title_EditingGiftCertificate" Module="In-Commerce" Type="1">RWRpdGluZyBHaWZ0IENlcnRpZmljYXRl</PHRASE>
+			<PHRASE Label="la_title_EditingManufacturer" Module="In-Commerce" Type="1">RWRpdGluZyBNYW51ZmFjdHVyZXI=</PHRASE>
+			<PHRASE Label="la_title_EditingPaymentType" Module="In-Commerce" Type="1">RWRpdGluZyBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_title_EditingShippingQuoteEngine" Module="In-Commerce" Type="1">RWRpdGluZyBTaGlwcGluZyBRdW90ZSBFbmdpbmU=</PHRASE>
+			<PHRASE Label="la_title_EditingShippingType" Module="In-Commerce" Type="1">RWRpdGluZyBTaGlwcGluZyBUeXBl</PHRASE>
+			<PHRASE Label="la_title_EditingShippingZone" Module="In-Commerce" Type="1">RWRpdGluZyBTaGlwcGluZyBab25l</PHRASE>
+			<PHRASE Label="la_title_EditingTaxZone" Module="In-Commerce" Type="1">RWRpdGluZyBUYXggWm9uZQ==</PHRASE>
+			<PHRASE Label="la_title_Editing_Affiliate" Module="In-Commerce" Type="1">RWRpdGluZyBBZmZpbGlhdGU=</PHRASE>
+			<PHRASE Label="la_title_Editing_Affiliate_Payment_Type" Module="In-Commerce" Type="1">RWRpdGluZyBBZmZpbGlhdGUgUGF5bWVudCBUeXBl</PHRASE>
+			<PHRASE Label="la_title_Editing_Affiliate_Plan" Module="In-Commerce" Type="1">RWRpdGluZyBBZmZpbGlhdGUgUGxhbg==</PHRASE>
+			<PHRASE Label="la_title_Editing_Coupon" Module="In-Commerce" Type="1">RWRpdGluZyBDb3Vwb24=</PHRASE>
+			<PHRASE Label="la_title_Editing_Discount" Module="In-Commerce" Type="1">RWRpdGluZyBEaXNjb3VudA==</PHRASE>
+			<PHRASE Label="la_title_Editing_File" Module="In-Commerce" Type="1">RWRpdGluZyBGaWxl</PHRASE>
+			<PHRASE Label="la_title_Editing_Option" Module="In-Commerce" Type="1">RWRpdGluZyBPcHRpb24=</PHRASE>
+			<PHRASE Label="la_title_Editing_Order" Module="In-Commerce" Type="1">RWRpdGluZyBPcmRlcg==</PHRASE>
+			<PHRASE Label="la_title_Editing_Order_Item" Module="In-Commerce" Type="1">RWRpdGluZyBPcmRlciBJdGVt</PHRASE>
+			<PHRASE Label="la_title_Editing_PriceBracket" Module="In-Commerce" Type="1">RWRpdGluZyBQcmljZSBCcmFja2V0</PHRASE>
+			<PHRASE Label="la_title_Editing_Product" Module="In-Commerce" Type="1">RWRpdGluZyBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_title_FileDownloads" Module="In-Commerce" Type="1">RmlsZSBEb3dubG9hZHM=</PHRASE>
+			<PHRASE Label="la_title_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
+			<PHRASE Label="la_title_GiftCertificates" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZXM=</PHRASE>
+			<PHRASE Label="la_title_ImportProducts" Module="In-Commerce" Type="1">SW1wb3J0IFByb2R1Y3Rz</PHRASE>
+			<PHRASE Label="la_title_In-Commerce" Module="In-Commerce" Type="1">RS1jb21tZXJjZQ==</PHRASE>
+			<PHRASE Label="la_title_IncompleteOrders" Module="In-Commerce" Type="1">SW5jb21wbGV0ZSBPcmRlcnMgTGlzdA==</PHRASE>
+			<PHRASE Label="la_title_ManagingOptionCombinations" Module="In-Commerce" Type="1">TWFuYWdpbmcgT3B0aW9uIENvbWJpbmF0aW9ucw==</PHRASE>
+			<PHRASE Label="la_title_ManagingShippingOptions" Module="In-Commerce" Type="1">TWFuYWdlIFNoaXBwaW5nIFR5cGVz</PHRASE>
+			<PHRASE Label="la_title_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycw==</PHRASE>
+			<PHRASE Label="la_title_NewCurrency" Module="In-Commerce" Type="1">TmV3IEN1cnJlbmN5</PHRASE>
+			<PHRASE Label="la_title_NewGiftCertificate" Module="In-Commerce" Type="1">TmV3IEdpZnQgQ2VydGlmaWNhdGU=</PHRASE>
+			<PHRASE Label="la_title_NewManufacturer" Module="In-Commerce" Type="1">TmV3IG1hbnVmYWN0dXJlcg==</PHRASE>
+			<PHRASE Label="la_title_NewPaymentType" Module="In-Commerce" Type="1">TmV3IFBheW1lbnQgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_title_NewProduct" Module="In-Commerce" Type="1">TmV3IFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_title_NewShippingType" Module="In-Commerce" Type="1">TmV3IFNoaXBwaW5nIFR5cGU=</PHRASE>
+			<PHRASE Label="la_title_NewShippingZone" Module="In-Commerce" Type="1">TmV3IFNoaXBwaW5nIFpvbmU=</PHRASE>
+			<PHRASE Label="la_title_NewTax" Module="In-Commerce" Type="1">TmV3IFRheCBab25l</PHRASE>
+			<PHRASE Label="la_title_New_Affiliate" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZQ==</PHRASE>
+			<PHRASE Label="la_title_New_Affiliate_Payment_Type" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_title_New_Affiliate_Plan" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQbGFu</PHRASE>
+			<PHRASE Label="la_title_New_Coupon" Module="In-Commerce" Type="1">TmV3IENvdXBvbg==</PHRASE>
+			<PHRASE Label="la_title_New_Discount" Module="In-Commerce" Type="1">TmV3IERpc2NvdW50</PHRASE>
+			<PHRASE Label="la_title_New_File" Module="In-Commerce" Type="1">TmV3IEZpbGU=</PHRASE>
+			<PHRASE Label="la_title_New_Option" Module="In-Commerce" Type="1">TmV3IE9wdGlvbg==</PHRASE>
+			<PHRASE Label="la_title_New_Order" Module="In-Commerce" Type="1">TmV3IE9yZGVy</PHRASE>
+			<PHRASE Label="la_title_New_PriceBracket" Module="In-Commerce" Type="1">TmV3IFByaWNlIEJyYWNrZXQ=</PHRASE>
+			<PHRASE Label="la_title_OrderBilling" Module="In-Commerce" Type="1">QmlsbGluZw==</PHRASE>
+			<PHRASE Label="la_title_OrderGWResult" Module="In-Commerce" Type="1">VHJhbnNhY3Rpb24gRGV0YWlscw==</PHRASE>
+			<PHRASE Label="la_title_OrderItems" Module="In-Commerce" Type="1">SXRlbXM=</PHRASE>
+			<PHRASE Label="la_title_OrderPreview" Module="In-Commerce" Type="1">UHJldmlldw==</PHRASE>
+			<PHRASE Label="la_title_Orders" Module="In-Commerce" Type="1">T3JkZXJz</PHRASE>
+			<PHRASE Label="la_title_OrdersArchived" Module="In-Commerce" Type="1">QXJjaGl2ZWQgT3JkZXJzIExpc3Q=</PHRASE>
+			<PHRASE Label="la_title_OrdersDenied" Module="In-Commerce" Type="1">RGVuaWVkIE9yZGVycyBMaXN0</PHRASE>
+			<PHRASE Label="la_title_OrdersExport" Module="In-Commerce" Type="1">T3JkZXJzIEV4cG9ydA==</PHRASE>
+			<PHRASE Label="la_title_OrderShipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_title_OrdersProcessed" Module="In-Commerce" Type="1">UHJvY2Vzc2VkIE9yZGVycyBMaXN0</PHRASE>
+			<PHRASE Label="la_title_OrdersReturns" Module="In-Commerce" Type="1">T3JkZXJzIHdpdGggUmV0dXJucw==</PHRASE>
+			<PHRASE Label="la_title_OrdersSearch" Module="In-Commerce" Type="1">Rm91bmQgT3JkZXJzIExpc3Q=</PHRASE>
+			<PHRASE Label="la_title_OrdersToShip" Module="In-Commerce" Type="1">VG8gU2hpcCBPcmRlcnMgTGlzdA==</PHRASE>
+			<PHRASE Label="la_title_Payments" Module="In-Commerce" Type="1">UGF5bWVudHM=</PHRASE>
+			<PHRASE Label="la_title_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
+			<PHRASE Label="la_title_PayOut_To" Module="In-Commerce" Type="1">UGF5IE91dCBUbw==</PHRASE>
+			<PHRASE Label="la_title_PendingOrders" Module="In-Commerce" Type="1">UGVuZGluZyBPcmRlcnMgTGlzdA==</PHRASE>
+			<PHRASE Label="la_title_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
+			<PHRASE Label="la_title_ProductsExport" Module="In-Commerce" Type="1">UHJvZHVjdHMgRXhwb3J0</PHRASE>
+			<PHRASE Label="la_title_Product_Access" Module="In-Commerce" Type="1">QWNjZXNz</PHRASE>
+			<PHRASE Label="la_title_Product_AccessPricing" Module="In-Commerce" Type="1">UHJpY2luZw==</PHRASE>
+			<PHRASE Label="la_title_Product_Files" Module="In-Commerce" Type="1">RmlsZXM=</PHRASE>
+			<PHRASE Label="la_title_Product_Inventory" Module="In-Commerce" Type="1">SW52ZW50b3J5</PHRASE>
+			<PHRASE Label="la_title_Product_Options" Module="In-Commerce" Type="1">UHJvZHVjdCBPcHRpb25z</PHRASE>
+			<PHRASE Label="la_title_Product_PackageContent" Module="In-Commerce" Type="1">UGFja2FnZSBDb250ZW50</PHRASE>
+			<PHRASE Label="la_title_Product_Pricing" Module="In-Commerce" Type="1">UHJpY2luZw==</PHRASE>
+			<PHRASE Label="la_title_ReportOptions" Module="In-Commerce" Type="1">U2FsZXMgUmVwb3J0IC0gT3B0aW9ucw==</PHRASE>
+			<PHRASE Label="la_title_ReportResults" Module="In-Commerce" Type="1">U2FsZXMgUmVwb3J0IFJlc3VsdHM=</PHRASE>
+			<PHRASE Label="la_title_SalesReportChart" Module="In-Commerce" Type="1">U2FsZXMgUmVwb3J0IENoYXJ0</PHRASE>
+			<PHRASE Label="la_title_ShippingQuoteEngines" Module="In-Commerce" Type="1">U2hpcHBpbmcgUXVvdGUgRW5naW5lcw==</PHRASE>
+			<PHRASE Label="la_title_ShippingTypes" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZXM=</PHRASE>
+			<PHRASE Label="la_title_Taxes" Module="In-Commerce" Type="1">VGF4ZXM=</PHRASE>
+			<PHRASE Label="la_title_Zones" Module="In-Commerce" Type="1">Wm9uZXM=</PHRASE>
+			<PHRASE Label="la_TJS" Module="In-Commerce" Type="1">U29tb25p</PHRASE>
+			<PHRASE Label="la_TMM" Module="In-Commerce" Type="1">TWFuYXQ=</PHRASE>
+			<PHRASE Label="la_TND" Module="In-Commerce" Type="1">VHVuaXNpYW4gRGluYXI=</PHRASE>
+			<PHRASE Label="la_Tooltip_Add_Items" Module="In-Commerce" Type="1">QWRkIEl0ZW1z</PHRASE>
+			<PHRASE Label="la_ToolTip_Add_Product" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_ToolTip_Archive" Module="In-Commerce" Type="1">QXJjaGl2ZQ==</PHRASE>
+			<PHRASE Label="la_tooltip_Arrange" Module="In-Commerce" Type="1">QXJyYW5nZQ==</PHRASE>
+			<PHRASE Label="la_tooltip_ClearAll" Module="In-Commerce" Type="1">Q2xlYXIgQWxs</PHRASE>
+			<PHRASE Label="la_tooltip_EntireOrder" Module="In-Commerce" Type="1">RW50aXJlIE9yZGVy</PHRASE>
+			<PHRASE Label="la_tooltip_Flip" Module="In-Commerce" Type="1">RmxpcA==</PHRASE>
+			<PHRASE Label="la_ToolTip_GoToOrder" Module="In-Commerce" Type="1">R28gdG8gT3JkZXI=</PHRASE>
+			<PHRASE Label="la_tooltip_Infinity" Module="In-Commerce" Type="1">SW5maW5pdHk=</PHRASE>
+			<PHRASE Label="la_tooltip_Modify" Module="In-Commerce" Type="1">TW9kaWZ5</PHRASE>
+			<PHRASE Label="la_tooltip_MoreBrackets" Module="In-Commerce" Type="1">TW9yZSBCcmFja2V0cw==</PHRASE>
+			<PHRASE Label="la_ToolTip_NewAddress" Module="In-Commerce" Type="1">TmV3IEFkZHJlc3M=</PHRASE>
+			<PHRASE Label="la_ToolTip_NewAffiliatePaymentType" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQYXltZW50IFR5cGU=</PHRASE>
+			<PHRASE Label="la_ToolTip_NewGiftCertificate" Module="In-Commerce" Type="1">TmV3IEdpZnQgQ2VydGlmaWNhdGU=</PHRASE>
+			<PHRASE Label="la_tooltip_NewManufacturer" Module="In-Commerce" Type="1">TmV3IE1hbnVmYWN0dXJlcg==</PHRASE>
+			<PHRASE Label="la_ToolTip_NewOption" Module="In-Commerce" Type="1">TmV3IE9wdGlvbg==</PHRASE>
+			<PHRASE Label="la_tooltip_NewPaymentType" Module="In-Commerce" Type="1">TmV3IFBheW1lbnQgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_ToolTip_NewPricing" Module="In-Commerce" Type="1">TmV3IFByaWNpbmc=</PHRASE>
+			<PHRASE Label="la_tooltip_newproduct" Module="In-Commerce" Type="1">TmV3IFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_ToolTip_NewShipZone" Module="In-Commerce" Type="1">TmV3IFNoaXBwaW5nIFpvbmU=</PHRASE>
+			<PHRASE Label="la_ToolTip_NewTaxZone" Module="In-Commerce" Type="1">TmV3IFRheCBab25l</PHRASE>
+			<PHRASE Label="la_ToolTip_New_Affiliate" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZQ==</PHRASE>
+			<PHRASE Label="la_ToolTip_New_Affiliate_Plan" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQbGFu</PHRASE>
+			<PHRASE Label="la_tooltip_New_Coupon" Module="In-Commerce" Type="1">TmV3IENvdXBvbg==</PHRASE>
+			<PHRASE Label="la_tooltip_New_Discount" Module="In-Commerce" Type="1">TmV3IERpc2NvdW50</PHRASE>
+			<PHRASE Label="la_ToolTip_New_Order" Module="In-Commerce" Type="1">TmV3IE9yZGVy</PHRASE>
+			<PHRASE Label="la_ToolTip_New_PricingLimit" Module="In-Commerce" Type="1">TmV3IFByaWNpbmcgTGltaXQ=</PHRASE>
+			<PHRASE Label="la_tooltip_new_products" Module="In-Commerce" Type="1">QWRkIG5ldyBwcm9kdWN0cw==</PHRASE>
+			<PHRASE Label="la_tooltip_new_shipping" Module="In-Commerce" Type="1">TmV3IFNoaXBwaW5nIHR5cGU=</PHRASE>
+			<PHRASE Label="la_tooltip_new_Zone" Module="In-Commerce" Type="1">TmV3IFpvbmU=</PHRASE>
+			<PHRASE Label="la_ToolTip_PayOut" Module="In-Commerce" Type="1">UGF5IE91dA==</PHRASE>
+			<PHRASE Label="la_Tooltip_Pdf" Module="In-Commerce" Type="1">UERG</PHRASE>
+			<PHRASE Label="la_tooltip_PlaceOrder" Module="In-Commerce" Type="1">UGxhY2UgT3JkZXI=</PHRASE>
+			<PHRASE Label="la_Tooltip_Process" Module="In-Commerce" Type="1">UHJvY2Vzcw==</PHRASE>
+			<PHRASE Label="la_Tooltip_ResetToBilling" Module="In-Commerce" Type="1">UmVzZXQgVG8gQmlsbGluZw==</PHRASE>
+			<PHRASE Label="la_ToolTip_ResetToPending" Module="In-Commerce" Type="1">UmVzZXQgVG8gUGVuZGluZw==</PHRASE>
+			<PHRASE Label="la_ToolTip_ResetToShipping" Module="In-Commerce" Type="1">UmVzZXQgVG8gU2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_Tooltip_ResetToUser" Module="In-Commerce" Type="1">UmVzZXQgVG8gVXNlcg==</PHRASE>
+			<PHRASE Label="la_tooltip_RunReport" Module="In-Commerce" Type="1">UnVuIFJlcG9ydA==</PHRASE>
+			<PHRASE Label="la_ToolTip_SaveAndPrint" Module="In-Commerce" Type="1">U2F2ZSAmIFByaW50</PHRASE>
+			<PHRASE Label="la_Tooltip_Ship" Module="In-Commerce" Type="1">U2hpcA==</PHRASE>
+			<PHRASE Label="la_ToolTip_UpdateRates" Module="In-Commerce" Type="1">VXBkYXRlIFJhdGVz</PHRASE>
+			<PHRASE Label="la_tooltip_view_chart" Module="In-Commerce" Type="1">VmlldyBDaGFydA==</PHRASE>
+			<PHRASE Label="la_TOP" Module="In-Commerce" Type="1">UGFgYW5nYQ==</PHRASE>
+			<PHRASE Label="la_ToShip" Module="In-Commerce" Type="1">VG8gU2hpcA==</PHRASE>
+			<PHRASE Label="la_TotalSavings" Module="In-Commerce" Type="1">VG90YWwgU2F2aW5ncw==</PHRASE>
+			<PHRASE Label="la_TPE" Module="In-Commerce" Type="1">VGltb3IgRXNjdWRv</PHRASE>
+			<PHRASE Label="la_TRL" Module="In-Commerce" Type="1">VHVya2lzaCBMaXJh</PHRASE>
+			<PHRASE Label="la_TRY" Module="In-Commerce" Type="1">VFJZ</PHRASE>
+			<PHRASE Label="la_TTD" Module="In-Commerce" Type="1">VHJpbmlkYWQgYW5kIFRvYmFnbyBEb2xsYXI=</PHRASE>
+			<PHRASE Label="la_TWD" Module="In-Commerce" Type="1">TmV3IFRhaXdhbiBEb2xsYXI=</PHRASE>
+			<PHRASE Label="la_Txt_=" Module="In-Commerce" Type="1">RXF1YWxz</PHRASE>
+			<PHRASE Label="la_TZS" Module="In-Commerce" Type="1">VGFuemFuaWFuIFNoaWxsaW5n</PHRASE>
+			<PHRASE Label="la_UAH" Module="In-Commerce" Type="1">SHJ5dm5pYQ==</PHRASE>
+			<PHRASE Label="la_UGX" Module="In-Commerce" Type="1">VWdhbmRhIFNoaWxsaW5n</PHRASE>
+			<PHRASE Label="la_UpdateRate" Module="In-Commerce" Type="1">VXBkYXRlIFJhdGUgVG8gUHJpbWFyeQ==</PHRASE>
+			<PHRASE Label="la_USD" Module="In-Commerce" Type="1">VVMgRG9sbGFy</PHRASE>
+			<PHRASE Label="la_Used" Module="In-Commerce" Type="1">VXNlZA==</PHRASE>
+			<PHRASE Label="la_UserDefined" Module="In-Commerce" Type="1">VXNlciBEZWZpbmVk</PHRASE>
+			<PHRASE Label="la_USN" Module="In-Commerce" Type="1">VVMgRG9sbGFyIChOZXh0IGRheSk=</PHRASE>
+			<PHRASE Label="la_USS" Module="In-Commerce" Type="1">VVMgRG9sbGFyIChTYW1lIGRheSk=</PHRASE>
+			<PHRASE Label="la_UYU" Module="In-Commerce" Type="1">UGVzbyBVcnVndWF5bw==</PHRASE>
+			<PHRASE Label="la_UZS" Module="In-Commerce" Type="1">VXpiZWtpc3RhbiBTdW0=</PHRASE>
+			<PHRASE Label="la_VAT" Module="In-Commerce" Type="1">U2FsZXMgVGF4L1ZBVA==</PHRASE>
+			<PHRASE Label="la_VEB" Module="In-Commerce" Type="1">Qm9saXZhcg==</PHRASE>
+			<PHRASE Label="la_ViewLabel" Module="In-Commerce" Type="1">VmlldyBMYWJlbA==</PHRASE>
+			<PHRASE Label="la_VND" Module="In-Commerce" Type="1">RG9uZw==</PHRASE>
+			<PHRASE Label="la_VUV" Module="In-Commerce" Type="1">VmF0dQ==</PHRASE>
+			<PHRASE Label="la_WarningCurrenciesNotUsed" Module="In-Commerce" Type="1">Rm9sbG93aW5nIGN1cnJlbmNpZXMgYXJlIG5vdCBzdXBwb3J0ZWQgaW4gYW55IHBheW1lbnQgdHlwZXM=</PHRASE>
+			<PHRASE Label="la_WarningRemoveUnusedCurrencies" Module="In-Commerce" Type="1">V291bGQgeW91IGxpa2UgdG8gZGlzYWJsZSB0aGVt</PHRASE>
+			<PHRASE Label="la_warning_ChangeInventoryStatus" Module="In-Commerce" Type="1">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGNoYW5nZSBJbnZlbnRvcnkgU3RhdHVzPyBDaGFuZ2luZyB0aGUgc3RhdHVzIG1heSBhZmZlY3QgY3VycmVudCBvcmRlcnMgYW5kIHByb2R1Y3QgcXVhbnRpdGllcy4=</PHRASE>
+			<PHRASE Label="la_warning_SelectOptionCombination" Module="In-Commerce" Type="1">U2VsZWN0IG9wdGlvbiBjb21iaW5hdGlvbiB0byB1c2U=</PHRASE>
+			<PHRASE Label="la_warning_UpdateAllCurrencyRates" Module="In-Commerce" Type="1">RG8geW91IHdhbnQgdG8gdXBkYXRlIGFsbCByYXRlcw==</PHRASE>
+			<PHRASE Label="la_warning_UpdateSelectedCurrencyRates" Module="In-Commerce" Type="1">QXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIHVwZGF0ZSB0aGUgc2VsZWN0ZWQgcmF0ZXM=</PHRASE>
+			<PHRASE Label="la_WholeOrder" Module="In-Commerce" Type="1">V2hvbGUgT3JkZXI=</PHRASE>
+			<PHRASE Label="la_WST" Module="In-Commerce" Type="1">VGFsYQ==</PHRASE>
+			<PHRASE Label="la_XAF" Module="In-Commerce" Type="1">Q0ZBIEZyYW5jIEJFQUM=</PHRASE>
+			<PHRASE Label="la_XCD" Module="In-Commerce" Type="1">RWFzdCBDYXJpYmJlYW4gRG9sbGFy</PHRASE>
+			<PHRASE Label="la_XDR" Module="In-Commerce" Type="1">WERS</PHRASE>
+			<PHRASE Label="la_XOF" Module="In-Commerce" Type="1">Q0ZBIEZyYW5jIEJDRUFP</PHRASE>
+			<PHRASE Label="la_XPF" Module="In-Commerce" Type="1">Q0ZQIEZyYW5j</PHRASE>
+			<PHRASE Label="la_YER" Module="In-Commerce" Type="1">WWVtZW5pIFJpYWw=</PHRASE>
+			<PHRASE Label="la_YUM" Module="In-Commerce" Type="1">WXVnb3NsYXZpYW4gRGluYXI=</PHRASE>
+			<PHRASE Label="la_ZAR" Module="In-Commerce" Type="1">UmFuZA==</PHRASE>
+			<PHRASE Label="la_Zeros" Module="In-Commerce" Type="1">WmVyb3M=</PHRASE>
+			<PHRASE Label="la_ZIP" Module="In-Commerce" Type="1">WklQ</PHRASE>
+			<PHRASE Label="la_ZMK" Module="In-Commerce" Type="1">S3dhY2hh</PHRASE>
+			<PHRASE Label="la_zones_AvailableCountries" Module="In-Commerce" Type="1">QXZhaWxhYmxlIGNvdW50cmllcw==</PHRASE>
+			<PHRASE Label="la_zones_AvailableStates" Module="In-Commerce" Type="1">QXZhaWxhYmxlIHN0YXRlcw==</PHRASE>
+			<PHRASE Label="la_zones_AvailableZips" Module="In-Commerce" Type="1">QXZhaWxhYmxlIFpJUCBjb2Rlcw==</PHRASE>
+			<PHRASE Label="la_zones_SelectedCountries" Module="In-Commerce" Type="1">U2hpcCB0byBDb3VudHJpZXM=</PHRASE>
+			<PHRASE Label="la_zones_SelectedStates" Module="In-Commerce" Type="1">U2hpcCB0byBTdGF0ZXMvUHJvdmljZXM=</PHRASE>
+			<PHRASE Label="la_zones_SelectedZips" Module="In-Commerce" Type="1">U2hpcCB0byBaSVAgY29kZXM=</PHRASE>
+			<PHRASE Label="la_ZWD" Module="In-Commerce" Type="1">WmltYmFid2UgRG9sbGFy</PHRASE>
+			<PHRASE Label="lc_field_manufacturer" Module="In-Commerce" Type="2">TWFudWZhY3R1cmVy</PHRASE>
+			<PHRASE Label="lu_comm_ProfileAddressWarning" Module="In-Commerce" Type="1">VGhpcyBpcyB5b3VyIHByb2ZpbGUgYWRkcmVzcy4gSXQgd2lsbCBiZSB1cGRhdGVkIGlmIHlvdSBlZGl0IHRoZSBhZGRyZXNzIGJlbG93Lg==</PHRASE>
+			<PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="1">U2hpcG1lbnQ=</PHRASE>
+			<PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+		</PHRASES>
+		<EVENTS>
+			<EVENT Event="AFFILIATE.PAYMENT" Type="0">
+				<SUBJECT>QWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQ=</SUBJECT>
+				<HTMLBODY>WW91ciBhZmZpbGlhdGUgY29tbWlzc2lvbiBwYXltZW50IGhhcyBiZWVuIGlzc3VlZCwgcGxlYXNlIGxvZ2luIHRvIFlvdXIgQWNjb3VudCwgQWZmaWxpYXRlIFBheW1lbnRzIHNlY3Rpb24gdG8gY2hlY2sgdGhlIGRldGFpbHMu</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.PAYMENT" Type="1">
+				<SUBJECT>QWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBpc3N1ZWQ=</SUBJECT>
+				<HTMLBODY>QWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQu</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.PAYMENT.TYPE.CHANGED" Type="0">
+				<SUBJECT>QWZmaWxpYXRlIHBheW1lbnQgdHlwZSBoYXMgY2hhbmdlZA==</SUBJECT>
+				<HTMLBODY>QWZmaWxpYXRlIHBheW1lbnQgdHlwZSBoYXMgY2hhbmdlZA==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.PAYMENT.TYPE.CHANGED" Type="1">
+				<SUBJECT>QWZmaWxpYXRlIHBheW1lbnQgdHlwZSBjaGFuZ2Vk</SUBJECT>
+				<HTMLBODY>QWZmaWxpYXRlIHBheW1lbnQgdHlwZSBjaGFuZ2Vk</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTER" Type="0">
+				<SUBJECT>TmV3IEFmZmlsaWF0ZSBSZWdpc3RyYXRpb24=</SUBJECT>
+				<HTMLBODY>SGVsbG8sPGJyLz48YnIvPg0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIGFzIGFmZmlsaWF0ZS4gWW91IHdpbGwgYmUgbm90aWZpZWQgdmlhIGUtbWFpbCB3aGVuIHlvdXIgcmVnaXN0cmF0aW9uIGlzIGFwcHJvdmVkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTER" Type="1">
+				<SUBJECT>TmV3IEFmZmlsaWF0ZSBSZWdpc3RlcmVk</SUBJECT>
+				<HTMLBODY>TmV3IGFmZmlsaWF0ZSB1c2VyIGhhcyByZWdpc3RlcmVkLiBQbGVhc2UgcHJvY2VlZCB0byBBZG1pbmlzdHJhdGl2ZSBDb25zb2xlIHRvIHJldmlldyB0aGUgcmVnaXN0cmF0aW9uLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTRATION.APPROVED" Type="0">
+				<SUBJECT>QWZmaWxpYXRlIHJlZ2lzdHJhdGlvbiBhcHByb3ZlZA==</SUBJECT>
+				<HTMLBODY>QWZmaWxpYXRlIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiBhcHByb3ZlZC4=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTRATION.APPROVED" Type="1">
+				<SUBJECT>QWZmaWxpYXRlIHJlZ2lzdHJhdGlvbiBhcHByb3ZlZA==</SUBJECT>
+				<HTMLBODY>TmV3IEFmZmlsaWF0ZSByZWdpc3RyYXRpb24gaGFzIGJlZW4gYXBwcm92ZWQu</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTRATION.DENIED" Type="0">
+				<SUBJECT>QWZmaWxpYXRlIHJlZ2lzdHJhdGlvbiBkZW5pZWQ=</SUBJECT>
+				<HTMLBODY>TmV3IEFmZmlsaWF0ZSByZWdpc3RyYXRpb24gaGFzIGJlZW4gZGVuaWVkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="AFFILIATE.REGISTRATION.DENIED" Type="1">
+				<SUBJECT>QWZmaWxpYXRlIHJlZ2lzdHJhdGlvbiBkZW5pZWQ=</SUBJECT>
+				<HTMLBODY>TmV3IEFmZmlsaWF0ZSByZWdpc3RyYXRpb24gaGFzIGJlZW4gZGVuaWVkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="BACKORDER.ADD" Type="0">
+				<SUBJECT>TmV3IEJhY2tvcmRlciBhZGRlZA==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmRfRmllbGQgbmFtZT0iQmlsbGluZ1RvIi8+LDxici8+PGJyLz4NCg0KWW91ciBiYWNrIG9yZGVyIG51bWJlciA8aW5wMjpvcmRfRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gaGFzIGJlZW4gYWNjZXB0ZWQuIDxici8+PGJyLz4NCg0KWW91IHdpbGwgYmUgbm90aWZpZWQgYnkgZW1haWwgb25jZSB0aGUgb3JkZXIgaXMgcHJvY2Vzc2VkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="BACKORDER.ADD" Type="1">
+				<SUBJECT>TmV3IEJhY2tvcmRlciBhZGRlZA==</SUBJECT>
+				<HTMLBODY>TmV3IGJhY2sgb3JkZXIgbnVtYmVyIDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPiBoYXMgYmVlbiBhZGRlZC4gPGJyLz48YnIvPg0KDQpQbGVhc2UgcHJvY2VlZCB0byBhZG1pbmlzdHJhdGl2ZSBjb25zb2xlIHRvIHJldmlldyB0aGUgb3JkZXIu</HTMLBODY>
+			</EVENT>
+			<EVENT Event="BACKORDER.FULLFILL" Type="1">
+				<SUBJECT>QmFja29yZGVyIGhhcyBiZWVuIFByb2Nlc3NlZA==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iLz4sPGJyLz48YnIvPg0KDQpZb3VyIGJhY2sgb3JkZXIgbnVtYmVyIDxpbnAyOm9yZC4taW52X0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGhhcyBiZWVuIHByb2Nlc3NlZCBhbmQgZnVsZmlsbGVkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="BACKORDER.PROCESS" Type="0">
+				<SUBJECT>WW91IEJhY2tvcmRlciAjPGlucDI6b3JkLi1pbnZfRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiLz4gLSBQcm9jZXNzZWQh</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iLz4sPGJyLz48YnIvPg0KDQpZb3VyIGJhY2sgb3JkZXIgKG51bWJlciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPikgaGFzIGJlZW4gcHJvY2Vzc2VkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.APPROVE" Type="0">
+				<SUBJECT>WW91ciBPcmRlciBpcyBBcHByb3ZlZA==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iLz4sPGJyLz48YnIvPg0KDQpZb3VyIG9yZGVyIG51bWJlciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPiBoYXMgYmVlbiBhcHByb3ZlZC48YnIvPjxici8+DQoNCjxpbnAyOm1faWYgY2hlY2s9Im1fZ2V0IiB2YXI9Im9yZGVyX2NvdXBvbnMiPg0KWW91IGNhbiB1c2UgY291cG9uczo8YnIvPjxici8+DQo8aW5wMjptX2dldCB2YXI9Im9yZGVyX2NvdXBvbnMiLz4NCjwvaW5wMjptX2lmPg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.DENY" Type="0">
+				<SUBJECT>WW91ciBPcmRlciBpcyBEZW5pZWQ=</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iLz4sPGJyLz48YnIvPg0KDQpTb3JyeSwgYnV0IHlvdXIgb3JkZXIgKG51bWJlciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPikgaGFzIGJlZW4gZGVuaWVkLjxici8+PGJyLz4NCg0KUGxlYXNlIGZlZWwgZnJlZSB0byBjb250YWN0IHVzIGFyZSA8YSBocmVmPSIiPjwvYT4=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.RECURRING.DENIED" Type="0">
+				<SUBJECT>UmVjdXJyaW5nIE9yZGVyIGlzIERlbmllZA==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9IkJpbGxpbmdUbyIvPiw8YnIvPjxici8+DQoNClNvcnJ5LCBidXQgeW91ciByZWN1cnJpbmcgb3JkZXIgKG51bWJlciA8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+KSBoYXMgYmVlbiBkZW5pZWQuPGJyLz48YnIvPg0KDQpQbGVhc2UgY29udGFjdCB3ZWJzaXRlIGFkbWluaXN0cmF0b3IgYXQgPGEgaHJlZj0ibWFpbHRvOjxpbnAyOm1fR2V0Q29uZmlnIHZhcj0iU210cF9BZG1pbk1haWxGcm9tIi8+PjxpbnAyOm1fR2V0Q29uZmlnIHZhcj0iU210cF9BZG1pbk1haWxGcm9tIi8+PC9hPg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.RECURRING.DENIED" Type="1">
+				<SUBJECT>UmVjdXJyaW5nIE9yZGVyICM8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGlzIERlbmllZCBieSB0aGUgc3lzdGVt</SUBJECT>
+				<HTMLBODY>UmVjdXJyaW5nIG9yZGVyIG51bWJlciA8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGhhcyBiZWVuIGRlbmllZC48YnIvPjxici8+DQoNClBsZWFzZSBwcm9jZWVkIHRvIGFkbWluaXN0cmF0aXZlIGNvbnNvbGUgdG8gcmV2aWV3IHRoZSBvcmRlci4=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.RECURRING.PROCESSED" Type="0">
+				<SUBJECT>UmVjdXJyaW5nIE9yZGVyIFN1Y2Nlc3NmdWxseSBQcm9jZXNzZWQ=</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9IkJpbGxpbmdUbyIvPiw8YnIvPjxici8+DQoNCllvdXIgcmVjdXJyaW5nIG9yZGVyIChudW1iZXIgPGlucDI6b3JkLnJlY3VycmluZ19GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPikgaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IHByb2Nlc3NlZC48YnIvPjxici8+DQoNCk5vIGZ1cnRoZXIgYWN0aW9uIGlzIHJlcXVpcmVkIGF0IHRoaXMgdGltZS48YnIvPjxici8+</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.RECURRING.PROCESSED" Type="1">
+				<SUBJECT>UmVjdXJyaW5nIE9yZGVyICgjPGlucDI6b3JkLnJlY3VycmluZ19GaWVsZCBuYW1lPSJPcmRlck51bWJlciIvPikgaXMgUHJvY2Vzc2Vk</SUBJECT>
+				<HTMLBODY>UmVjdXJyaW5nIG9yZGVyIG51bWJlciA8aW5wMjpvcmQucmVjdXJyaW5nX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+IGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBwcm9jZXNzZWQuPGJyLz48YnIvPg0KDQpObyBmdXJ0aGVyIGFjdGlvbiBpcyByZXF1aXJlZCBhdCB0aGlzIHRpbWUuDQo=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.SHIP" Type="0">
+				<SUBJECT>WW91ciBPcmRlciB3YXMgc2hpcHBlZA==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjpvcmQuLWludl9GaWVsZCBuYW1lPSJTaGlwcGluZ1RvIi8+LDxici8+PGJyLz4NCg0KWW91ciBvcmRlciAobnVtYmVyIDxpbnAyOm9yZC4taW52X0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+KSBoYXMgYmVlbiBzaGlwcGVkLg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.SUBMIT" Type="0">
+				<SUBJECT>VGhhbmsgeW91IGZvciBZb3VyIE9yZGVyICg8aW5wMjpvcmRfRmllbGQgbmFtZT0iT3JkZXJOdW1iZXIiIC8+KSE=</SUBJECT>
+				<HTMLBODY>PGlucDI6bV9EZWZpbmVFbGVtZW50IG5hbWU9Im9yZGVyaXRlbV9lbGVtIj4NCgk8aW5wMjpGaWVsZCBuYW1lPSJQcm9kdWN0TmFtZSIgcGFkPSIzNCIvPiAocXR5IDxpbnAyOkZpZWxkIG5hbWU9IlF1YW50aXR5Ii8+KSA8aW5wMjpGaWVsZCBuYW1lPSJFeHRlbmRlZFByaWNlIiBjdXJyZW5jeT0ic2VsZWN0ZWQiLz48YnIvPg0KPC9pbnAyOm1fRGVmaW5lRWxlbWVudD4NCg0KDQpEZWFyIDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iIC8+LDxici8+PGJyLz4NCg0KVGhhbmsgeW91IGZvciB5b3VyIHB1cmNoYXNlITxici8+PGJyLz4NCg0KPGlucDI6bV9pZiBjaGVjaz0ib3JkX1VzaW5nQ3JlZGl0Q2FyZCI+DQpQbGVhc2UgYWxsb3cgMjQgaG91cnMgZm9yIHVzIHRvIGNvbmZpcm0gYW5kIHByb2Nlc3MgeW91ciBvcmRlci4NCjxpbnAyOm1fZWxzZSAvPg0KUGxlYXNlIHNlbmQgYSBjaGVjayBvciBhIG1vbmV5IG9yZGVyIGluIHRoZSBhbW91bnQgb2YgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJUb3RhbEFtb3VudCIgY3VycmVuY3k9InNlbGVjdGVkIi8+IHRvOg0KPGJyLz4NCkFkZHJlc3MNCjxici8+DQpBbGwgY2hlY2tzIG11c3QgYmUgZHJhd24gaW4gVS5TLiBmdW5kcyBmcm9tIGEgVS5TLiBiYW5rLg0KUGxlYXNlIGF0dGFjaCBhIHByaW50b3V0IG9mIHRoaXMgcmVjZWlwdCB3aXRoIHlvdXIgY2hlY2sgYW5kDQp3cml0ZSBkb3duIHlvdXIgb3JkZXIgbnVtYmVyLiAgWW91ciBvcmRlciB3aWxsIGJlIGFwcHJvdmVkDQp3aXRoaW4gOCBidXNpbmVzcyBkYXlzIGFmdGVyIHRoZSBkYXkgd2UgcmVjZWl2ZSB5b3VyIGNoZWNrLA0Kb3Igd2l0aGluIDIgYnVzaW5lc3MgZGF5cyBhZnRlciB3ZSByZWNlaXZlIGEgbW9uZXkgb3JkZXIgb3INCmJhbmsgZHJhZnQuDQo8L2lucDI6bV9pZj4NCjxici8+PGJyLz48YnIvPg0KDQoNCkJlbG93IGFyZSB0aGUgZGV0YWlscyBvZiB5b3VyIG9yZGVyOjxici8+PGJyLz4NCg0KT3JkZXIgQ29udGVudHM6DQo8aHIvPg0KPGlucDI6b3JkX1ByaW50Q2FydCBpdGVtX3JlbmRlcl9hcz0ib3JkZXJpdGVtX2VsZW0iIGhlYWRlcl9yZW5kZXJfYXM9Imh0bWw6IiBmb290ZXJfcmVuZGVyX2FzPSJodG1sOiIgZW1wdHlfY2FydF9yZW5kZXJfYXM9Imh0bWw6IiBwZXJfcGFnZT0iLTEiLz4gDQo8aHIvPg0KU3ViIFRvdGFsOiAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iU3VidG90YWxXaXRoRGlzY291bnQiIGN1cnJlbmN5PSJzZWxlY3RlZCIvPjxici8+DQpUYXhlczogICAgICAgPGlucDI6b3JkX0ZpZWxkIG5hbWU9IlZBVCIgY3VycmVuY3k9InNlbGVjdGVkIi8+PGJyLz4NClRvdGFsOiAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IlRvdGFsQW1vdW50IiBjdXJyZW5jeT0ic2VsZWN0ZWQiLz4gPGJyLz48YnIvPg0KDQpCaWxsaW5nIEluZm9ybWF0aW9uOg0KPGhyLz4NCkFtb3VudCBCaWxsZWQ6ICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iVG90YWxBbW91bnQiIGN1cnJlbmN5PSJzZWxlY3RlZCIvPg0KPGlucDI6bV9pZiBjaGVjaz0ib3JkX1VzaW5nQ3JlZGl0Q2FyZCI+DQpQYXltZW50IFR5cGU6ICAgICA8aW5wMjpvcmRfRmllbGQgbmFtZT0iUGF5bWVudFR5cGUiIC8+DQpDcmVkaXQgQ2FyZDogICAgICA8aW5wMjpvcmRfRmllbGQgbmFtZT0iUGF5bWVudEFjY291bnQiIG1hc2tlZD0ibWFza2VkIi8+DQo8aW5wMjptX2Vsc2UgLz4NClBheW1lbnQgVHlwZTogICAgIDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJQYXltZW50VHlwZSIgLz4NCjwvaW5wMjptX2lmPjxicj48YnIvPg0KDQpDb250YWN0IEluZm9ybWF0aW9uOg0KPGhyLz4NCk5hbWU6ICAgICAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ1RvIi8+PGJyLz4NCkUtbWFpbDoJCQk8aW5wMjptX2lmIGNoZWNrPSJvcmRfRmllbGQiIG5hbWU9IkJpbGxpbmdFbWFpbCI+DQogIDxhIGhyZWY9Im1haWx0bzo8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdFbWFpbCIvPiI+PGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nRW1haWwiLz48L2E+DQo8aW5wMjptX2Vsc2UgLz4NCiAgPGEgaHJlZj0ibWFpbHRvOjxpbnAyOnVfRmllbGQgZmllbGQ9IkVtYWlsIi8+Ij48aW5wMjp1X0ZpZWxkIGZpZWxkPSJFbWFpbCIvPjwvYT4NCjwvaW5wMjptX2lmPjxici8+DQpDb21wYW55L09yZ2FuaXphdGlvbjogICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nQ29tcGFueSIvPjxici8+DQpQaG9uZTogICAgICAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdQaG9uZSIvPjxici8+DQpGYXg6ICAgICAgICAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdGYXgiLz48YnIvPg0KQWRkcmVzcyBMaW5lIDE6ICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nQWRkcmVzczEiLz48YnIvPg0KQWRkcmVzcyBMaW5lIDI6ICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nQWRkcmVzczIiLz48YnIvPg0KQ2l0eTogICAgICAgICAgICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nQ2l0eSIvPjxici8+DQpTdGF0ZTogICAgICAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdTdGF0ZSIvPiA8YnIvPg0KWklQIENvZGU6ICAgICAgICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJCaWxsaW5nWmlwIi8+PGJyLz4NCkNvdW50cnk6ICAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ0NvdW50cnkiLz48YnIvPg0K</HTMLBODY>
+			</EVENT>
+			<EVENT Event="ORDER.SUBMIT" Type="1">
+				<SUBJECT>TmV3IE9yZGVyIFN1Ym1pdHRlZCAoPGlucDI6b3JkX0ZpZWxkIG5hbWU9Ik9yZGVyTnVtYmVyIi8+KQ==</SUBJECT>
+				<HTMLBODY>PGlucDI6bV9EZWZpbmVFbGVtZW50IG5hbWU9Im9yZGVyaXRlbV9lbGVtIj4NCjxpbnAyOkZpZWxkIG5hbWU9IlByb2R1Y3ROYW1lIiBwYWQ9IjM0Ii8+IChxdHkgPGlucDI6RmllbGQgbmFtZT0iUXVhbnRpdHkiLz4pIDxpbnAyOkZpZWxkIG5hbWU9IkV4dGVuZGVkUHJpY2UiIGN1cnJlbmN5PSJzZWxlY3RlZCIvPjxici8+DQo8L2lucDI6bV9EZWZpbmVFbGVtZW50Pg0KDQoNCkEgbmV3IG9yZGVyIGhhcyBiZWVuIHBsYWNlZC4gQmVsb3cgaXMgdGhlIHJlY2VpcHQgdGhhdCBoYXMgYmVlbiBzZW50IHRvIHRoZSBjdXN0b21lci48YnIvPg0KUGxlYXNlIHByb2NlZWQgdG8gYWRtaW5pc3RyYXRpb24gc2VjdGlvbiB0byBhcHByb3ZlIHRoaXMgb3JkZXIuPGJyLz48YnIvPg0KDQpPcmRlciBOdW1iZXI6IDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJPcmRlck51bWJlciIgLz48YnIvPg0KRGF0ZS9UaW1lOiA8aW5wMjpvcmRfRmllbGQgbmFtZT0iT3JkZXJEYXRlIiAvPjxici8+PGJyLz48YnIvPg0KDQpEZWFyIDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJCaWxsaW5nVG8iIC8+LDxici8+PGJyLz4NCg0KVGhhbmsgeW91IGZvciB5b3VyIHB1cmNoYXNlITxici8+PGJyLz4NCg0KPGlucDI6bV9pZiBjaGVjaz0ib3JkX1VzaW5nQ3JlZGl0Q2FyZCI+DQpQbGVhc2UgYWxsb3cgMjQgaG91cnMgZm9yIHVzIHRvIGNvbmZpcm0gYW5kIHByb2Nlc3MgeW91ciBvcmRlci4NCjxpbnAyOm1fZWxzZSAvPg0KUGxlYXNlIHNlbmQgYSBjaGVjayBvciBhIG1vbmV5IG9yZGVyIGluIHRoZSBhbW91bnQgb2YgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJUb3RhbEFtb3VudCIgY3VycmVuY3k9InNlbGVjdGVkIi8+IHRvOg0KPGJyPg0KQWRkcmVzcw0KPGJyPg0KQWxsIGNoZWNrcyBtdXN0IGJlIGRyYXduIGluIFUuUy4gZnVuZHMgZnJvbSBhIFUuUy4gYmFuay4NClBsZWFzZSBhdHRhY2ggYSBwcmludG91dCBvZiB0aGlzIHJlY2VpcHQgd2l0aCB5b3VyIGNoZWNrIGFuZA0Kd3JpdGUgZG93biB5b3VyIG9yZGVyIG51bWJlci4gIFlvdXIgb3JkZXIgd2lsbCBiZSBhcHByb3ZlZA0Kd2l0aGluIDggYnVzaW5lc3MgZGF5cyBhZnRlciB0aGUgZGF5IHdlIHJlY2VpdmUgeW91ciBjaGVjaywNCm9yIHdpdGhpbiAyIGJ1c2luZXNzIGRheXMgYWZ0ZXIgd2UgcmVjZWl2ZSBhIG1vbmV5IG9yZGVyIG9yDQpiYW5rIGRyYWZ0Lg0KPC9pbnAyOm1faWY+DQoNCg0KQmVsb3cgYXJlIHRoZSBkZXRhaWxzIG9mIHlvdXIgb3JkZXI6PGJyLz48YnIvPg0KDQpPcmRlciBDb250ZW50czo8YnIvPg0KPGhyLz4NCjxpbnAyOm9yZF9QcmludENhcnQgaXRlbV9yZW5kZXJfYXM9Im9yZGVyaXRlbV9lbGVtIiBoZWFkZXJfcmVuZGVyX2FzPSJodG1sOiIgZm9vdGVyX3JlbmRlcl9hcz0iaHRtbDoiIGVtcHR5X2NhcnRfcmVuZGVyX2FzPSJodG1sOiIgcGVyX3BhZ2U9Ii0xIi8+IA0KPGhyLz4NClN1YiBUb3RhbDogICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IlN1YnRvdGFsV2l0aERpc2NvdW50IiBjdXJyZW5jeT0ic2VsZWN0ZWQiLz48YnIvPg0KVGF4ZXM6ICAgICAgIDxpbnAyOm9yZF9GaWVsZCBuYW1lPSJWQVQiIGN1cnJlbmN5PSJzZWxlY3RlZCIvPjxici8+DQpUb3RhbDogICAgICAgPGlucDI6b3JkX0ZpZWxkIGZpZWxkPSJUb3RhbEFtb3VudCIgY3VycmVuY3k9InNlbGVjdGVkIi8+PGJyLz4NCg0KQmlsbGluZyBJbmZvcm1hdGlvbjoNCjxoci8+DQpBbW91bnQgQmlsbGVkOgk8aW5wMjpvcmRfRmllbGQgZmllbGQ9IlRvdGFsQW1vdW50IiBjdXJyZW5jeT0ic2VsZWN0ZWQiLz48YnIvPg0KPGlucDI6bV9pZiBjaGVjaz0ib3JkX1VzaW5nQ3JlZGl0Q2FyZCI+DQpQYXltZW50IFR5cGU6CTxpbnAyOm9yZF9GaWVsZCBuYW1lPSJQYXltZW50VHlwZSIgLz48YnIvPg0KQ3JlZGl0IENhcmQ6CTxpbnAyOm9yZF9GaWVsZCBuYW1lPSJQYXltZW50QWNjb3VudCIgbWFza2VkPSJtYXNrZWQiLz4NCjxpbnAyOm1fZWxzZSAvPg0KUGF5bWVudCBUeXBlOgk8aW5wMjpvcmRfRmllbGQgbmFtZT0iUGF5bWVudFR5cGUiIC8+DQo8L2lucDI6bV9pZj48YnIvPjxici8+DQoNCkNvbnRhY3QgSW5mb3JtYXRpb246PGJyLz4NCjxoci8+DQpOYW1lOiA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdUbyIvPjxici8+IA0KRS1tYWlsOgkJCTxpbnAyOm1faWYgY2hlY2s9Im9yZF9GaWVsZCIgbmFtZT0iQmlsbGluZ0VtYWlsIj4NCiAgPGEgaHJlZj0ibWFpbHRvOjxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ0VtYWlsIi8+Ij48aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdFbWFpbCIvPjwvYT4NCjxpbnAyOm1fZWxzZSAvPg0KICA8YSBocmVmPSJtYWlsdG86PGlucDI6dV9GaWVsZCBmaWVsZD0iRW1haWwiLz4iPjxpbnAyOnVfRmllbGQgZmllbGQ9IkVtYWlsIi8+PC9hPg0KPC9pbnAyOm1faWY+PGJyLz4NCkNvbXBhbnkvT3JnYW5pemF0aW9uOiA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdDb21wYW55Ii8+PGJyLz4NClBob25lOiAgICAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ1Bob25lIi8+PGJyLz4NCkZheDogICAgICAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ0ZheCIvPjxici8+DQpBZGRyZXNzIExpbmUgMTogICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdBZGRyZXNzMSIvPjxici8+DQpBZGRyZXNzIExpbmUgMjogICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdBZGRyZXNzMiIvPjxici8+DQpDaXR5OiAgICAgICAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdDaXR5Ii8+PGJyLz4NClN0YXRlOiAgICAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ1N0YXRlIi8+PGJyLz4NClpJUCBDb2RlOiAgICAgICAgIDxpbnAyOm9yZF9GaWVsZCBmaWVsZD0iQmlsbGluZ1ppcCIvPjxici8+DQpDb3VudHJ5OiAgICAgICAgICA8aW5wMjpvcmRfRmllbGQgZmllbGQ9IkJpbGxpbmdDb3VudHJ5Ii8+PGJyLz4=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="PRODUCT.SUGGEST" Type="0">
+				<SUBJECT>WW91ciBGcmllbmQgcmVjb21tZW5kcyB0byBsb29rIGF0IHRoaXMgaXRlbQ==</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjptX3BhcmFtIG5hbWU9InRvX25hbWUiIC8+LDxici8+PGJyLz4NCg0KPGlucDI6bV9wYXJhbSBuYW1lPSJmcm9tX25hbWUiIC8+IHRoaW5rcyB0aGF0IHRoaXMgaXRlbSBpbiBvdXIgb25saW5lIHN0b3JlIG1pZ2h0IGJlIG9mIGludGVyZXN0IHRvIHlvdS4gPGlucDI6bV9wYXJhbSBuYW1lPSJmcm9tX25hbWUiIC8+IHdyaXRlczo8YnI+DQotLS0tPGJyPg0KPGJsb2NrcXVvdGU+DQo8aW5wMjptX3BhcmFtIG5hbWU9Im1lc3NhZ2VfdGV4dCIvPg0KPC9ibG9ja3F1b3RlPg0KLS0tLTxicj4NCjxicj4NClRvIHNlZSB0aGUgaXRlbSBkZXRhaWxzLCBwbGVhc2UgPGEgaHJlZj0iPGlucDI6cF9Qcm9kdWN0TGluayB0ZW1wbGF0ZT0iaW4tY29tbWVyY2UvcHJvZHVjdC9kZXRhaWxzIi8+Ij5jbGljayBoZXJlPC9hPi48YnI+DQo8YnI+DQpTaW5jZXJlbHksPGJyPg0KPGlucDI6Y29uZl9Db25maWdWYWx1ZSBuYW1lPSJTaXRlX05hbWUiLz4gb25saW5lIHN0b3JlIEFkbWluaXN0cmF0aW9uPGJyPg0KPGJyPg0KPHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogc21hbGw7IGNvbG9yOiAjNTU1Ij4NClRoaXMgZW1haWwgd2FzIGdlbmVyYXRlZCBiZWNhdXNlIHNvbWVvbmUgd2hvIGtub3dzIHlvdXIgZW1haWwgYWRkcmVzcyBoYXMgY2hvc2VuIHRvIG5vdGlmeSB5b3UgYWJvdXQgb25lIG9mIG91ciBwcm9kdWN0cy4gVGhpcyBpcyBhbiBhdXRvbWF0aWMgZmVhdHVyZSBvZiBvdXIgb25saW5lIHN0b3JlLiBZb3VyIGVtYWlsIGFkZHJlc3MgaGFzIG5vdCBiZWVuIHJlY29yZGVkLCBhbmQgeW91IGhhdmUgbm90IGJlZW4gc3Vic2NyaWJlZCB0byBhbnkgbWFpbGluZyBsaXN0cy4gV2UgYXBvbG9naXplIGZvciBhbnkgaW5jb252ZW5pZW5jZSB0aGlzIG1lc3NhZ2UgbWlnaHQgaGF2ZSBjYXVzZWQuDQo8L3NtYWxsPg==</HTMLBODY>
+			</EVENT>
+			<EVENT Event="PRODUCT.SUGGEST" Type="1">
+				<SUBJECT>T25lIG9mIHlvdXIgUHJvZHVjdHMgaGFzIGJlZW4gUmVjb21tZW5kZWQ=</SUBJECT>
+				<HTMLBODY>QSBwcm9kdWN0IGZyb20gaGFzIGJlZW4gc3VnZ2VzdGVkLjxici8+PGJyLz4NCg0KU3VnZ2VzdGVkIHByb2R1Y3QgZGV0YWlsczogPGEgaHJlZj0iPGlucDI6cF9Qcm9kdWN0TGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOnBfRmllbGQgbmFtZT0iTmFtZSIvPjwvYT48YnI+DQo=</HTMLBODY>
+			</EVENT>
+			<EVENT Event="USER.GIFTCERTIFICATE" Type="0">
+				<SUBJECT>WW91ciBHaWZ0IENlcnRpZmljYXRl</SUBJECT>
+				<HTMLBODY>RGVhciA8aW5wMjptX3BhcmFtIG5hbWU9InRvX25hbWUiLz4sPGJyLz48YnIvPg0KDQpQbGVhc2UgYWNjZXB0IHRoaXMgZ2lmdCBjZXJ0aWZpY2F0ZSBmb3IgdGhlIGFtb3VudCBvZiA8aW5wMjptX3BhcmFtIG5hbWU9ImFtb3VudCIvPiAuPGJyLz48YnIvPg0KDQpDZXJ0aWZpY2F0ZSBjb2RlIGlzOiA8aW5wMjptX3BhcmFtIG5hbWU9ImdpZmNlcnRfaWQiLz4gYW5kIGNhbiBiZSB1c2VkIGZvciBhbnkgcHVyY2hhc2Ugb24gb3VyIHdlYnNpdGUuPGJyLz48YnIvPg0KDQo8aW5wMjptX2lmIGNoZWNrPSJtX3BhcmFtIiBuYW1lPSJtZXNzYWdlIj4NCjxpbnAyOm1fcGFyYW0gbmFtZT0ibWVzc2FnZSIvPjxici8+DQo8L2lucDI6bV9pZj4NCjxici8+DQoNClRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cyENCg0KDQoNCg0K</HTMLBODY>
+			</EVENT>
+			<EVENT Event="USER.GIFTCERTIFICATE" Type="1">
+				<SUBJECT>R2lmdCBDZXJ0aWZpY2F0ZSAtIEVtYWlsIENvbmZpcm1hdGlvbg==</SUBJECT>
+				<HTMLBODY>VGhpcyBpcyBhbiBlbWFpbCBjb25maXJtYXRpb24gdGhhdCBHaWZ0IENlcnRpZmljYXRlICI8aW5wMjptX3BhcmFtIG5hbWU9ImdpZmNlcnRfaWQiLz4iIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBlbWFpbGVkIHRvIDxpbnAyOm1fcGFyYW0gbmFtZT0idG9fbmFtZSIvPiAoPGEgaHJlZj0ibWFpbHRvOjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fZW1haWwiLz4iPjxpbnAyOm1fcGFyYW0gbmFtZT0idG9fZW1haWwiLz48L2E+KSAu</HTMLBODY>
+			</EVENT>
+		</EVENTS>
+	</LANGUAGE>
+</LANGUAGES>
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/english.lang
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.12
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/prerequisites.php
===================================================================
--- releases/5.2.2-B2/install/prerequisites.php	(revision 0)
+++ releases/5.2.2-B2/install/prerequisites.php	(revision 16630)
@@ -0,0 +1,79 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	defined('FULL_PATH') or die('restricted access!');
+
+	$prerequisite_class = 'InCommercePrerequisites';
+
+	/**
+	 * Class, that holds all prerequisite scripts for "In-Commerce" module
+	 *
+	 */
+	class InCommercePrerequisites extends kHelper {
+
+		/**
+		 * Install toolkit instance
+		 *
+		 * @var kInstallToolkit
+		 */
+		var $_toolkit = null;
+
+		/**
+		 * Sets common instance of installator toolkit
+		 *
+		 * @param kInstallToolkit $instance
+		 */
+		function setToolkit(&$instance)
+		{
+			$this->_toolkit =& $instance;
+		}
+
+		/**
+		 * Checks minimal version, that could be upgradeable
+		 *
+		 * @param Array $versions
+		 * @param string $mode when called mode {install, upgrade, standalone)
+		 * @return Array
+		 */
+		function CheckPrerequisites($versions, $mode)
+		{
+			$errors = Array ();
+
+			if ($mode == 'standalone') {
+				if (!$this->Application->isModuleEnabled('In-Portal')) {
+					$errors[] = 'Please install or enable "In-Portal" module first';
+				}
+			}
+
+			if ($mode == 'upgrade') {
+				$sql = 'SELECT Version
+						FROM ' . TABLE_PREFIX . 'Modules
+						WHERE Name = "In-Portal"';
+				$inportal_version = $this->Conn->GetOne($sql);
+
+				if ($inportal_version === false) {
+					// only, when In-Portal was installed
+					return $errors;
+				}
+
+				$min_version = '4.3.1';
+
+				$current_version = $this->_toolkit->ConvertModuleVersion($inportal_version);
+				$needed_version = $this->_toolkit->ConvertModuleVersion($min_version);
+				if ($current_version < $needed_version) {
+					$errors[] = 'Please upgrade "In-Portal" to version ' . $min_version;
+				}
+			}
+
+			return $errors;
+		}
+	}

Property changes on: releases/5.2.2-B2/install/prerequisites.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.3
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/.htaccess
===================================================================
--- releases/5.2.2-B2/install/.htaccess	(revision 0)
+++ releases/5.2.2-B2/install/.htaccess	(revision 16630)
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/.htaccess
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/remove_schema.sql
===================================================================
--- releases/5.2.2-B2/install/remove_schema.sql	(revision 0)
+++ releases/5.2.2-B2/install/remove_schema.sql	(revision 16630)
@@ -0,0 +1,37 @@
+DROP TABLE Addresses;
+DROP TABLE Currencies;
+DROP TABLE GatewayConfigFields;
+DROP TABLE GatewayConfigValues;
+DROP TABLE Gateways;
+DROP TABLE Manufacturers;
+DROP TABLE OrderItems;
+DROP TABLE Orders;
+DROP TABLE GiftCertificates;
+DROP TABLE PaymentTypeCurrencies;
+DROP TABLE PaymentTypes;
+DROP TABLE Products;
+DROP TABLE ProductsCouponItems;
+DROP TABLE ProductsCoupons;
+DROP TABLE ProductsDiscountItems;
+DROP TABLE ProductsDiscounts;
+DROP TABLE ProductsPricing;
+DROP TABLE ProductFiles;
+DROP TABLE UserFileAccess;
+DROP TABLE UserDownloads;
+DROP TABLE ShippingBrackets;
+DROP TABLE ShippingCosts;
+DROP TABLE ShippingQuoteEngines;
+DROP TABLE ShippingType;
+DROP TABLE ShippingZones;
+DROP TABLE ShippingZonesDestinations;
+DROP TABLE TaxZones;
+DROP TABLE TaxZonesDestinations;
+DROP TABLE AffiliatePayments;
+DROP TABLE AffiliatePaymentTypes;
+DROP TABLE AffiliatePlans;
+DROP TABLE AffiliatePlansBrackets;
+DROP TABLE AffiliatePlansItems;
+DROP TABLE Affiliates;
+DROP TABLE ProductOptionCombinations;
+DROP TABLE ProductOptions;
+DROP TABLE ProductsCustomData;
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/remove_schema.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.1
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/img/.htaccess
===================================================================
--- releases/5.2.2-B2/install/img/.htaccess	(revision 0)
+++ releases/5.2.2-B2/install/img/.htaccess	(revision 16630)
@@ -0,0 +1 @@
+allow from all
\ No newline at end of file

Property changes on: releases/5.2.2-B2/install/img/.htaccess
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install/img/icon_shopping_cart.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: releases/5.2.2-B2/install/img/icon_shopping_cart.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: releases/5.2.2-B2/install/install_data.sql
===================================================================
--- releases/5.2.2-B2/install/install_data.sql	(revision 0)
+++ releases/5.2.2-B2/install/install_data.sql	(revision 16630)
@@ -0,0 +1,480 @@
+# Section "in-commerce:contacts":
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_CompanyName', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_CompanyName', 'text', NULL, NULL, 10.01, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_StoreName', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_StoreName', 'text', NULL, NULL, 10.02, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Contacts_Name', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_ContactName', 'text', NULL, NULL, 10.03, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Contacts_Phone', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_Phone', 'text', NULL, NULL, 10.04, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Contacts_Fax', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_Fax', 'text', NULL, NULL, 10.05, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Contacts_Email', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_Email', 'text', NULL, NULL, 10.06, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Contacts_Additional', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ContactsGeneral', 'la_text_Additional', 'textarea', NULL, NULL, 10.07, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_AddressLine1', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_AddressLine1', 'text', NULL, NULL, 20.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_AddressLine2', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_AddressLine2', 'text', NULL, NULL, 20.02, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_City', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_City', 'text', NULL, NULL, 20.03, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_ZIP', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_ZIP', 'text', NULL, NULL, 20.04, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_Country', 'select', NULL, '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, IsoCode AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>', 20.05, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_State', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_StoreAddress', 'la_State', 'text', NULL, '', 20.06, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_AddressLine1', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_AddressLine1', 'text', NULL, NULL, 30.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_AddressLine2', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_AddressLine2', 'text', NULL, NULL, 30.02, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_City', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_City', 'text', NULL, NULL, 30.03, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_ZIP', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_ZIP', 'text', NULL, NULL, 30.04, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_Country', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_Country', 'select', NULL, '0=lu_none||<SQL+>SELECT l%3$s_Name AS OptionName, IsoCode AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>', 30.05, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Shipping_State', '', 'In-Commerce', 'in-commerce:contacts', 'la_Text_ShippingAddress', 'la_State', 'text', NULL, NULL, 30.06, 0, 1, NULL);
+
+# Section "in-commerce:general":
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_RequireLoginBeforeCheckout', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_orders_RequireLogin', 'checkbox', NULL, NULL, 10.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Enable_Backordering', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_EnableBackordering', 'checkbox', NULL, NULL, 10.02, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Process_Backorders_Auto', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_ProcessBackorderingAuto', 'checkbox', NULL, NULL, 10.03, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Next_Order_Number', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_orders_NextOrderNumber', 'text', NULL, NULL, 10.04, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Order_Number_Format_P', '6', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderMainNumberDigits', 'text', NULL, NULL, 10.05, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Order_Number_Format_S', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderSecNumberDigits', 'text', NULL, NULL, 10.06, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_RecurringChargeInverval', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_RecurringChargeInverval', 'text', NULL, NULL, 10.07, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_AutoProcessRecurringOrders', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_AutoProcessRecurringOrders', 'checkbox', NULL, NULL, 10.08, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'MaxAddresses', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaxAddresses', 'text', NULL, NULL, 10.09, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_MaskProcessedCreditCards', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaskProcessedCreditCards', 'checkbox', NULL, NULL, 10.1, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.11, '0', '0', NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_ExchangeRateSource', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_ExchangeRateSource', 'select', NULL, '2=la_FederalReserveBank||3=la_EuropeanCentralBank||1=la_BankOfLatvia', 20.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_DefaultCouponDuration', '14', 'In-Commerce', 'in-commerce:general', 'la_Text_Coupons', 'la_conf_DefaultCouponDuration', 'text', NULL, NULL, 30.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_RegisterAsAffiliate', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_register_as_affiliate', 'checkbox', NULL, '', 40.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_AffiliateStorageMethod', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_storage_method', 'radio', NULL, '1=la_opt_Session||2=la_opt_PermanentCookie', 40.02, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_AffiliateCookieDuration', '30', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_cookie_duration', 'text', NULL, '', 40.03, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_PriceBracketCalculation', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_PricingCalculation', 'la_prompt_PriceBracketCalculation', 'radio', NULL, '1=la_opt_PriceCalculationByPrimary||2=la_opt_PriceCalculationByOptimal', 50, 0, 1, NULL);
+
+# Section "in-commerce:output":
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_OrderProductsBy', 'Name', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, '=la_none||Name=la_fld_Title||SKU=la_fld_SKU||Manufacturer=la_fld_Manufacturer||Price=la_fld_Price||CreatedOn=la_fld_CreatedOn||Modified=la_fld_Modified||Qty=la_fld_Qty||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomFields WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_OrderProductsByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_OrderProductsBy', 'select', NULL, 'ASC=la_common_Ascending||DESC=la_common_Descending', 10.01, 2, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_OrderProductsThenBy', 'Price', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, '=la_none||Name=la_fld_Title||SKU=la_fld_SKU||Manufacturer=la_fld_Manufacturer||Price=la_fld_Price||CreatedOn=la_fld_CreatedOn||Modified=la_fld_Modified||Qty=la_fld_Qty||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomFields WHERE (Type = 11) AND (IsSystem = 0)</SQL>', 10.02, 1, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_OrderProductsThenByDir', 'ASC', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_ThenBy', 'select', NULL, 'ASC=la_common_Ascending||DESC=la_common_Descending', 10.02, 2, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Perpage_Products', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_Perpage_Products', 'text', NULL, NULL, 10.03, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Perpage_Products_Short', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_Perpage_Products_Shortlist', 'text', NULL, NULL, 10.04, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Product_NewDays', '7', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_DaysToBeNew', 'text', NULL, NULL, 10.05, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Product_MinPopRating', '4', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_fld_Product_MinPopRating', 'text', NULL, NULL, 10.06, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Product_MinPopVotes', '1', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_fld_Product_MinPopVotes', 'text', NULL, NULL, 10.07, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Product_MaxHotNumber', '5', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_fld_Product_MaxHotNumber', 'text', NULL, NULL, 10.08, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'products_EditorPicksAboveRegular', '1', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_conf_EditorPicksAboveRegular', 'checkbox', NULL, NULL, 10.09, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_RatingDelay_Value', '30', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.1, 1, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_RatingDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.1, 2, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'ShowProductImagesInOrders', '0', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_config_ShowProductImagesInOrders', 'checkbox', NULL, NULL, 10.11, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'MaxCompareProducts', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Products', 'la_config_MaxCompareProducts', 'text', NULL, NULL, 10.12, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Perpage_Reviews', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', 'la_config_PerpageReviews', 'text', NULL, NULL, 20.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_ReviewDelay_Value', '30', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 20.02, 1, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'product_ReviewDelay_Interval', '86400', 'In-Commerce', 'in-commerce:output', 'la_Text_Reviews', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 20.02, 2, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Perpage_Manufacturers', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers', 'text', NULL, NULL, 30.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Comm_Perpage_Manufacturers_Short', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers_Short', 'text', NULL, NULL, 30.02, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_CategoryTemplate', '/in-commerce/designs/section', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 40.01, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_ItemTemplate', 'in-commerce/products/product_detail', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_MaxImageCount', '5', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 50.01, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_ThumbnailImageWidth', '120', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 50.02, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_ThumbnailImageHeight', '120', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 50.03, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_FullImageWidth', '450', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_FullImageWidth', 'text', '', '', 50.04, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'p_FullImageHeight', '450', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 50.05, 0, 0, NULL);
+
+# Section "in-commerce:search":
+INSERT INTO SystemSettings VALUES(DEFAULT, 'Search_ShowMultiple_products', '1', 'In-Commerce', 'in-commerce:search', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Keyword_products', '70', 'In-Commerce', 'in-commerce:search', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Pop_products', '10', 'In-Commerce', 'in-commerce:search', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Rating_products', '10', 'In-Commerce', 'in-commerce:search', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SearchRel_Increase_products', '30', 'In-Commerce', 'in-commerce:search', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1, NULL);
+
+INSERT INTO Currencies VALUES (6, 'AFA', '', 0, 'la_AFA', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (7, 'ALL', '', 0, 'la_ALL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (8, 'DZD', '', 0, 'la_DZD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (9, 'ADP', '', 0, 'la_ADP', 1, 1124019233, 0, 0, 0);
+INSERT INTO Currencies VALUES (10, 'AOA', '', 0, 'la_AOA', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (11, 'ARS', '', 0, 'la_ARS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (12, 'AMD', '', 0, 'la_AMD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (13, 'AWG', '', 0, 'la_AWG', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (14, 'AZM', '', 0, 'la_AZM', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (15, 'BSD', '', 0, 'la_BSD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (16, 'BHD', '', 0, 'la_BHD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (17, 'BDT', '', 0, 'la_BDT', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (18, 'BBD', '', 0, 'la_BBD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (19, 'BYR', '', 0, 'la_BYR', 0.46440677966102, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (20, 'BZD', '', 0, 'la_BZD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (21, 'BMD', '', 0, 'la_BMD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (22, 'BTN', '', 0, 'la_BTN', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (23, 'INR', '', 0, 'la_INR', 0.022962112514351, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (24, 'BOV', '', 0, 'la_BOV', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (25, 'BOB', '', 0, 'la_BOB', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (26, 'BAM', '', 0, 'la_BAM', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (27, 'BWP', '', 0, 'la_BWP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (28, 'BRL', '', 0, 'la_BRL', 0.42331625957753, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (29, 'BND', '', 0, 'la_BND', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (30, 'BGL', '', 0, 'la_BGL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (31, 'BGN', '', 0, 'la_BGN', 0.60754639807761, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (32, 'BIF', '', 0, 'la_BIF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (33, 'KHR', '', 0, 'la_KHR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (34, 'CAD', '', 0, 'la_CAD', 0.80579100834068, 1120657409, 0, 0, 0);
+INSERT INTO Currencies VALUES (35, 'CVE', '', 0, 'la_CVE', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (36, 'KYD', '', 0, 'la_KYD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (37, 'XAF', '', 0, 'la_XAF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (38, 'CLF', '', 0, 'la_CLF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (39, 'CLP', '', 0, 'la_CLP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (40, 'CNY', '', 0, 'la_CNY', 0.12082358922217, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (41, 'COP', '', 0, 'la_COP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (42, 'KMF', '', 0, 'la_KMF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (43, 'CDF', '', 0, 'la_CDF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (44, 'CRC', '', 0, 'la_CRC', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (45, 'HRK', '', 0, 'la_HRK', 0.16222968545216, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (46, 'CUP', '', 0, 'la_CUP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (47, 'CYP', '', 0, 'la_CYP', 2.0723753051971, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (48, 'CZK', '', 0, 'la_CZK', 0.039512535745162, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (49, 'DKK', '', 0, 'la_DKK', 0.15944343065693, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (50, 'DJF', '', 0, 'la_DJF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (51, 'DOP', '', 0, 'la_DOP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (52, 'TPE', '', 0, 'la_TPE', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (53, 'ECV', '', 0, 'la_ECV', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (54, 'ECS', '', 0, 'la_ECS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (55, 'EGP', '', 0, 'la_EGP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (56, 'SVC', '', 0, 'la_SVC', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (57, 'ERN', '', 0, 'la_ERN', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (58, 'EEK', '', 0, 'la_EEK', 0.075946211956591, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (59, 'ETB', '', 0, 'la_ETB', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (60, 'FKP', '', 0, 'la_FKP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (61, 'FJD', '', 0, 'la_FJD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (62, 'GMD', '', 0, 'la_GMD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (63, 'GEL', '', 0, 'la_GEL', 1, 1124019233, 0, 0, 0);
+INSERT INTO Currencies VALUES (64, 'GHC', '', 0, 'la_GHC', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (65, 'GIP', '', 0, 'la_GIP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (66, 'GTQ', '', 0, 'la_GTQ', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (67, 'GNF', '', 0, 'la_GNF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (68, 'GWP', '', 0, 'la_GWP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (69, 'GYD', '', 0, 'la_GYD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (70, 'HTG', '', 0, 'la_HTG', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (71, 'HNL', '', 0, 'la_HNL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (72, 'HKD', '', 0, 'la_HKD', 0.1286359158665, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (73, 'HUF', '', 0, 'la_HUF', 0.0048070388349515, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (74, 'ISK', '', 0, 'la_ISK', 0.015143366891806, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (75, 'IDR', '', 0, 'la_IDR', 0.00010126584435926, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (76, 'IRR', '', 0, 'la_IRR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (77, 'IQD', '', 0, 'la_IQD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (78, 'ILS', '', 0, 'la_ILS', 0.21864406779661, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (79, 'JMD', '', 0, 'la_JMD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (80, 'JPY', '', 0, 'la_JPY', 0.0089325716003909, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (81, 'JOD', '', 0, 'la_JOD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (82, 'KZT', '', 0, 'la_KZT', 7.3559322033898, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (83, 'KES', '', 0, 'la_KES', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (84, 'AUD', '', 0, 'la_AUD', 0.74088160109733, 1120650640, 1, 0, 0);
+INSERT INTO Currencies VALUES (85, 'KPW', '', 0, 'la_KPW', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (86, 'KRW', '', 0, 'la_KRW', 0.00095066281590758, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (87, 'KWD', '', 0, 'la_KWD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (88, 'KGS', '', 0, 'la_KGS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (89, 'LAK', '', 0, 'la_LAK', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (90, 'LVL', '', 0, 'la_LVL', 1.7697169946847, 1124019016, 0, 0, 0);
+INSERT INTO Currencies VALUES (91, 'LBP', '', 0, 'la_LBP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (92, 'LSL', '', 0, 'la_LSL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (93, 'LRD', '', 0, 'la_LRD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (94, 'LYD', '', 0, 'la_LYD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (95, 'CHF', '', 0, 'la_CHF', 0.76560788608981, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (96, 'LTL', '', 0, 'la_LTL', 0.34415546802595, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (97, 'MOP', '', 0, 'la_MOP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (98, 'MKD', '', 0, 'la_MKD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (99, 'MGF', '', 0, 'la_MGF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (100, 'MWK', '', 0, 'la_MWK', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (101, 'MYR', '', 0, 'la_MYR', 0.2631019594819, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (102, 'MVR', '', 0, 'la_MVR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (103, 'MTL', '', 0, 'la_MTL', 2.7679944095038, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (104, 'EUR', '&euro;&nbsp;', 0, 'la_EUR', 1.2319, 1124019016, 1, 0, 0);
+INSERT INTO Currencies VALUES (105, 'MRO', '', 0, 'la_MRO', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (106, 'MUR', '', 0, 'la_MUR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (107, 'MXN', '', 0, 'la_MXN', 0.092980009298001, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (108, 'MXV', '', 0, 'la_MXV', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (109, 'MDL', '', 0, 'la_MDL', 0.079830508474576, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (110, 'MNT', '', 0, 'la_MNT', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (111, 'XCD', '', 0, 'la_XCD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (112, 'MZM', '', 0, 'la_MZM', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (113, 'MMK', '', 0, 'la_MMK', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (114, 'ZAR', '', 0, 'la_ZAR', 0.14487399875645, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (115, 'NAD', '', 0, 'la_NAD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (116, 'NPR', '', 0, 'la_NPR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (117, 'ANG', '', 0, 'la_ANG', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (118, 'XPF', '', 0, 'la_XPF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (120, 'NIO', '', 0, 'la_NIO', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (121, 'NGN', '', 0, 'la_NGN', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (122, 'NOK', '', 0, 'la_NOK', 0.15015163002274, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (123, 'OMR', '', 0, 'la_OMR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (124, 'PKR', '', 0, 'la_PKR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (125, 'PAB', '', 0, 'la_PAB', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (126, 'PGK', '', 0, 'la_PGK', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (127, 'PYG', '', 0, 'la_PYG', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (128, 'PEN', '', 0, 'la_PEN', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (129, 'PHP', '', 0, 'la_PHP', 0.017769769111138, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (130, 'PLN', '', 0, 'la_PLN', 0.29408270844161, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (131, 'USD', '$&nbsp;', 0, 'la_USD', 1, 1124019100, 1, 1, 0);
+INSERT INTO Currencies VALUES (132, 'QAR', '', 0, 'la_QAR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (133, 'ROL', '', 0, 'la_ROL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (134, 'RUB', NULL, 0, 'la_RUB', 0.0347, 1123850285, 0, 0, 0);
+INSERT INTO Currencies VALUES (136, 'RWF', '', 0, 'la_RWF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (137, 'SHP', '', 0, 'la_SHP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (138, 'WST', '', 0, 'la_WST', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (139, 'STD', '', 0, 'la_STD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (140, 'SAR', '', 0, 'la_SAR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (141, 'SCR', '', 0, 'la_SCR', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (142, 'SLL', '', 0, 'la_SLL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (143, 'SGD', '', 0, 'la_SGD', 0.58838383838384, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (144, 'SKK', '', 0, 'la_SKK', 0.031050431147113, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (145, 'SIT', '', 0, 'la_SIT', 0.0049628299365185, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (146, 'SBD', '', 0, 'la_SBD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (147, 'SOS', '', 0, 'la_SOS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (148, 'LKR', '', 0, 'la_LKR', 0.0099920063948841, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (149, 'SDD', '', 0, 'la_SDD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (150, 'SRG', '', 0, 'la_SRG', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (151, 'SZL', '', 0, 'la_SZL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (152, 'SEK', '', 0, 'la_SEK', 0.12594327624216, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (153, 'SYP', '', 0, 'la_SYP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (154, 'TWD', '', 0, 'la_TWD', 0.031298904538341, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (155, 'TJS', '', 0, 'la_TJS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (156, 'TZS', '', 0, 'la_TZS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (157, 'THB', '', 0, 'la_THB', 0.024061474911918, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (158, 'XOF', '', 0, 'la_XOF', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (159, 'NZD', '', 0, 'la_NZD', 0.67409802586794, 1120650640, 0, 0, 0);
+INSERT INTO Currencies VALUES (160, 'TOP', '', 0, 'la_TOP', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (161, 'TTD', '', 0, 'la_TTD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (162, 'TND', '', 0, 'la_TND', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (163, 'TRL', '', 0, 'la_TRL', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (164, 'TMM', '', 0, 'la_TMM', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (165, 'UGX', '', 0, 'la_UGX', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (166, 'UAH', '', 0, 'la_UAH', 0.19830508474576, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (167, 'AED', '', 0, 'la_AED', 0.2728813559322, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (168, 'GBP', NULL, 0, 'la_GBP', 1.7543367535248, 1120657409, 1, 0, 0);
+INSERT INTO Currencies VALUES (169, 'USS', '', 0, 'la_USS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (170, 'USN', '', 0, 'la_USN', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (171, 'UYU', '', 0, 'la_UYU', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (172, 'UZS', '', 0, 'la_UZS', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (173, 'VUV', '', 0, 'la_VUV', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (174, 'VEB', '', 0, 'la_VEB', 0.00046628741956542, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (175, 'VND', '', 0, 'la_VND', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (176, 'MAD', '', 0, 'la_MAD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (177, 'YER', '', 0, 'la_YER', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (178, 'YUM', '', 0, 'la_YUM', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (179, 'ZMK', '', 0, 'la_ZMK', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (180, 'ZWD', '', 0, 'la_ZWD', 1, 1120641028, 0, 0, 0);
+INSERT INTO Currencies VALUES (181, 'AFN', '', 0, 'la_AFN', 0.02, 1120641028, 0, 0, 0);
+
+INSERT INTO CustomFields VALUES (DEFAULT, 11, 'Features', 'la_Features', 1, 'la_Text_CustomFields', 'la_Features', 'textarea', 'rows="5" cols="70"', '', 0, 1, 0, 0);
+INSERT INTO CustomFields VALUES (DEFAULT, 11, 'Availability', 'la_Availability', 1, 'la_Text_CustomFields', 'la_Availability', 'text', 'size="70"', '', 0, 1, 0, 0);
+INSERT INTO CustomFields VALUES (DEFAULT, 1, 'p_ItemTemplate', 'la_fld_cust_p_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_p_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
+INSERT INTO CustomFields VALUES (DEFAULT, 6, 'shipping_addr_block', 'la_fld_BlockShippingAddress', 0, 'la_section_StoreSettings', 'la_fld_BlockShippingAddress', 'checkbox', '1=+Block', '', 0, 1, 1, 0);
+
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.SUBMIT', NULL, 1, 1, 'In-Commerce', 'Order Submitted', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.SUBMIT', NULL, 1, 1, 'In-Commerce', 'Order Submitted', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.APPROVE', NULL, 1, 0, 'In-Commerce', 'Order Approved', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.DENY', NULL, 1, 0, 'In-Commerce', 'Order Denied', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.SHIP', NULL, 1, 0, 'In-Commerce', 'Order Shipped', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'BACKORDER.ADD', NULL, 1, 1, 'In-Commerce', 'Backorder Added', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'BACKORDER.ADD', NULL, 1, 1, 'In-Commerce', 'Backorder Added', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'BACKORDER.FULLFILL', NULL, 1, 0, 'In-Commerce', 'Back-order is Fulfilled', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'BACKORDER.PROCESS', NULL, 1, 0, 'In-Commerce', 'Backorder Processed', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'PRODUCT.SUGGEST', NULL, 1, 0, 'In-Commerce', 'Suggest product to a friend', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'PRODUCT.SUGGEST', NULL, 1, 1, 'In-Commerce', 'Suggest product to a friend', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTER', NULL, 1, 1, 'In-Commerce', 'Affiliate registered', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTER', NULL, 1, 1, 'In-Commerce', 'Affiliate registered', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.PAYMENT', NULL, 1, 0, 'In-Commerce', 'Affiliate payment issued', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.PAYMENT', NULL, 1, 0, 'In-Commerce', 'Affiliate payment issued', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTRATION.APPROVED', NULL, 1, 0, 'In-Commerce', 'Affiliate registration approved', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTRATION.APPROVED', NULL, 0, 0, 'In-Commerce', 'Affiliate registration approved', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTRATION.DENIED', NULL, 1, 0, 'In-Commerce', 'Affiliate registration denied', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.REGISTRATION.DENIED', NULL, 0, 0, 'In-Commerce', 'Affiliate registration denied', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.PAYMENT.TYPE.CHANGED', NULL, 1, 0, 'In-Commerce', 'Affiliate payment type changed', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'AFFILIATE.PAYMENT.TYPE.CHANGED', NULL, 1, 0, 'In-Commerce', 'Affiliate payment type changed', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.RECURRING.PROCESSED', NULL, 1, 0, 'In-Commerce', 'Recurring Order Processed', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.RECURRING.PROCESSED', NULL, 1, 0, 'In-Commerce', 'Recurring Order Processed', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.RECURRING.DENIED', NULL, 1, 0, 'In-Commerce', 'Recurring Order Denied', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'ORDER.RECURRING.DENIED', NULL, 1, 0, 'In-Commerce', 'Recurring Order Denied', 1, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.GIFTCERTIFICATE', NULL, 1, 0, 'In-Commerce', 'Gift Certificate', 0, 1, 1);
+INSERT INTO EmailTemplates (TemplateId, TemplateName, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.GIFTCERTIFICATE', NULL, 1, 0, 'In-Commerce', 'Gift Certificate', 1, 1, 1);
+
+INSERT INTO GatewayConfigFields VALUES (1, 'submit_url', 'Gateway URL', 'text', '', 2);
+INSERT INTO GatewayConfigFields VALUES (2, 'user_account', 'Authorize.net User Name', 'text', '', 2);
+INSERT INTO GatewayConfigFields VALUES (4, 'transaction_key', 'Authorize.net Transaction Key', 'text', '', 2);
+INSERT INTO GatewayConfigFields VALUES (9, 'business_account', 'Username', 'text', '', 4);
+INSERT INTO GatewayConfigFields VALUES (10, 'submit_url', 'Gateway URL', 'text', '', 4);
+INSERT INTO GatewayConfigFields VALUES (11, 'currency_code', 'Payment Currency Code', 'text', '', 4);
+INSERT INTO GatewayConfigFields VALUES (12, 'shipping_control', 'Shipping Control', 'select', '3=la_CreditDirect,4=la_CreditPreAuthorize', 2);
+INSERT INTO GatewayConfigFields VALUES (13, 'encapsulate_char', 'Encapsulate Char', 'text', '', 2);
+INSERT INTO GatewayConfigFields VALUES (14, 'shipping_control', 'Shipping Control', 'select', '3=la_CreditDirect,4=la_CreditPreAuthorize', 4);
+
+INSERT INTO GatewayConfigValues VALUES (36, 12, 3, '4');
+INSERT INTO GatewayConfigValues VALUES (35, 1, 3, 'https://secure.authorize.net/gateway/transact.dll');
+INSERT INTO GatewayConfigValues VALUES (34, 2, 3, '');
+INSERT INTO GatewayConfigValues VALUES (33, 4, 3, '');
+INSERT INTO GatewayConfigValues VALUES (32, 9, 4, '');
+INSERT INTO GatewayConfigValues VALUES (31, 10, 4, 'https://www.paypal.com/cgi-bin/webscr');
+INSERT INTO GatewayConfigValues VALUES (37, 11, 4, 'USD');
+INSERT INTO GatewayConfigValues VALUES (38, 13, 3, '|');
+INSERT INTO GatewayConfigValues VALUES (39, 14, 4, '4');
+
+INSERT INTO Gateways VALUES (1, 'None', 'kGWBase', 'gw_base.php', 0);
+INSERT INTO Gateways VALUES (2, 'Credit Card (Authorize.Net)', 'kGWAuthorizeNet', 'authorizenet.php', 1);
+INSERT INTO Gateways VALUES (3, 'Credit Card (Manual Processing)', 'kGWBase', 'gw_base.php', 1);
+INSERT INTO Gateways VALUES (4, 'PayPal', 'kGWPayPal', 'paypal.php', 0);
+
+INSERT INTO ItemTypes VALUES (11, 'In-Commerce', 'p', 'Products', 'Name', 'CreatedById', NULL, NULL, '', 0, '', 'ProductsItem', 'Product');
+INSERT INTO ItemTypes VALUES (13, 'In-Commerce', 'ord', 'Orders', 'OrderNumber', '', NULL, NULL, '', 0, '', 'OrdersItem', 'Order');
+
+INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (1, 'Credit Card (manual)', 'Credit Card', 'Please enter your credit card details.', NULL, 1, 0, 1, 1, 3, DEFAULT, DEFAULT, ',15,');
+INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (4, 'PayPal', 'PayPal', 'You will be redirected to PayPal site to make the payment after confirming your order on the next checkout step.', NULL, 0, 0, 0, 1, 4, DEFAULT, DEFAULT, ',15,');
+INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (2, 'Check/MO', 'Check or Money Order', NULL, NULL, 0, 0, 0, 1, 1, 1, DEFAULT, ',15,');
+INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (3, 'Authorize.Net', 'Credit Card', 'Please enter your Credit Card details below. Your credit card will not be charged until you confirm your purchase on the next(last) step of checkout process.', NULL, 0, 0, 0, 1, 2, DEFAULT, DEFAULT, ',15,');
+
+INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 4, 131);
+INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 2, 131);
+INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131);
+INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131);
+
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'In-Commerce', 1);
+INSERT INTO CategoryPermissionsConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'In-Commerce', 1);
+
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.REVIEW', 13, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 13, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 13, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 13, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 12, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.ADD', 11, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.DELETE', 11, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.MODIFY', 11, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 11, 1, 0, {ProductCatId});
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:products.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:setting_folder.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:deny', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:archive', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:place', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:process', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:ship', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:orders.advanced:reset_to_pending', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:discounts.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:coupons.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:manufacturers.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:manufacturers.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:manufacturers.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:manufacturers.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.advanced:move_up', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.advanced:move_down', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.advanced:update_rate', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:currencies.advanced:set_primary', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping_quote_engines.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping_quote_engines.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping_quote_engines.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:shipping_quote_engines.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:payment_types.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:payment_types.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:payment_types.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:payment_types.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:taxes.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:taxes.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:taxes.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:taxes.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliates.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_plans.advanced:set_primary', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.advanced:set_primary', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.advanced:move_up', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:affiliate_payment_types.advanced:move_down', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:general.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:general.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:general.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:output.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:output.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:output.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:search.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:search.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:contacts.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:contacts.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:contacts.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:configuration_custom.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:configuration_custom.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:configuration_custom.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:configuration_custom.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:paymentlog.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:downloadlog.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:downloadlog.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.add', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.edit', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.delete', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.advanced:approve', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:gift-certificates.advanced:decline', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:reports.view', 11, 1, 1, 0);
+INSERT INTO Permissions VALUES (DEFAULT, 'in-commerce:reports.add', 11, 1, 1, 0);
+
+INSERT INTO SearchConfig VALUES ('Products', 'OrgId', 0, 0, 'lu_fielddesc_prod_orgid', 'lc_field_orgid', 'In-Commerce', 'la_Text_Products', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'NewItem', 0, 1, 'lu_fielddesc_prod_newitem', 'lu_field_newproduct', 'In-Commerce', 'la_Text_Products', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'PopItem', 0, 1, 'lu_fielddesc_prod_popitem', 'lu_field_popproduct', 'In-Commerce', 'la_Text_Products', 17, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'HotItem', 0, 1, 'lu_fielddesc_prod_topseller', 'lc_field_topseller', 'In-Commerce', 'la_Text_Products', 16, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'EditorsPick', 0, 1, 'lu_fielddesc_prod_editorspick', 'lc_field_EditorsPick', 'In-Commerce', 'la_Text_Products', 14, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'CachedReviewsQty', 0, 0, 'lu_fielddesc_prod_cachedreviewsqty', 'lc_field_cachedreviewsqty', 'In-Commerce', 'la_Text_Products', 9, DEFAULT, 0, 'range', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'CachedVotesQty', 0, 0, 'lu_fielddesc_prod_cachedvotesqty', 'lc_field_cachedvotesqty', 'In-Commerce', 'la_Text_Products', 8, DEFAULT, 0, 'range', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'ProductId', 0, 0, 'lu_fielddesc_prod_productid', 'lu_field_productid', 'In-Commerce', 'la_Text_Products', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'Name', 1, 1, 'lu_fielddesc_prod_producttitle', 'lu_field_producttitle', 'In-Commerce', 'la_Text_Products', 1, DEFAULT, 3, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'Description', 1, 1, 'lu_fielddesc_prod_description', 'lc_field_description', 'In-Commerce', 'la_Text_Products', 2, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'CreatedOn', 0, 1, 'lu_fielddesc_prod_createdon', 'lc_field_createdon', 'In-Commerce', 'la_Text_Products', 4, DEFAULT, 0, 'date', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'Modified', 0, 1, 'lu_fielddesc_prod_modified', 'lc_field_modified', 'In-Commerce', 'la_Text_Products', 5, DEFAULT, 0, 'date', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'Hits', 0, 1, 'lu_fielddesc_prod_qtysold', 'lc_field_qtysold', 'In-Commerce', 'la_Text_Products', 6, DEFAULT, 0, 'range', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'CachedRating', 0, 0, 'lu_fielddesc_prod_cachedrating', 'lc_field_cachedrating', 'In-Commerce', 'la_Text_Products', 7, DEFAULT, 0, 'range', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('CustomFields', 'Features', 1, 0, 'la_Features', 'la_Features', 'In-Commerce', 'la_Text_CustomFields', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'SKU', 1, 1, 'lu_fielddesc_prod_sku', 'lu_field_sku', 'In-Commerce', 'la_Text_Products', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'DescriptionExcerpt', 1, 0, 'lu_fielddesc_prod_descriptionex', 'lc_field_descriptionex', 'In-Commerce', 'la_Text_Products', 2, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'ManufacturerId', 1, 1, 'lu_fielddesc_prod_manufacturer', 'lc_field_manufacturer', 'In-Commerce', 'la_Text_Products', 3, DEFAULT, 2, 'text', 'Manufacturers.Name', '{ForeignTable}.ManufacturerId={LocalTable}.ManufacturerId', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('Products', 'Price', 1, 1, 'lu_fielddesc_prod_price', 'lu_field_price', 'In-Commerce', 'la_Text_Products', 23, DEFAULT, 2, 'range', 'CALC:MIN( IF({PREFIX}ProductsDiscounts.Type = 1, {PREFIX}ProductsPricing.Price - {PREFIX}ProductsDiscounts.Amount, IF({PREFIX}ProductsDiscounts.Type = 2, ({PREFIX}ProductsPricing.Price * (1-{PREFIX}ProductsDiscounts.Amount/100)), {PREFIX}ProductsPricing.Price ) ) )', '{PREFIX}ProductsPricing ON {PREFIX}ProductsPricing.ProductId = {PREFIX}Products.ProductId AND {PREFIX}ProductsPricing.IsPrimary = 1 LEFT JOIN {PREFIX}ProductsDiscountItems ON {PREFIX}ProductsDiscountItems.ItemResourceId = {PREFIX}Products.ResourceId LEFT JOIN {PREFIX}ProductsDiscounts ON {PREFIX}ProductsDiscounts.DiscountId = {PREFIX}ProductsDiscountItems.DiscountId AND {PREFIX}ProductsDiscounts.Status = 1 AND {PREFIX}ProductsDiscountItems.ItemType = 1 AND ( {PREFIX}ProductsDiscounts.GroupId IN ({USER_GROUPS},NULL) AND ( ({PREFIX}ProductsDiscounts.Start IS NULL OR {PREFIX}ProductsDiscounts.Start < UNIX_TIMESTAMP()) AND ({PREFIX}ProductsDiscounts.Start IS NULL OR {PREFIX}ProductsDiscounts.End > UNIX_TIMESTAMP()) ) )', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO SearchConfig VALUES ('CustomFields', 'Availability', 0, 0, 'la_Availability', 'la_Availability', 'In-Commerce', 'la_Text_CustomFields', 0, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+INSERT INTO ShippingQuoteEngines VALUES (1, 'Intershipper.com', 0, 0, 0, 'a:21:{s:12:"AccountLogin";N;s:15:"AccountPassword";s:0:"";s:10:"UPSEnabled";i:1;s:10:"UPSAccount";N;s:11:"UPSInvoiced";N;s:10:"FDXEnabled";i:1;s:10:"FDXAccount";N;s:10:"DHLEnabled";i:1;s:10:"DHLAccount";N;s:11:"DHLInvoiced";i:0;s:10:"USPEnabled";i:1;s:10:"USPAccount";N;s:11:"USPInvoiced";i:0;s:10:"ARBEnabled";i:1;s:10:"ARBAccount";N;s:11:"ARBInvoiced";N;s:10:"1DYEnabled";i:1;s:10:"2DYEnabled";i:1;s:10:"3DYEnabled";i:1;s:10:"GNDEnabled";i:1;s:10:"ShipMethod";s:3:"DRP";}', 'Intershipper');
+INSERT INTO ShippingQuoteEngines VALUES ( DEFAULT, 'USPS.com', 0, 0, 0, 'a:21:{s:12:"AccountLogin";s:0:"";s:15:"AccountPassword";N;s:10:"UPSEnabled";N;s:10:"UPSAccount";s:0:"";s:11:"UPSInvoiced";N;s:10:"FDXEnabled";N;s:10:"FDXAccount";s:0:"";s:10:"DHLEnabled";N;s:10:"DHLAccount";s:0:"";s:11:"DHLInvoiced";N;s:10:"USPEnabled";N;s:10:"USPAccount";s:0:"";s:11:"USPInvoiced";N;s:10:"ARBEnabled";N;s:10:"ARBAccount";s:0:"";s:11:"ARBInvoiced";N;s:10:"1DYEnabled";N;s:10:"2DYEnabled";N;s:10:"3DYEnabled";N;s:10:"GNDEnabled";N;s:10:"ShipMethod";N;}', 'USPS' ) ;
+
+DELETE FROM SystemCache WHERE VarName = 'config_files';
+
+INSERT INTO ImportScripts VALUES (DEFAULT, 'Products from CSV file [In-Commerce]', '', 'p', 'In-Commerce', '', 'CSV', '1');
+
+INSERT INTO ItemFilters VALUES
+	(DEFAULT, 'p', 'ManufacturerId', 'checkbox', 1, NULL),
+	(DEFAULT, 'p', 'Price', 'range', 1, 10),
+	(DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL);
+
+INSERT INTO Modules VALUES ('In-Commerce', 'modules/in-commerce/', 'InPortal\\Modules\\InCommerce', 'p', DEFAULT, 1, 4, 'in-commerce/', 2, NULL, NULL);

Property changes on: releases/5.2.2-B2/install/install_data.sql
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.9
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/gw_notify.php
===================================================================
--- releases/5.2.2-B2/gw_notify.php	(revision 0)
+++ releases/5.2.2-B2/gw_notify.php	(revision 16630)
@@ -0,0 +1,63 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+	define('GW_NOTIFY', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+
+	$application =& kApplication::Instance();
+	$application->Init();
+
+
+	// for debugging payment gateway notifications, don't remove
+	/*$fh = fopen((defined('RESTRICTED') ? RESTRICTED : WRITEABLE) . '/gw.log', 'a');
+	fwrite ($fh, "\n\n".date('d/m/y h:i:s').":\n");
+	foreach ($_REQUEST as $key => $val) {
+		fwrite($fh, "<input type=\"text\" name=\"$key\" value=\"$val\">\n");
+	}
+	fclose($fh);*/
+
+
+	$db =& $application->GetADODBConnection();
+
+	$application->setUnitOption('ord','AutoLoad',false);
+	$order = $application->recallObject('ord');
+
+	$order_id = $application->GetVar('order_id');
+	if ($order_id) {
+		$order->Load($order_id);
+	}
+
+	$gw_data = $order->getGatewayData($application->GetVar('payment_type_id'));
+	$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
+	$gateway_object = $application->recallObject( $gw_data['ClassName'] );
+
+	$transaction_status = $gateway_object->processNotification($gw_data['gw_params']);
+
+	$sql = 'UPDATE %s SET GWResult1 = %s WHERE %s = %s';
+	$sql = sprintf($sql, $order->TableName, $db->qstr($gateway_object->getGWResponce()), $order->IDField, $order->GetID() );
+	$db->Query($sql);
+	$order->SetDBField('GWResult1', $gateway_object->getGWResponce() );
+
+	$sql = 'UPDATE %s SET TransactionStatus = %s WHERE %s = %s';
+	$db->Query( sprintf($sql, $order->TableName, $transaction_status, $order->IDField, $order->GetID()) );
+	$order->SetDBField('TransactionStatus', $transaction_status);
+
+	if($transaction_status == 1)
+	{
+		$application->HandleEvent(new kEvent('ord:OnCompleteOrder'));
+	}
+	else {
+		$application->StoreVar('gw_error', $gateway_object->getErrorMsg());
+	}
+
+	$application->Done();
\ No newline at end of file

Property changes on: releases/5.2.2-B2/gw_notify.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.8
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF

Index: releases/5.2.2-B2/install.php
===================================================================
--- releases/5.2.2-B2/install.php	(revision 0)
+++ releases/5.2.2-B2/install.php	(revision 16630)
@@ -0,0 +1,58 @@
+<?php
+/**
+* @version	$Id$
+* @package	In-Commerce
+* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @license	Commercial License
+* This software is protected by copyright law and international treaties.
+* Unauthorized reproduction or unlicensed usage of the code of this program,
+* or any portion of it may result in severe civil and criminal penalties,
+* and will be prosecuted to the maximum extent possible under the law
+* See http://www.in-portal.org/commercial-license for copyright notices and details.
+*/
+$module_folder = 'modules/in-commerce';
+
+if ( !defined('IS_INSTALL') ) {
+	// separate module install
+	define('IS_INSTALL', 1);
+	define('ADMIN', 1);
+	define('FULL_PATH', realpath(dirname(__FILE__) . '/../..'));
+
+	include_once(FULL_PATH . '/core/kernel/startup.php');
+	require_once FULL_PATH . '/core/install/install_toolkit.php';
+
+	$constants_file = FULL_PATH . '/' . $module_folder . '/constants.php';
+
+	if ( file_exists($constants_file) ) {
+		require_once $constants_file;
+	}
+
+	$toolkit = new kInstallToolkit();
+}
+else {
+	// install, using installation wizard
+	/** @var kInstallToolkit $toolkit */
+	$toolkit =& $this->toolkit;
+}
+
+$application =& kApplication::Instance();
+$application->Init();
+
+if ( $application->RecallVar('user_id') != USER_ROOT ) {
+	die('restricted access!');
+}
+
+$category =& $toolkit->createModuleCategory('Products', 'Product Catalog', '#in-commerce/section_design#', 'in-commerce/img/menu_products.gif');
+
+$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql');
+$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{ProductCatId}', $category->GetID());
+$toolkit->ImportLanguage('/' . $module_folder . '/install/english', isset($constants_file));
+
+$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
+
+$toolkit->linkCustomFields(basename($module_folder), 'p', 11); // to create Custom Fields for Products
+$toolkit->linkCustomFields('KERNEL', 'u', 6); // to create shipping related Custom Fields for Users
+$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
+$toolkit->setModuleItemTemplate($category, 'p', '#in-commerce/item_design#');
+
+$toolkit->finalizeModuleInstall($module_folder, true);

Property changes on: releases/5.2.2-B2/install.php
___________________________________________________________________
Added: cvs2svn:cvs-rev
   + 1.1.2.2
Added: svn:keywords
   + Id
Added: svn:eol-style
   + LF


Property changes on: releases/5.2.2-B2
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:eol-style=LF;svn:keywords=Id
*.tpl = svn:eol-style=LF
*.sql = svn:eol-style=LF
*.lang = svn:eol-style=LF
*.sh = svn:eol-style=LF;svn:executable
*.txt = svn:eol-style=LF
*.html = svn:eol-style=LF
*.htm = svn:eol-style=LF
*.css = svn:eol-style=LF
*.js = svn:eol-style=LF
*.xml = svn:eol-style=LF
.htaccess = svn:eol-style=LF
.smsignore = svn:eol-style=LF
COPYRIGHT = svn:eol-style=LF
CREDITS = svn:eol-style=LF
INSTALL = svn:eol-style=LF
LICENSE = svn:eol-style=LF
LICENSES = svn:eol-style=LF
README = svn:eol-style=LF
Added: bugtraq:url
   + http://tracker.in-portal.org/view.php?id=%BUGID%
Added: bugtraq:logregex
   + (?:[Bb]ugs?|[Ii]ssues?|[Rr]eports?|[Ff]ixe?s?|[Rr]esolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+
(\d+)
Added: bugtraq:warnifnoissue
   + false
Added: svn:mergeinfo
   Merged /w/in-commerce/branches/5.0.x:r12674-13730
   Merged /in-commerce/releases/5.0.1:r12621-12653
   Merged /w/in-commerce/branches/5.1.x:r13845-14551
   Merged /w/in-commerce/branches/5.3.x:r15656,15971,16217,16227
   Merged /w/in-commerce/releases/5.0.2:r13081-13099
   Merged /w/in-commerce/releases/5.1.1:r14076-14088
   Merged /w/in-commerce/releases/5.0.3:r13510-13548
   Merged /w/in-commerce/releases/5.1.2:r14312-14568
   Merged /in-commerce/branches/5.0.x:r12121-12673
   Merged /w/in-commerce/releases/5.0.4:r13731-13744
   Merged /w/in-commerce/releases/5.1.3:r14552-14581