Mage_Core_Modules - Version 1.8.1.0

Version Notes

1.8.1.0

Release Info

Developer	Magento Core Team
Extension	Mage_Core_Modules
Version	1.8.1.0
Comparing to
See all releases

Code changes from version 1.8.0.0 to 1.8.1.0

Files changed (181) hide show

app/Mage.php +2 -1
app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +4 -2
app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +59 -8
app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +12 -10
app/code/core/Mage/Bundle/Model/Product/Price.php +133 -68
app/code/core/Mage/Catalog/Block/Product/Abstract.php +23 -7
app/code/core/Mage/Catalog/Block/Product/Price.php +42 -1
app/code/core/Mage/Catalog/Block/Product/View.php +9 -2
app/code/core/Mage/Catalog/Helper/Product/Compare.php +2 -1
app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +2 -1
app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +3 -3
app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +6 -10
app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +1 -1
app/code/core/Mage/Catalog/controllers/Product/CompareController.php +5 -0
app/code/core/Mage/Catalog/etc/wsi.xml +2 -2
app/code/core/Mage/CatalogInventory/Model/Observer.php +18 -8
app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +1 -1
app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +3 -1
app/code/core/Mage/CatalogSearch/Helper/Data.php +19 -2
app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +4 -1
app/code/core/Mage/Checkout/Helper/Data.php +55 -29
app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +11 -12
app/code/core/Mage/Checkout/controllers/CartController.php +5 -0
app/code/core/Mage/Checkout/controllers/MultishippingController.php +30 -6
app/code/core/Mage/Cms/Model/Resource/Page.php +3 -0
app/code/core/Mage/Cms/Model/Resource/Page/Service.php +3 -2
app/code/core/Mage/{GoogleCheckout/Block/Form.php → Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php} +13 -20
app/code/core/Mage/Cms/etc/config.xml +1 -1
app/code/core/Mage/Core/Block/Abstract.php +65 -32
app/code/core/Mage/Core/Helper/Cookie.php +15 -0
app/code/core/Mage/Core/Model/Design/Package.php +3 -0
app/code/core/Mage/Core/Model/Locale.php +23 -4
app/code/core/Mage/Core/Model/Resource/Design.php +20 -30
app/code/core/Mage/Core/Model/Store.php +57 -5
app/code/core/Mage/Core/etc/config.xml +1 -1
app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php → Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php} +12 -7
app/code/core/Mage/Customer/Helper/Address.php +1 -1
app/code/core/Mage/Customer/Model/Address/Abstract.php +58 -10
app/code/core/Mage/Customer/controllers/AccountController.php +6 -2
app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.3-0.7.4.php → Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php} +12 -9
app/code/core/Mage/Customer/etc/config.xml +1 -1
app/code/core/Mage/Customer/etc/wsdl.xml +6 -0
app/code/core/Mage/Customer/etc/wsi.xml +6 -0
app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php +82 -0
app/code/core/Mage/Directory/Model/Currency.php +72 -23
app/code/core/Mage/Directory/Model/Resource/Region/Collection.php +1 -1
app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php → Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php} +27 -14
app/code/core/Mage/{GoogleCheckout/Model/Resource/Api/Debug.php → Eav/Model/Attribute/Data/Datetime.php} +29 -7
app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php +29 -2
app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +2 -2
app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php +2 -2
app/code/core/Mage/Eav/etc/config.xml +1 -1
app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php → Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php} +7 -5
app/code/core/Mage/GoogleAnalytics/Block/Ga.php +14 -1
app/code/core/Mage/GoogleAnalytics/Helper/Data.php +14 -2
app/code/core/Mage/GoogleAnalytics/Model/Observer.php +0 -39
app/code/core/Mage/GoogleAnalytics/etc/config.xml +0 -8
app/code/core/Mage/GoogleAnalytics/etc/system.xml +9 -0
app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php +0 -65
app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php +0 -181
app/code/core/Mage/GoogleCheckout/Block/Link.php +0 -108
app/code/core/Mage/GoogleCheckout/Exception.php +0 -30
app/code/core/Mage/GoogleCheckout/Helper/Data.php +0 -192
app/code/core/Mage/GoogleCheckout/Model/Api.php +0 -233
app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php +0 -52
app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php +0 -245
app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php +0 -1107
app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php +0 -1143
app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php +0 -181
app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php +0 -38
app/code/core/Mage/GoogleCheckout/Model/Mysql4/Notification.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Notification.php +0 -129
app/code/core/Mage/GoogleCheckout/Model/Observer.php +0 -105
app/code/core/Mage/GoogleCheckout/Model/Payment.php +31 -85
app/code/core/Mage/GoogleCheckout/Model/Resource/Notification.php +0 -109
app/code/core/Mage/GoogleCheckout/Model/Resource/Setup.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Resource/Tax.php +0 -76
app/code/core/Mage/GoogleCheckout/Model/Shipping.php +0 -76
app/code/core/Mage/GoogleCheckout/Model/Source/Checkout/Image.php +0 -55
app/code/core/Mage/GoogleCheckout/Model/Source/Locale.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Carrier.php +0 -59
app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Category.php +0 -37
app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Units.php +0 -36
app/code/core/Mage/GoogleCheckout/Model/Source/Shipping/Virtual/Method.php +0 -38
app/code/core/Mage/GoogleCheckout/controllers/ApiController.php +0 -44
app/code/core/Mage/GoogleCheckout/controllers/RedirectController.php +0 -181
app/code/core/Mage/GoogleCheckout/etc/adminhtml.xml +0 -48
app/code/core/Mage/GoogleCheckout/etc/config.xml +0 -136
app/code/core/Mage/GoogleCheckout/etc/system.xml +0 -483
app/code/core/Mage/GoogleCheckout/etc/wsdl.xml +0 -15
app/code/core/Mage/GoogleCheckout/etc/wsi.xml +0 -18
app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/install-1.6.0.0.php +0 -83
app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.0-0.7.1.php +0 -64
app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.1-0.7.2.php +0 -46
app/code/core/Mage/GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +0 -62
app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +0 -1
app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +155 -6
app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php +19 -13
app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php +10 -0
app/code/core/Mage/Oauth/Model/Server.php +0 -2
app/code/core/Mage/Page/Block/Html/Breadcrumbs.php +27 -2
app/code/core/Mage/{GoogleCheckout/Block/Redirect.php → Page/Block/Html/CookieNotice.php} +17 -17
app/code/core/Mage/Page/Block/Template/Links.php +19 -2
app/code/core/Mage/Payment/Model/Method/Abstract.php +11 -0
app/code/core/Mage/Payment/Model/Observer.php +50 -1
app/code/core/Mage/Payment/etc/config.xml +10 -2
app/code/core/Mage/Paypal/Model/Api/Nvp.php +43 -2
app/code/core/Mage/Paypal/Model/Cart.php +15 -0
app/code/core/Mage/Paypal/Model/Method/Agreement.php +4 -2
app/code/core/Mage/Paypal/controllers/IpnController.php +1 -0
app/code/core/Mage/{GoogleCheckout/Model/Resource/Api/Debug/Collection.php → PaypalUk/Model/Api/Express/Nvp.php} +13 -12
app/code/core/Mage/PaypalUk/Model/Api/Nvp.php +53 -1
app/code/core/Mage/PaypalUk/Model/Express.php +3 -2
app/code/core/Mage/PaypalUk/Model/Express/Checkout.php +1 -1
app/code/core/Mage/{GoogleCheckout/Model/Api/Xml/Calculate.php → PaypalUk/Model/Express/Pro.php} +9 -7
app/code/core/Mage/Persistent/Model/Observer.php +2 -4
app/code/core/Mage/Persistent/controllers/IndexController.php +1 -1
app/code/core/Mage/Persistent/etc/config.xml +0 -8
app/code/core/Mage/ProductAlert/Block/Email/Abstract.php +15 -0
app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php +33 -3
app/code/core/Mage/Review/controllers/ProductController.php +6 -0
app/code/core/Mage/Sales/Block/Guest/Links.php +2 -2
app/code/core/Mage/Sales/Helper/Guest.php +4 -4
app/code/core/Mage/Sales/Model/Order.php +26 -17
app/code/core/Mage/Sales/Model/Order/Config.php +34 -3
app/code/core/Mage/Sales/Model/Order/Creditmemo.php +15 -0
app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +3 -3
app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +2 -1
app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +19 -8
app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +12 -2
app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +7 -2
app/code/core/Mage/Sales/Model/Order/Item.php +40 -0
app/code/core/Mage/Sales/Model/Order/Payment.php +9 -2
app/code/core/Mage/Sales/Model/Order/Shipment.php +2 -1
app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +10 -1
app/code/core/Mage/Sales/Model/Quote/Item.php +41 -37
app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php +21 -5
app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php +14 -0
app/code/core/Mage/Sales/etc/config.xml +0 -7
app/code/core/Mage/Sales/etc/widget.xml +5 -0
app/code/core/Mage/SalesRule/Model/Validator.php +138 -65
app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +70 -16
app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php +36 -0
app/code/core/Mage/Tax/Block/Checkout/Tax.php +6 -3
app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +13 -4
app/code/core/Mage/Tax/Helper/Data.php +164 -66
app/code/core/Mage/Tax/Model/Calculation.php +178 -33
app/code/core/Mage/Tax/Model/Calculation/Rate.php +33 -2
app/code/core/Mage/Tax/Model/Calculation/Rule.php +70 -1
app/code/core/Mage/Tax/Model/Config.php +28 -19
app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php +26 -0
app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +24 -14
app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +337 -245
app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +796 -420
app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php +26 -6
app/code/core/Mage/Tax/etc/config.xml +1 -1
app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +0 -4
app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php +0 -8
app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php +2 -2
app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php +6 -6
app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +8 -2
app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +7 -7
app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +105 -20
app/code/core/Mage/Weee/Helper/Data.php +292 -17
app/code/core/Mage/{GoogleCheckout/Model/Source/Shipping/Virtual/Schedule.php → Weee/Model/Config/Source/Fpt/Tax.php} +24 -6
app/code/core/Mage/Weee/Model/Observer.php +68 -25
app/code/core/Mage/Weee/Model/Tax.php +75 -7
app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +33 -8
app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +13 -0
app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +135 -43
app/code/core/Mage/Weee/etc/config.xml +18 -3
app/code/core/Mage/Weee/etc/system.xml +2 -2
app/code/core/Mage/Wishlist/Controller/Abstract.php +17 -4
app/code/core/Mage/Wishlist/Helper/Data.php +1 -1
cron.php +3 -0
errors/design.xml +5 -5
package.xml +5 -5

app/Mage.php CHANGED Viewed

	@@ -39,6 +39,7 @@ if (defined('COMPILER_INCLUDE_PATH')) {
39	/**
40	* Set include path
41	*/

42	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'local';
43	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'community';
44	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'core';
	@@ -169,7 +170,7 @@ final class Mage
169	return array(
170	'major' => '1',
171	'minor' => '8',
172	- 'revision' => '0',
173	'patch' => '0',
174	'stability' => '',
175	'number' => '',


39	/**
40	* Set include path
41	*/
42	+ $paths = array();
43	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'local';
44	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'community';
45	$paths[] = BP . DS . 'app' . DS . 'code' . DS . 'core';

170	return array(
171	'major' => '1',
172	'minor' => '8',
173	+ 'revision' => '1',
174	'patch' => '0',
175	'stability' => '',
176	'number' => '',

app/code/core/Mage/Api/Model/Server/Adapter/Soap.php CHANGED Viewed

	@@ -208,12 +208,14 @@ class Mage_Api_Model_Server_Adapter_Soap
208	? $urlModel->getUrl('//*', array('_current' => true, '_query' => $params))
209	: $urlModel->getUrl('//*');
210
211	- if( $withAuth ) {
212	$phpAuthUser = $this->getController()->getRequest()->getServer('PHP_AUTH_USER', false);
213	$phpAuthPw = $this->getController()->getRequest()->getServer('PHP_AUTH_PW', false);

214
215	if ($phpAuthUser && $phpAuthPw) {
216	- $wsdlUrl = sprintf("~~http~~://%s:%s@%s", $phpAuthUser, $phpAuthPw, ~~str_replace('http://', '', $wsdlUrl ));~~

217	}
218	}
219


208	? $urlModel->getUrl('//*', array('_current' => true, '_query' => $params))
209	: $urlModel->getUrl('//*');
210
211	+ if ( $withAuth ) {
212	$phpAuthUser = $this->getController()->getRequest()->getServer('PHP_AUTH_USER', false);
213	$phpAuthPw = $this->getController()->getRequest()->getServer('PHP_AUTH_PW', false);
214	+ $scheme = $this->getController()->getRequest()->getScheme();
215
216	if ($phpAuthUser && $phpAuthPw) {
217	+ $wsdlUrl = sprintf("%s://%s:%s@%s", $scheme, $phpAuthUser, $phpAuthPw,
218	+ str_replace($scheme . '://', '', $wsdlUrl));
219	}
220	}
221

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php CHANGED Viewed

	@@ -34,7 +34,18 @@
34	*/
35	class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract
36	{





37	protected $_optionRenderers = array();






38	protected $_options = null;
39
40	/**
	@@ -44,6 +55,18 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
44	*/
45	protected $_mapRenderer = 'msrp_item';
46












47	public function getOptions()
48	{
49	if (!$this->_options) {
	@@ -66,6 +89,11 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
66	return $this->_options;
67	}
68





69	public function hasOptions()
70	{
71	$this->getOptions();
	@@ -92,7 +120,8 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
92	/* @var $bundlePriceModel Mage_Bundle_Model_Product_Price */
93	$bundlePriceModel = Mage::getModel('bundle/product_price');
94
95	- ~~if (~~$preConfiguredFlag = $currentProduct->hasPreconfiguredValues()~~) {~~

96	$preConfiguredValues = $currentProduct->getPreconfiguredValues();
97	$defaultValues = array();
98	}
	@@ -122,9 +151,15 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
122	// recalculate currency
123	$tierPrices = $_selection->getTierPrice();
124	foreach ($tierPrices as &$tierPriceInfo) {




125	$tierPriceInfo['price'] = $coreHelper->currency($tierPriceInfo['price'], false, false);
126	- $tierPriceInfo['priceInclTax'] = $taxHelper->getPrice($_selection, $tierPriceInfo['price'], true);
127	- ~~$tierPriceInfo['priceExclTax']~~ = ~~$taxHelper->getPrice($_selection~~, ~~$tierPriceInfo['price']~~);


128	}
129	unset($tierPriceInfo); // break the reference with the last element
130
	@@ -137,12 +172,16 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
137	/* @var $taxHelper Mage_Tax_Helper_Data */
138	$taxHelper = Mage::helper('tax');
139
140	- $_priceInclTax = $taxHelper->getPrice($_selection, $itemPrice, true);
141	- ~~$_priceExclTax~~ = ~~$taxHelper->getPrice($_selection~~, ~~$itemPrice~~);


142
143	if ($currentProduct->getPriceType() == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
144	- $_priceInclTax = $taxHelper->getPrice($currentProduct, $itemPrice, true);
145	- ~~$_priceExclTax~~ = ~~$taxHelper->getPrice($currentProduct~~, ~~$itemPrice~~);


146	}
147
148	$selection = array (
	@@ -158,7 +197,7 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
158	'plusDisposition' => 0,
159	'minusDisposition' => 0,
160	'canApplyMAP' => $canApplyMAP,
161	- 'tierPriceHtml' => $this->getTierPriceHtml($_selection),
162	);
163
164	$responseObject = new Varien_Object();
	@@ -208,11 +247,23 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Bl
208	return $coreHelper->jsonEncode($config);
209	}
210






211	public function addRenderer($type, $block)
212	{
213	$this->_optionRenderers[$type] = $block;
214	}
215






216	public function getOptionHtml($option)
217	{
218	if (!isset($this->_optionRenderers[$option->getType()])) {


34	*/
35	class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle extends Mage_Catalog_Block_Product_View_Abstract
36	{
37	+ /**
38	+ * Renderers for bundle product options
39	+ *
40	+ * @var array
41	+ */
42	protected $_optionRenderers = array();
43	+
44	+ /**
45	+ * Bundle product options
46	+ *
47	+ * @var array
48	+ */
49	protected $_options = null;
50
51	/**

55	*/
56	protected $_mapRenderer = 'msrp_item';
57
58	+ /**
59	+ * Tier price template
60	+ *
61	+ * @var string
62	+ */
63	+ protected $_tierPriceDefaultTemplate = 'bundle/catalog/product/view/option_tierprices.phtml';
64	+
65	+ /**
66	+ * Return an array of bundle product options
67	+ *
68	+ * @return array
69	+ */
70	public function getOptions()
71	{
72	if (!$this->_options) {

89	return $this->_options;
90	}
91
92	+ /**
93	+ * Whether the bundle product has any option
94	+ *
95	+ * @return boolean
96	+ */
97	public function hasOptions()
98	{
99	$this->getOptions();

120	/* @var $bundlePriceModel Mage_Bundle_Model_Product_Price */
121	$bundlePriceModel = Mage::getModel('bundle/product_price');
122
123	+ $preConfiguredFlag = $currentProduct->hasPreconfiguredValues();
124	+ if ($preConfiguredFlag) {
125	$preConfiguredValues = $currentProduct->getPreconfiguredValues();
126	$defaultValues = array();
127	}

151	// recalculate currency
152	$tierPrices = $_selection->getTierPrice();
153	foreach ($tierPrices as &$tierPriceInfo) {
154	+ $tierPriceInfo['price'] =
155	+ $bundlePriceModel->getLowestPrice($currentProduct, $tierPriceInfo['price']);
156	+ $tierPriceInfo['website_price'] =
157	+ $bundlePriceModel->getLowestPrice($currentProduct, $tierPriceInfo['website_price']);
158	$tierPriceInfo['price'] = $coreHelper->currency($tierPriceInfo['price'], false, false);
159	+ $tierPriceInfo['priceInclTax'] = $taxHelper->getPrice($_selection, $tierPriceInfo['price'], true,
160	+ null, null, null, null, null, false);
161	+ $tierPriceInfo['priceExclTax'] = $taxHelper->getPrice($_selection, $tierPriceInfo['price'], false,
162	+ null, null, null, null, null, false);
163	}
164	unset($tierPriceInfo); // break the reference with the last element
165

172	/* @var $taxHelper Mage_Tax_Helper_Data */
173	$taxHelper = Mage::helper('tax');
174
175	+ $_priceInclTax = $taxHelper->getPrice($_selection, $itemPrice, true,
176	+ null, null, null, null, null, false);
177	+ $_priceExclTax = $taxHelper->getPrice($_selection, $itemPrice, false,
178	+ null, null, null, null, null, false);
179
180	if ($currentProduct->getPriceType() == Mage_Bundle_Model_Product_Price::PRICE_TYPE_FIXED) {
181	+ $_priceInclTax = $taxHelper->getPrice($currentProduct, $itemPrice, true,
182	+ null, null, null, null, null, false);
183	+ $_priceExclTax = $taxHelper->getPrice($currentProduct, $itemPrice, false,
184	+ null, null, null, null, null, false);
185	}
186
187	$selection = array (

197	'plusDisposition' => 0,
198	'minusDisposition' => 0,
199	'canApplyMAP' => $canApplyMAP,
200	+ 'tierPriceHtml' => $this->getTierPriceHtml($_selection, $currentProduct),
201	);
202
203	$responseObject = new Varien_Object();

247	return $coreHelper->jsonEncode($config);
248	}
249
250	+ /**
251	+ * Add renderer for an option type, e.g., select, radio button, etc.
252	+ *
253	+ * @param string $type
254	+ * @param string $block
255	+ */
256	public function addRenderer($type, $block)
257	{
258	$this->_optionRenderers[$type] = $block;
259	}
260
261	+ /**
262	+ * Get option html
263	+ *
264	+ * @param Mage_Catalog_Model_Product_Option $option
265	+ * @return string
266	+ */
267	public function getOptionHtml($option)
268	{
269	if (!isset($this->_optionRenderers[$option->getType()])) {

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php CHANGED Viewed

	@@ -81,17 +81,17 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option extends Mage_Bun
81	->getData('bundle_option_qty/' . $_option->getId());
82
83	if (empty($selectedOptions) && $_default) {
84	- $_defaultQty = $_default->getSelectionQty()*1;
85	$_canChangeQty = $_default->getSelectionCanChangeQty();
86	} elseif (!$inPreConfigured && $selectedOptions && is_numeric($selectedOptions)) {
87	$selectedSelection = $_option->getSelectionById($selectedOptions);
88	- $_defaultQty = $selectedSelection->getSelectionQty()*1;
89	$_canChangeQty = $selectedSelection->getSelectionCanChangeQty();
90	} elseif (!$this->_showSingle() \|\| $inPreConfigured) {
91	$_defaultQty = $this->_getSelectedQty();
92	$_canChangeQty = (bool)$_defaultQty;
93	} else {
94	- $_defaultQty = $_selections[0]->getSelectionQty()*1;
95	$_canChangeQty = $_selections[0]->getSelectionCanChangeQty();
96	}
97
	@@ -176,17 +176,24 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option extends Mage_Bun
176	return $this->getData('product');
177	}
178







179	public function getSelectionQtyTitlePrice($_selection, $includeContainer = true)
180	{
181	$price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice($this->getProduct(), $_selection);
182	$this->setFormatProduct($_selection);
183	- $priceTitle = $_selection->getSelectionQty()*1 . ' x ' . $this->escapeHtml($_selection->getName());
184
185	$priceTitle .= '   ' . ($includeContainer ? '<span class="price-notice">' : '')
186	. '+' . $this->formatPriceString($price, $includeContainer)
187	. ($includeContainer ? '</span>' : '');
188
189	- return $priceTitle;
190	}
191
192	/**
	@@ -218,11 +225,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option extends Mage_Bun
218	public function getSelectionTitlePrice($_selection, $includeContainer = true)
219	{
220	$price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice($this->getProduct(), $_selection, 1);
221	- $tierPrice = $_selection->getTierPrice();
222	- if (!empty($tierPrice)) {
223	- $qty = $_selection->getSelectionQty();
224	- $price = $qty * (float) $_selection->getPriceModel()->getTierPrice($qty, $_selection);
225	- }
226	$this->setFormatProduct($_selection);
227	$priceTitle = $this->escapeHtml($_selection->getName());
228	$priceTitle .= '   ' . ($includeContainer ? '<span class="price-notice">' : '')


81	->getData('bundle_option_qty/' . $_option->getId());
82
83	if (empty($selectedOptions) && $_default) {
84	+ $_defaultQty = $_default->getSelectionQty() * 1;
85	$_canChangeQty = $_default->getSelectionCanChangeQty();
86	} elseif (!$inPreConfigured && $selectedOptions && is_numeric($selectedOptions)) {
87	$selectedSelection = $_option->getSelectionById($selectedOptions);
88	+ $_defaultQty = $selectedSelection->getSelectionQty() * 1;
89	$_canChangeQty = $selectedSelection->getSelectionCanChangeQty();
90	} elseif (!$this->_showSingle() \|\| $inPreConfigured) {
91	$_defaultQty = $this->_getSelectedQty();
92	$_canChangeQty = (bool)$_defaultQty;
93	} else {
94	+ $_defaultQty = $_selections[0]->getSelectionQty() * 1;
95	$_canChangeQty = $_selections[0]->getSelectionCanChangeQty();
96	}
97

176	return $this->getData('product');
177	}
178
179	+ /**
180	+ * Returns the formatted string for the quantity chosen for the given selection
181	+ *
182	+ * @param Mage_Catalog_Model_Proudct $_selection
183	+ * @param bool $includeContainer
184	+ * @return string
185	+ */
186	public function getSelectionQtyTitlePrice($_selection, $includeContainer = true)
187	{
188	$price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice($this->getProduct(), $_selection);
189	$this->setFormatProduct($_selection);
190	+ $priceTitle = $_selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($_selection->getName());
191
192	$priceTitle .= '   ' . ($includeContainer ? '<span class="price-notice">' : '')
193	. '+' . $this->formatPriceString($price, $includeContainer)
194	. ($includeContainer ? '</span>' : '');
195
196	+ return $priceTitle;
197	}
198
199	/**

225	public function getSelectionTitlePrice($_selection, $includeContainer = true)
226	{
227	$price = $this->getProduct()->getPriceModel()->getSelectionPreFinalPrice($this->getProduct(), $_selection, 1);





228	$this->setFormatProduct($_selection);
229	$priceTitle = $this->escapeHtml($_selection->getName());
230	$priceTitle .= '   ' . ($includeContainer ? '<span class="price-notice">' : '')

app/code/core/Mage/Bundle/Model/Product/Price.php CHANGED Viewed

	@@ -36,12 +36,12 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
36	/**
37	* Fixed price type
38	*/
39	- const PRICE_TYPE_FIXED = 1;
40
41	/**
42	* Dynamic price type
43	*/
44	- const PRICE_TYPE_DYNAMIC = 0;
45
46	/**
47	* Flag which indicates - is min/max prices have been calculated by index
	@@ -112,7 +112,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
112	/**
113	* Get product final price
114	*
115	- * @param double $qty
116	* @param Mage_Catalog_Model_Product $product
117	* @return double
118	*/
	@@ -138,9 +138,9 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
138	* Returns final price of a child product
139	*
140	* @param Mage_Catalog_Model_Product $product
141	- * @param float $productQty
142	* @param Mage_Catalog_Model_Product $childProduct
143	- * @param float $childProductQty
144	* @return decimal
145	*/
146	public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
	@@ -155,7 +155,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
155	* @see Mage_Bundle_Model_Product_Price::getTotalPrices()
156	*
157	* @param Mage_Catalog_Model_Product $product
158	- * @param string $which
159	* @return decimal\|array
160	*/
161	public function getPrices($product, $which = null)
	@@ -170,8 +170,8 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
170	* @see Mage_Bundle_Model_Product_Price::getTotalPrices()
171	*
172	* @param Mage_Catalog_Model_Product $product
173	- * @param string $which
174	- * @param bool\|null $includeTax
175	* @return decimal\|array
176	*/
177	public function getPricesDependingOnTax($product, $which = null, $includeTax = null)
	@@ -183,9 +183,9 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
183	* Retrieve Price considering tier price
184	*
185	* @param Mage_Catalog_Model_Product $product
186	- * @param string\|null $which
187	- * @param bool\|null $includeTax
188	- * @param bool $takeTierPrice
189	* @return decimal\|array
190	*/
191	public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)
	@@ -195,15 +195,18 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
195	$taxHelper = $this->_getHelperData('tax');
196
197	if ($this->_isPricesCalculatedByIndex && !$includeTax) {
198	- $minimalPrice = $taxHelper->getPrice($product, $product->getData('min_price'), $includeTax);
199	- ~~$maximalPrice~~ = ~~$taxHelper->getPrice($product~~, ~~$product->getData('max_price')~~, ~~$includeTax~~);


200	} else {
201	/**
202	* Check if product price is fixed
203	*/
204	$finalPrice = $product->getFinalPrice();
205	if ($isPriceFixedType) {
206	- $minimalPrice = $maximalPrice = $taxHelper->getPrice($product, $finalPrice, $includeTax);

207	} else { // PRICE_TYPE_DYNAMIC
208	$minimalPrice = $maximalPrice = 0;
209	}
	@@ -227,6 +230,9 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
227	}
228	}
229



230	if ('max' == $which) {
231	return $maximalPrice;
232	} elseif ('min' == $which) {
	@@ -248,8 +254,10 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
248	{
249	$options = $this->getOptions($product);
250	$minimalPrice = 0;

251	$hasRequiredOptions = $this->_hasRequiredOptions($product);
252	$selectionMinimalPrices = array();

253
254	if (!$options) {
255	return $minimalPrice;
	@@ -257,20 +265,41 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
257
258	foreach ($options as $option) {
259	/* @var $option Mage_Bundle_Model_Option */
260	- $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);

261
262	if (count($selectionPrices)) {
263	- $selectionMinPrice = min($selectionPrices);


264	if ($option->getRequired()) {
265	$minimalPrice += $selectionMinPrice;

266	} elseif (!$hasRequiredOptions) {
267	$selectionMinimalPrices[] = $selectionMinPrice;

268	}
269	}
270	}
271	// condition is TRUE when all product options are NOT required
272	if (!$hasRequiredOptions) {
273	$minimalPrice = min($selectionMinimalPrices);
















274	}
275	return $minimalPrice;
276	}
	@@ -316,6 +345,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
316	{
317	$selectionPrices = array();
318	$taxHelper = $this->_getHelperData('tax');

319	$isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
320
321	$selections = $option->getSelections();
	@@ -334,11 +364,20 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
334
335	$item = $isPriceFixedType ? $product : $selection;
336
337	- $~~selectionPrices[]~~ = $~~taxHelper~~->~~getPrice~~(
338	- $~~item~~,
339	- $~~this->getSelectionFinalTotalPrice($product,~~ $selection~~, 1, null, true, $takeTierPrice~~),
340	- $~~includeTax~~
341	- );









342	}
343	return $selectionPrices;
344	}
	@@ -396,8 +435,8 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
396	*
397	* @param Mage_Catalog_Model_Product $bundleProduct
398	* @param Mage_Catalog_Model_Product $selectionProduct
399	- * @param float\|null $selectionQty
400	- * @param null\|bool $multiplyQty Whether to multiply selection's price by its quantity
401	* @return float
402	*/
403	public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQty = null, $multiplyQty = true)
	@@ -410,7 +449,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
410	*
411	* @param Mage_Catalog_Model_Product $bundleProduct
412	* @param Mage_Catalog_Model_Product $selectionProduct
413	- * @param decimal $qty
414	* @return decimal
415	*/
416	public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
	@@ -426,13 +465,13 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
426	*
427	* @param Mage_Catalog_Model_Product $bundleProduct
428	* @param Mage_Catalog_Model_Product $selectionProduct
429	- * @param decimal $bundleQty
430	- * @param decimal $selectionQty
431	- * @param bool $multiplyQty
432	* @return decimal
433	*/
434	public function getSelectionFinalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty = null,
435	- $multiplyQty = true)
436	{
437	return $this->getSelectionFinalTotalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty,
438	$multiplyQty);
	@@ -444,14 +483,14 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
444	*
445	* @param Mage_Catalog_Model_Product $bundleProduct
446	* @param Mage_Catalog_Model_Product $selectionProduct
447	- * @param ~~decimal~~ $bundleQty
448	- * @param ~~decimal~~ $selectionQty
449	- * @param bool $multiplyQty
450	- * @param bool $takeTierPrice
451	- * @return ~~decimal~~
452	*/
453	public function getSelectionFinalTotalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty,
454	- $multiplyQty = true, $takeTierPrice = true)
455	{
456	if (is_null($selectionQty)) {
457	$selectionQty = $selectionProduct->getSelectionQty();
	@@ -474,11 +513,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
474	}
475	}
476
477	- $price = ~~min~~($price,
478	- $this->_applyGroupPrice($bundleProduct, $price),
479	- $this->_applyTierPrice($bundleProduct, $bundleQty, $price),
480	- $this->_applySpecialPrice($bundleProduct, $price)
481	- );
482
483	if ($multiplyQty) {
484	$price *= $selectionQty;
	@@ -487,6 +522,24 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
487	return $price;
488	}
489


















490	/**
491	* Apply group price for bundle product
492	*
	@@ -501,6 +554,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
501
502	if (is_numeric($groupPrice)) {
503	$groupPrice = $finalPrice - ($finalPrice * ($groupPrice / 100));

504	$result = min($finalPrice, $groupPrice);
505	}
506
	@@ -547,8 +601,8 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
547	* Apply tier price for bundle
548	*
549	* @param Mage_Catalog_Model_Product $product
550	- * @param decimal $qty
551	- * @param decimal $finalPrice
552	* @return decimal
553	*/
554	protected function _applyTierPrice($product, $qty, $finalPrice)
	@@ -557,10 +611,11 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
557	return $finalPrice;
558	}
559
560	- $tierPrice = $product->getTierPrice($qty);
561
562	if (is_numeric($tierPrice)) {
563	$tierPrice = $finalPrice - ($finalPrice * ($tierPrice / 100));

564	$finalPrice = min($finalPrice, $tierPrice);
565	}
566
	@@ -570,7 +625,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
570	/**
571	* Get product tier price by qty
572	*
573	- * @param decimal $qty
574	* @param Mage_Catalog_Model_Product $product
575	* @return decimal
576	*/
	@@ -589,13 +644,13 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
589
590	if (is_null($prices) \|\| !is_array($prices)) {
591	if (!is_null($qty)) {
592	- return ~~$product->getPrice()~~;
593	}
594	return array(array(
595	- 'price' => ~~$product->getPrice()~~,
596	- 'website_price' => ~~$product->getPrice()~~,
597	- 'price_qty' => 1,
598	- 'cust_group' => $allGroups
599	));
600	}
601
	@@ -624,9 +679,9 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
624	}
625
626	if ($price['website_price'] > $prevPrice) {
627	- $prevPrice = $price['website_price'];
628	- $prevQty = $price['price_qty'];
629	- $prevGroup = $price['cust_group'];
630	}
631	}
632
	@@ -656,18 +711,18 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
656	/**
657	* Calculate product price based on special price data and price rules
658	*
659	- * @param float $basePrice
660	- * @param float $specialPrice
661	- * @param string $specialPriceFrom
662	- * @param string $specialPriceTo
663	* @param float\|null\|false $rulePrice
664	- * @param mixed $wId
665	- * @param mixed $gId
666	- * @param null\|int $productId
667	* @return float
668	*/
669	public static function calculatePrice($basePrice, $specialPrice, $specialPriceFrom, $specialPriceTo,
670	- $rulePrice = false, $wId = null, $gId = null, $productId = null)
671	{
672	$resource = Mage::getResourceSingleton('bundle/bundle');
673	$selectionResource = Mage::getResourceSingleton('bundle/selection');
	@@ -717,7 +772,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
717	$result['final_price'] = $selectionResource->getPriceFromIndex($result['product_id'], $qty, $store,
718	$gId);
719
720	- $selectionPrice = $result['final_price']*$qty;
721
722	if (isset($options[$result['option_id']])) {
723	$options[$result['option_id']] = min($options[$result['option_id']], $selectionPrice);
	@@ -732,7 +787,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
732	continue;
733	}
734	if ($result['selection_price_type']) {
735	- $selectionPrice = $basePrice*$result['selection_price_value']/100;
736	} else {
737	$selectionPrice = $result['selection_price_value'];
738	}
	@@ -745,7 +800,7 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
745	$qty = $result['selection_qty'];
746	}
747
748	- $selectionPrice = $selectionPrice*$qty;
749
750	if (isset($options[$result['option_id']])) {
751	$options[$result['option_id']] = min($options[$result['option_id']], $selectionPrice);
	@@ -801,20 +856,20 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
801	/**
802	* Calculate and apply special price
803	*
804	- * @param float $finalPrice
805	- * @param float $specialPrice
806	* @param string $specialPriceFrom
807	* @param string $specialPriceTo
808	- * @param mixed $store
809	* @return float
810	*/
811	public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo,
812	- $store = null)
813	{
814	if (!is_null($specialPrice) && $specialPrice != false) {
815	if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
816	- $specialPrice = Mage::app()->getStore()->roundPrice($finalPrice * $specialPrice / 100);
817	- $finalPrice = min($finalPrice, $specialPrice);
818	}
819	}
820
	@@ -842,6 +897,16 @@ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Pr
842	return Mage::helper($name);
843	}
844










845	/**
846	* Check if product has required options
847	*


36	/**
37	* Fixed price type
38	*/
39	+ const PRICE_TYPE_FIXED = 1;
40
41	/**
42	* Dynamic price type
43	*/
44	+ const PRICE_TYPE_DYNAMIC = 0;
45
46	/**
47	* Flag which indicates - is min/max prices have been calculated by index

112	/**
113	* Get product final price
114	*
115	+ * @param double $qty
116	* @param Mage_Catalog_Model_Product $product
117	* @return double
118	*/

138	* Returns final price of a child product
139	*
140	* @param Mage_Catalog_Model_Product $product
141	+ * @param float $productQty
142	* @param Mage_Catalog_Model_Product $childProduct
143	+ * @param float $childProductQty
144	* @return decimal
145	*/
146	public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)

155	* @see Mage_Bundle_Model_Product_Price::getTotalPrices()
156	*
157	* @param Mage_Catalog_Model_Product $product
158	+ * @param string $which
159	* @return decimal\|array
160	*/
161	public function getPrices($product, $which = null)

170	* @see Mage_Bundle_Model_Product_Price::getTotalPrices()
171	*
172	* @param Mage_Catalog_Model_Product $product
173	+ * @param string $which
174	+ * @param bool\|null $includeTax
175	* @return decimal\|array
176	*/
177	public function getPricesDependingOnTax($product, $which = null, $includeTax = null)

183	* Retrieve Price considering tier price
184	*
185	* @param Mage_Catalog_Model_Product $product
186	+ * @param string\|null $which
187	+ * @param bool\|null $includeTax
188	+ * @param bool $takeTierPrice
189	* @return decimal\|array
190	*/
191	public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)

195	$taxHelper = $this->_getHelperData('tax');
196
197	if ($this->_isPricesCalculatedByIndex && !$includeTax) {
198	+ $minimalPrice = $taxHelper->getPrice($product, $product->getData('min_price'), $includeTax,
199	+ null, null, null, null, null, false);
200	+ $maximalPrice = $taxHelper->getPrice($product, $product->getData('max_price'), $includeTax,
201	+ null, null, null, null, null, false);
202	} else {
203	/**
204	* Check if product price is fixed
205	*/
206	$finalPrice = $product->getFinalPrice();
207	if ($isPriceFixedType) {
208	+ $minimalPrice = $maximalPrice = $taxHelper->getPrice($product, $finalPrice, $includeTax,
209	+ null, null, null, null, null, false);
210	} else { // PRICE_TYPE_DYNAMIC
211	$minimalPrice = $maximalPrice = 0;
212	}

230	}
231	}
232
233	+ $minimalPrice = $product->getStore()->roundPrice($minimalPrice);
234	+ $maximalPrice = $product->getStore()->roundPrice($maximalPrice);
235	+
236	if ('max' == $which) {
237	return $maximalPrice;
238	} elseif ('min' == $which) {

254	{
255	$options = $this->getOptions($product);
256	$minimalPrice = 0;
257	+ $minimalPriceWithTax = 0;
258	$hasRequiredOptions = $this->_hasRequiredOptions($product);
259	$selectionMinimalPrices = array();
260	+ $selectionMinimalPricesWithTax = array();
261
262	if (!$options) {
263	return $minimalPrice;

265
266	foreach ($options as $option) {
267	/* @var $option Mage_Bundle_Model_Option */
268	+ $selectionPrices = $this->_getSelectionPrices($product, $option, $takeTierPrice, $includeTax);
269	+ $selectionPricesWithTax = $this->_getSelectionPrices($product, $option, $takeTierPrice, true);
270
271	if (count($selectionPrices)) {
272	+ $selectionMinPrice = is_array($selectionPrices) ? min($selectionPrices) : $selectionPrices;
273	+ $selectMinPriceWithTax = is_array($selectionPricesWithTax) ?
274	+ min($selectionPricesWithTax) : $selectionPricesWithTax;
275	if ($option->getRequired()) {
276	$minimalPrice += $selectionMinPrice;
277	+ $minimalPriceWithTax += $selectMinPriceWithTax;
278	} elseif (!$hasRequiredOptions) {
279	$selectionMinimalPrices[] = $selectionMinPrice;
280	+ $selectionMinimalPricesWithTax[] = $selectMinPriceWithTax;
281	}
282	}
283	}
284	// condition is TRUE when all product options are NOT required
285	if (!$hasRequiredOptions) {
286	$minimalPrice = min($selectionMinimalPrices);
287	+ $minimalPriceWithTax = min($selectionMinimalPricesWithTax);
288	+ }
289	+
290	+ $taxConfig = $this->_getHelperData('tax')->getConfig();
291	+
292	+ //In the case of total base calculation we round the tax first and
293	+ //deduct the tax from the price including tax
294	+ if ($taxConfig->priceIncludesTax($product->getStore())
295	+ && Mage_Tax_Model_Calculation::CALC_TOTAL_BASE ==
296	+ $taxConfig->getAlgorithm($product->getStore())
297	+ && ($minimalPriceWithTax > $minimalPrice)
298	+ ) {
299	+ //We convert the value to string to maintain the precision
300	+ $tax = (String)($minimalPriceWithTax - $minimalPrice);
301	+ $roundedTax = $this->_getApp()->getStore()->roundPrice($tax);
302	+ $minimalPrice = $minimalPriceWithTax - $roundedTax;
303	}
304	return $minimalPrice;
305	}

345	{
346	$selectionPrices = array();
347	$taxHelper = $this->_getHelperData('tax');
348	+ $taxCalcMethod = $taxHelper->getConfig()->getAlgorithm($product->getStore());
349	$isPriceFixedType = ($product->getPriceType() == self::PRICE_TYPE_FIXED);
350
351	$selections = $option->getSelections();

364
365	$item = $isPriceFixedType ? $product : $selection;
366
367	+ $selectionUnitPrice = $this->getSelectionFinalTotalPrice(
368	+ $product, $selection, 1, null, false, $takeTierPrice);
369	+ $selectionQty = $selection->getSelectionQty();
370	+ if ($isPriceFixedType \|\| $taxCalcMethod == Mage_Tax_Model_Calculation::CALC_TOTAL_BASE) {
371	+ $selectionPrice = $selectionQty * $taxHelper->getPrice($item, $selectionUnitPrice, $includeTax,
372	+ null, null, null, null, null, false);
373	+ $selectionPrices[] = $selectionPrice;
374	+ } else if ($taxCalcMethod == Mage_Tax_Model_Calculation::CALC_ROW_BASE) {
375	+ $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice * $selectionQty, $includeTax);
376	+ $selectionPrices[] = $selectionPrice;
377	+ } else { //dynamic price and Mage_Tax_Model_Calculation::CALC_UNIT_BASE
378	+ $selectionPrice = $taxHelper->getPrice($item, $selectionUnitPrice, $includeTax) * $selectionQty;
379	+ $selectionPrices[] = $selectionPrice;
380	+ }
381	}
382	return $selectionPrices;
383	}

435	*
436	* @param Mage_Catalog_Model_Product $bundleProduct
437	* @param Mage_Catalog_Model_Product $selectionProduct
438	+ * @param float\|null $selectionQty
439	+ * @param null\|bool $multiplyQty Whether to multiply selection's price by its quantity
440	* @return float
441	*/
442	public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQty = null, $multiplyQty = true)

449	*
450	* @param Mage_Catalog_Model_Product $bundleProduct
451	* @param Mage_Catalog_Model_Product $selectionProduct
452	+ * @param decimal $qty
453	* @return decimal
454	*/
455	public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)

465	*
466	* @param Mage_Catalog_Model_Product $bundleProduct
467	* @param Mage_Catalog_Model_Product $selectionProduct
468	+ * @param decimal $bundleQty
469	+ * @param decimal $selectionQty
470	+ * @param bool $multiplyQty
471	* @return decimal
472	*/
473	public function getSelectionFinalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty = null,
474	+ $multiplyQty = true)
475	{
476	return $this->getSelectionFinalTotalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty,
477	$multiplyQty);

483	*
484	* @param Mage_Catalog_Model_Product $bundleProduct
485	* @param Mage_Catalog_Model_Product $selectionProduct
486	+ * @param float $bundleQty
487	+ * @param float $selectionQty
488	+ * @param bool $multiplyQty
489	+ * @param bool $takeTierPrice
490	+ * @return float
491	*/
492	public function getSelectionFinalTotalPrice($bundleProduct, $selectionProduct, $bundleQty, $selectionQty,
493	+ $multiplyQty = true, $takeTierPrice = true)
494	{
495	if (is_null($selectionQty)) {
496	$selectionQty = $selectionProduct->getSelectionQty();

513	}
514	}
515
516	+ $price = $this->getLowestPrice($bundleProduct, $price, $bundleQty);




517
518	if ($multiplyQty) {
519	$price *= $selectionQty;

522	return $price;
523	}
524
525	+ /**
526	+ * Returns the lowest price after applying any applicable bundle discounts
527	+ *
528	+ * @param Mage_Catalog_Model_Product $bundleProduct
529	+ * @param float\|string $price
530	+ * @param int $bundleQty
531	+ * @return float
532	+ */
533	+ public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
534	+ {
535	+ $price *= 1;
536	+ return min($this->_getApp()->getStore()->roundPrice($price),
537	+ $this->_applyGroupPrice($bundleProduct, $price),
538	+ $this->_applyTierPrice($bundleProduct, $bundleQty, $price),
539	+ $this->_applySpecialPrice($bundleProduct, $price)
540	+ );
541	+ }
542	+
543	/**
544	* Apply group price for bundle product
545	*

554
555	if (is_numeric($groupPrice)) {
556	$groupPrice = $finalPrice - ($finalPrice * ($groupPrice / 100));
557	+ $groupPrice = $this->_getApp()->getStore()->roundPrice($groupPrice);
558	$result = min($finalPrice, $groupPrice);
559	}
560

601	* Apply tier price for bundle
602	*
603	* @param Mage_Catalog_Model_Product $product
604	+ * @param decimal $qty
605	+ * @param decimal $finalPrice
606	* @return decimal
607	*/
608	protected function _applyTierPrice($product, $qty, $finalPrice)

611	return $finalPrice;
612	}
613
614	+ $tierPrice = $product->getTierPrice($qty);
615
616	if (is_numeric($tierPrice)) {
617	$tierPrice = $finalPrice - ($finalPrice * ($tierPrice / 100));
618	+ $tierPrice = $this->_getApp()->getStore()->roundPrice($tierPrice);
619	$finalPrice = min($finalPrice, $tierPrice);
620	}
621

625	/**
626	* Get product tier price by qty
627	*
628	+ * @param decimal $qty
629	* @param Mage_Catalog_Model_Product $product
630	* @return decimal
631	*/

644
645	if (is_null($prices) \|\| !is_array($prices)) {
646	if (!is_null($qty)) {
647	+ return 0;
648	}
649	return array(array(
650	+ 'price' => 0,
651	+ 'website_price' => 0,
652	+ 'price_qty' => 1,
653	+ 'cust_group' => $allGroups
654	));
655	}
656

679	}
680
681	if ($price['website_price'] > $prevPrice) {
682	+ $prevPrice = $price['website_price'];
683	+ $prevQty = $price['price_qty'];
684	+ $prevGroup = $price['cust_group'];
685	}
686	}
687

711	/**
712	* Calculate product price based on special price data and price rules
713	*
714	+ * @param float $basePrice
715	+ * @param float $specialPrice
716	+ * @param string $specialPriceFrom
717	+ * @param string $specialPriceTo
718	* @param float\|null\|false $rulePrice
719	+ * @param mixed $wId
720	+ * @param mixed $gId
721	+ * @param null\|int $productId
722	* @return float
723	*/
724	public static function calculatePrice($basePrice, $specialPrice, $specialPriceFrom, $specialPriceTo,
725	+ $rulePrice = false, $wId = null, $gId = null, $productId = null)
726	{
727	$resource = Mage::getResourceSingleton('bundle/bundle');
728	$selectionResource = Mage::getResourceSingleton('bundle/selection');

772	$result['final_price'] = $selectionResource->getPriceFromIndex($result['product_id'], $qty, $store,
773	$gId);
774
775	+ $selectionPrice = $result['final_price'] * $qty;
776
777	if (isset($options[$result['option_id']])) {
778	$options[$result['option_id']] = min($options[$result['option_id']], $selectionPrice);

787	continue;
788	}
789	if ($result['selection_price_type']) {
790	+ $selectionPrice = $basePrice * $result['selection_price_value'] / 100;
791	} else {
792	$selectionPrice = $result['selection_price_value'];
793	}

800	$qty = $result['selection_qty'];
801	}
802
803	+ $selectionPrice = $selectionPrice * $qty;
804
805	if (isset($options[$result['option_id']])) {
806	$options[$result['option_id']] = min($options[$result['option_id']], $selectionPrice);

856	/**
857	* Calculate and apply special price
858	*
859	+ * @param float $finalPrice
860	+ * @param float $specialPrice
861	* @param string $specialPriceFrom
862	* @param string $specialPriceTo
863	+ * @param mixed $store
864	* @return float
865	*/
866	public static function calculateSpecialPrice($finalPrice, $specialPrice, $specialPriceFrom, $specialPriceTo,
867	+ $store = null)
868	{
869	if (!is_null($specialPrice) && $specialPrice != false) {
870	if (Mage::app()->getLocale()->isStoreDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
871	+ $specialPrice = Mage::app()->getStore()->roundPrice($finalPrice * $specialPrice / 100);
872	+ $finalPrice = min($finalPrice, $specialPrice);
873	}
874	}
875

897	return Mage::helper($name);
898	}
899
900	+ /**
901	+ * Get Magento App instance
902	+ *
903	+ * @return Mage_Core_Model_App
904	+ */
905	+ protected function _getApp()
906	+ {
907	+ return Mage::app();
908	+ }
909	+
910	/**
911	* Check if product has required options
912	*

app/code/core/Mage/Catalog/Block/Product/Abstract.php CHANGED Viewed

	@@ -60,7 +60,7 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
60	*
61	* @var string
62	*/
63	- protected $_tierPriceDefaultTemplate = 'catalog/product/view/tierprices.phtml';
64
65	/**
66	* Price types
	@@ -198,7 +198,7 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
198	$stockItem = $product->getStockItem();
199	if ($stockItem) {
200	return ($stockItem->getMinSaleQty()
201	- && $stockItem->getMinSaleQty() > 0 ? $stockItem->getMinSaleQty() * 1 : null);
202	}
203	return null;
204	}
	@@ -377,13 +377,15 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
377
378	return $this->getData('tier_price_template');
379	}

380	/**
381	* Returns product tier price block html
382	*
383	- * @param Mage_Catalog_Model_Product $product

384	* @return string
385	*/
386	- public function getTierPriceHtml($product = null)
387	{
388	if (is_null($product)) {
389	$product = $this->getProduct();
	@@ -391,8 +393,22 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
391	return $this->_getPriceBlock($product->getTypeId())
392	->setTemplate($this->getTierPriceTemplate())
393	->setProduct($product)
394	- ->setInGrouped($~~this~~->~~getProduct()->~~isGrouped())
395	- ->~~toHtml~~();














396	}
397
398	/**
	@@ -406,7 +422,7 @@ abstract class Mage_Catalog_Block_Product_Abstract extends Mage_Core_Block_Templ
406	if (is_null($product)) {
407	$product = $this->getProduct();
408	}
409	- $prices = $product->getFormatedTierPrice();
410
411	$res = array();
412	if (is_array($prices)) {


60	*
61	* @var string
62	*/
63	+ protected $_tierPriceDefaultTemplate = 'catalog/product/view/tierprices.phtml';
64
65	/**
66	* Price types

198	$stockItem = $product->getStockItem();
199	if ($stockItem) {
200	return ($stockItem->getMinSaleQty()
201	+ && $stockItem->getMinSaleQty() > 0 ? $stockItem->getMinSaleQty() * 1 : null);
202	}
203	return null;
204	}

377
378	return $this->getData('tier_price_template');
379	}
380	+
381	/**
382	* Returns product tier price block html
383	*
384	+ * @param null\|Mage_Catalog_Model_Product $product
385	+ * @param null\|Mage_Catalog_Model_Product $parent
386	* @return string
387	*/
388	+ public function getTierPriceHtml($product = null, $parent = null)
389	{
390	if (is_null($product)) {
391	$product = $this->getProduct();

393	return $this->_getPriceBlock($product->getTypeId())
394	->setTemplate($this->getTierPriceTemplate())
395	->setProduct($product)
396	+ ->setInGrouped($product->isGrouped())
397	+ ->setParent($parent)
398	+ ->callParentToHtml();
399	+ }
400	+
401	+ /*
402	+ * Calls the object's to Html method.
403	+ * This method exists to make the code more testable.
404	+ * By having a protected wrapper for the final method toHtml, we can 'mock' out this method
405	+ * when unit testing
406	+ *
407	+ * @return string
408	+ */
409	+ protected function callParentToHtml()
410	+ {
411	+ return $this->toHtml();
412	}
413
414	/**

422	if (is_null($product)) {
423	$product = $this->getProduct();
424	}
425	+ $prices = $product->getFormatedTierPrice();
426
427	$res = array();
428	if (is_array($prices)) {

app/code/core/Mage/Catalog/Block/Product/Price.php CHANGED Viewed

	@@ -33,7 +33,18 @@
33	*/
34	class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstract
35	{





36	protected $_priceDisplayType = null;






37	protected $_idSuffix = '';
38
39	/**
	@@ -50,17 +61,33 @@ class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstra
50	return $product;
51	}
52





53	public function getDisplayMinimalPrice()
54	{
55	return $this->_getData('display_minimal_price');
56	}
57






58	public function setIdSuffix($idSuffix)
59	{
60	$this->_idSuffix = $idSuffix;
61	return $this;
62	}
63





64	public function getIdSuffix()
65	{
66	return $this->_idSuffix;
	@@ -70,15 +97,22 @@ class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstra
70	* Get tier prices (formatted)
71	*
72	* @param Mage_Catalog_Model_Product $product

73	* @return array
74	*/
75	- public function getTierPrices($product = null)
76	{
77	if (is_null($product)) {
78	$product = $this->getProduct();
79	}
80	$prices = $product->getFormatedTierPrice();
81






82	$res = array();
83	if (is_array($prices)) {
84	foreach ($prices as $price) {
	@@ -96,8 +130,15 @@ class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstra
96	}
97
98	if ($price['price'] < $productPrice) {

99	$price['savePercent'] = ceil(100 - ((100 / $productPrice) * $price['price']));
100






101	$tierPrice = Mage::app()->getStore()->convertPrice(
102	Mage::helper('tax')->getPrice($product, $price['website_price'])
103	);


33	*/
34	class Mage_Catalog_Block_Product_Price extends Mage_Catalog_Block_Product_Abstract
35	{
36	+ /**
37	+ * Price display type
38	+ *
39	+ * @var int
40	+ */
41	protected $_priceDisplayType = null;
42	+
43	+ /**
44	+ * The id suffix
45	+ *
46	+ * @var string
47	+ */
48	protected $_idSuffix = '';
49
50	/**

61	return $product;
62	}
63
64	+ /**
65	+ * Returns the product's minimal price
66	+ *
67	+ * @return float
68	+ */
69	public function getDisplayMinimalPrice()
70	{
71	return $this->_getData('display_minimal_price');
72	}
73
74	+ /**
75	+ * Sets the id suffix
76	+ *
77	+ * @param string $idSuffix
78	+ * @return Mage_Catalog_Block_Product_Price
79	+ */
80	public function setIdSuffix($idSuffix)
81	{
82	$this->_idSuffix = $idSuffix;
83	return $this;
84	}
85
86	+ /**
87	+ * Returns the id suffix
88	+ *
89	+ * @return string
90	+ */
91	public function getIdSuffix()
92	{
93	return $this->_idSuffix;

97	* Get tier prices (formatted)
98	*
99	* @param Mage_Catalog_Model_Product $product
100	+ * @param Mage_Catalog_Model_Product $parent
101	* @return array
102	*/
103	+ public function getTierPrices($product = null, $parent = null)
104	{
105	if (is_null($product)) {
106	$product = $this->getProduct();
107	}
108	$prices = $product->getFormatedTierPrice();
109
110	+ // if our parent is a bundle, then we need to further adjust our tier prices
111	+ if (isset($parent) && $parent->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
112	+ /* @var $bundlePriceModel Mage_Bundle_Model_Product_Price */
113	+ $bundlePriceModel = Mage::getModel('bundle/product_price');
114	+ }
115	+
116	$res = array();
117	if (is_array($prices)) {
118	foreach ($prices as $price) {

130	}
131
132	if ($price['price'] < $productPrice) {
133	+ // use the original prices to determine the percent savings
134	$price['savePercent'] = ceil(100 - ((100 / $productPrice) * $price['price']));
135
136	+ // if applicable, adjust the tier prices
137	+ if (isset($bundlePriceModel)) {
138	+ $price['price'] = $bundlePriceModel->getLowestPrice($parent, $price['price']);
139	+ $price['website_price'] = $bundlePriceModel->getLowestPrice($parent, $price['website_price']);
140	+ }
141	+
142	$tierPrice = Mage::app()->getStore()->convertPrice(
143	Mage::helper('tax')->getPrice($product, $price['website_price'])
144	);

app/code/core/Mage/Catalog/Block/Product/View.php CHANGED Viewed

	@@ -153,8 +153,15 @@ class Mage_Catalog_Block_Product_View extends Mage_Catalog_Block_Product_Abstrac
153
154	$_regularPrice = $product->getPrice();
155	$_finalPrice = $product->getFinalPrice();
156	- ~~$_priceInclTax~~ ~~= Mage::helper~~(~~'tax')~~->~~getPrice~~(~~$product,~~ ~~$_finalPrice,~~ ~~true~~);
157	- $~~_priceExclTax~~ = Mage::helper('tax')->getPrice($product, $_finalPrice);







158	$_tierPrices = array();
159	$_tierPricesInclTax = array();
160	foreach ($product->getTierPrice() as $tierPrice) {


153
154	$_regularPrice = $product->getPrice();
155	$_finalPrice = $product->getFinalPrice();
156	+ if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_BUNDLE) {
157	+ $_priceInclTax = Mage::helper('tax')->getPrice($product, $_finalPrice, true,
158	+ null, null, null, null, null, false);
159	+ $_priceExclTax = Mage::helper('tax')->getPrice($product, $_finalPrice, false,
160	+ null, null, null, null, null, false);
161	+ } else {
162	+ $_priceInclTax = Mage::helper('tax')->getPrice($product, $_finalPrice, true);
163	+ $_priceExclTax = Mage::helper('tax')->getPrice($product, $_finalPrice);
164	+ }
165	$_tierPrices = array();
166	$_tierPricesInclTax = array();
167	foreach ($product->getTierPrice() as $tierPrice) {

app/code/core/Mage/Catalog/Helper/Product/Compare.php CHANGED Viewed

	@@ -102,7 +102,8 @@ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url
102	{
103	return array(
104	'product' => $product->getId(),
105	- Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()

106	);
107	}
108


102	{
103	return array(
104	'product' => $product->getId(),
105	+ Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl(),
106	+ Mage_Core_Model_Url::FORM_KEY => $this->_getSingletonModel('core/session')->getFormKey()
107	);
108	}
109

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php CHANGED Viewed

	@@ -211,7 +211,8 @@ class Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source
211	'pvs.entity_id = pvd.entity_id AND pvs.attribute_id = pvd.attribute_id'
212	. ' AND pvs.store_id=cs.store_id',
213	array('value' => $productValueExpression))
214	- ->where('pvd.store_id=?', ~~Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID)~~

215	->where('cs.store_id!=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID)
216	->where('pvd.attribute_id IN(?)', $attrIds);
217


211	'pvs.entity_id = pvd.entity_id AND pvs.attribute_id = pvd.attribute_id'
212	. ' AND pvs.store_id=cs.store_id',
213	array('value' => $productValueExpression))
214	+ ->where('pvd.store_id=?',
215	+ $adapter->getIfNullSql('pvs.store_id', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID))
216	->where('cs.store_id!=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID)
217	->where('pvd.attribute_id IN(?)', $attrIds);
218

app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php CHANGED Viewed

	@@ -227,7 +227,7 @@ class Mage_Catalog_Model_Resource_Product_Option_Value extends Mage_Core_Model_R
227	}
228	} else if ($object->getData('scope', 'title')) {
229	$where = array(
230	- 'option_type_id = ?' => (int)$~~optionTypeId~~,
231	'store_id = ?' => (int)$object->getStoreId()
232	);
233	$this->_getWriteAdapter()->delete($titleTable, $where);
	@@ -317,7 +317,7 @@ class Mage_Catalog_Model_Resource_Product_Option_Value extends Mage_Core_Model_R
317	foreach ($valueCond as $oldTypeId => $newTypeId) {
318	// price
319	$priceTable = $this->getTable('catalog/product_option_type_price');
320	- $columns= array(
321	new Zend_Db_Expr($newTypeId),
322	'store_id', 'price', 'price_type'
323	);
	@@ -332,7 +332,7 @@ class Mage_Catalog_Model_Resource_Product_Option_Value extends Mage_Core_Model_R
332
333	// title
334	$titleTable = $this->getTable('catalog/product_option_type_title');
335	- $columns= array(
336	new Zend_Db_Expr($newTypeId),
337	'store_id', 'title'
338	);


227	}
228	} else if ($object->getData('scope', 'title')) {
229	$where = array(
230	+ 'option_type_id = ?' => (int)$object->getId(),
231	'store_id = ?' => (int)$object->getStoreId()
232	);
233	$this->_getWriteAdapter()->delete($titleTable, $where);

317	foreach ($valueCond as $oldTypeId => $newTypeId) {
318	// price
319	$priceTable = $this->getTable('catalog/product_option_type_price');
320	+ $columns = array(
321	new Zend_Db_Expr($newTypeId),
322	'store_id', 'price', 'price_type'
323	);

332
333	// title
334	$titleTable = $this->getTable('catalog/product_option_type_title');
335	+ $columns = array(
336	new Zend_Db_Expr($newTypeId),
337	'store_id', 'title'
338	);

app/code/core/Mage/Catalog/Model/Resource/Product/Status.php CHANGED Viewed

	@@ -70,7 +70,8 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resourc
70	protected function _getProductAttribute($attribute)
71	{
72	if (empty($this->_productAttributes[$attribute])) {
73	- $this->_productAttributes[$attribute] = ~~Mage::getSingleton('catalog/product')->getResource()->getAttribute($attribute);~~

74	}
75	return $this->_productAttributes[$attribute];
76	}
	@@ -129,12 +130,6 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resourc
129	->where('store_id = :store_id')
130	->where('entity_id = :product_id');
131
132	- $binds = array(
133	- 'attribute_id' => $statusAttributeId,
134	- 'store_id' => $storeId,
135	- 'product_id' => $productId
136	- );
137	-
138	$row = $adapter->fetchRow($select);
139
140	if ($row) {
	@@ -189,11 +184,12 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resourc
189	$select = $adapter->select()
190	->from(
191	array('t1' => $attributeTable),
192	- array('value' => $valueCheckSql))
193	->joinLeft(
194	array('t2' => $attributeTable),
195	- 't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id = ' ~~. (int)$storeId,~~
196	- ~~array~~(~~'t1.entity_id'~~)

197	)
198	->where('t1.store_id = ?', Mage_Core_Model_App::ADMIN_STORE_ID)
199	->where('t1.attribute_id = ?', $attribute->getAttributeId())


70	protected function _getProductAttribute($attribute)
71	{
72	if (empty($this->_productAttributes[$attribute])) {
73	+ $this->_productAttributes[$attribute] =
74	+ Mage::getSingleton('catalog/product')->getResource()->getAttribute($attribute);
75	}
76	return $this->_productAttributes[$attribute];
77	}

130	->where('store_id = :store_id')
131	->where('entity_id = :product_id');
132






133	$row = $adapter->fetchRow($select);
134
135	if ($row) {

184	$select = $adapter->select()
185	->from(
186	array('t1' => $attributeTable),
187	+ array('entity_id' => 't1.entity_id', 'value' => $valueCheckSql))
188	->joinLeft(
189	array('t2' => $attributeTable),
190	+ 't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id = '
191	+ . (int)$storeId,
192	+ array('')
193	)
194	->where('t1.store_id = ?', Mage_Core_Model_App::ADMIN_STORE_ID)
195	->where('t1.attribute_id = ?', $attribute->getAttributeId())

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php CHANGED Viewed

	@@ -220,7 +220,7 @@ class Mage_Catalog_Model_Resource_Product_Type_Configurable extends Mage_Core_Mo
220	array()
221	)->where('super_attribute.product_id = ?', $product->getId());
222
223	- $attributesOptionsData[$superAttribute->getAttributeId()] = $this->_getReadAdapter()->~~fetchAssoc~~($select);
224	}
225	return $attributesOptionsData;
226	}


220	array()
221	)->where('super_attribute.product_id = ?', $product->getId());
222
223	+ $attributesOptionsData[$superAttribute->getAttributeId()] = $this->_getReadAdapter()->fetchAll($select);
224	}
225	return $attributesOptionsData;
226	}

app/code/core/Mage/Catalog/controllers/Product/CompareController.php CHANGED Viewed

	@@ -74,6 +74,11 @@ class Mage_Catalog_Product_CompareController extends Mage_Core_Controller_Front_
74	*/
75	public function addAction()
76	{





77	$productId = (int) $this->getRequest()->getParam('product');
78	if ($productId
79	&& (Mage::getSingleton('log/visitor')->getId() \|\| Mage::getSingleton('customer/session')->isLoggedIn())


74	*/
75	public function addAction()
76	{
77	+ if (!$this->_validateFormKey()) {
78	+ $this->_redirectReferer();
79	+ return;
80	+ }
81	+
82	$productId = (int) $this->getRequest()->getParam('product');
83	if ($productId
84	&& (Mage::getSingleton('log/visitor')->getId() \|\| Mage::getSingleton('customer/session')->isLoggedIn())

app/code/core/Mage/Catalog/etc/wsi.xml CHANGED Viewed

	@@ -347,8 +347,8 @@
347	</xsd:complexType>
348	<xsd:complexType name="catalogProductAttributeFrontendLabelEntity">
349	<xsd:sequence>
350	- <element name="store_id" type="xsd:string" />
351	- <element name="label" type="xsd:string" />
352	</xsd:sequence>
353	</xsd:complexType>
354	<xsd:complexType name="catalogProductAttributeFrontendLabelArray">


347	</xsd:complexType>
348	<xsd:complexType name="catalogProductAttributeFrontendLabelEntity">
349	<xsd:sequence>
350	+ <xsd:element name="store_id" type="xsd:string"/>
351	+ <xsd:element name="label" type="xsd:string"/>
352	</xsd:sequence>
353	</xsd:complexType>
354	<xsd:complexType name="catalogProductAttributeFrontendLabelArray">

app/code/core/Mage/CatalogInventory/Model/Observer.php CHANGED Viewed

	@@ -50,6 +50,11 @@ class Mage_CatalogInventory_Model_Observer
50	*/
51	protected $_checkedQuoteItems = array();
52





53	protected $_itemsForReindex = array();
54
55	/**
	@@ -174,9 +179,10 @@ class Mage_CatalogInventory_Model_Observer
174	'use_config_min_sale_qty' => 1,
175	'use_config_max_sale_qty' => 1,
176	'use_config_backorders' => 1,
177	- 'use_config_notify_stock_qty'=> 1
178	);
179	- ~~if (~~$currentStockItem = $currentProduct->getStockItem()~~) {~~

180	$stockData += array(
181	'use_config_enable_qty_inc' => $currentStockItem->getData('use_config_enable_qty_inc'),
182	'enable_qty_increments' => $currentStockItem->getData('enable_qty_increments'),
	@@ -339,7 +345,8 @@ class Mage_CatalogInventory_Model_Observer
339	/**
340	* Check item for options
341	*/
342	- ~~if ((~~$options = $quoteItem->getQtyOptions()~~) && $qty > 0) {~~

343	$qty = $quoteItem->getProduct()->getTypeInstance(true)->prepareQuoteItemQty($qty, $quoteItem->getProduct());
344	$quoteItem->setData('qty', $qty);
345
	@@ -367,6 +374,7 @@ class Mage_CatalogInventory_Model_Observer
367	}
368	}
369

370	foreach ($options as $option) {
371	$optionValue = $option->getValue();
372	/* @var $option Mage_Sales_Model_Quote_Item_Option */
	@@ -426,6 +434,7 @@ class Mage_CatalogInventory_Model_Observer
426
427	if ($result->getHasError()) {
428	$option->setHasError(true);

429
430	$quoteItem->addErrorInfo(
431	'cataloginventory',
	@@ -439,7 +448,7 @@ class Mage_CatalogInventory_Model_Observer
439	Mage_CatalogInventory_Helper_Data::ERROR_QTY,
440	$result->getQuoteMessage()
441	);
442	- } ~~else~~ {
443	// Delete error from item and its quote, if it was set due to qty lack
444	$this->_removeErrorsFromQuoteAndItem($quoteItem, Mage_CatalogInventory_Helper_Data::ERROR_QTY);
445	}
	@@ -727,7 +736,7 @@ class Mage_CatalogInventory_Model_Observer
727	}
728	}
729
730	- if( count($productIds)) {
731	Mage::getResourceSingleton('cataloginventory/indexer_stock')->reindexProducts($productIds);
732	}
733
	@@ -773,8 +782,8 @@ class Mage_CatalogInventory_Model_Observer
773	$items[$item->getProductId()]['qty'] += $qty;
774	} else {
775	$items[$item->getProductId()] = array(
776	- 'qty' => $qty,
777	- 'item'=> null,
778	);
779	}
780	}
	@@ -795,7 +804,8 @@ class Mage_CatalogInventory_Model_Observer
795	$children = $item->getChildrenItems();
796	$qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
797
798	- ~~if (~~$~~item->getId() && ($~~productId = $item->getProductId()~~) && empty($children) && $qty) {~~

799	Mage::getSingleton('cataloginventory/stock')->backItemQty($productId, $qty);
800	}
801


50	*/
51	protected $_checkedQuoteItems = array();
52
53	+ /**
54	+ * Array of items that need to be reindexed
55	+ *
56	+ * @var array
57	+ */
58	protected $_itemsForReindex = array();
59
60	/**

179	'use_config_min_sale_qty' => 1,
180	'use_config_max_sale_qty' => 1,
181	'use_config_backorders' => 1,
182	+ 'use_config_notify_stock_qty' => 1
183	);
184	+ $currentStockItem = $currentProduct->getStockItem();
185	+ if ($currentStockItem) {
186	$stockData += array(
187	'use_config_enable_qty_inc' => $currentStockItem->getData('use_config_enable_qty_inc'),
188	'enable_qty_increments' => $currentStockItem->getData('enable_qty_increments'),

345	/**
346	* Check item for options
347	*/
348	+ $options = $quoteItem->getQtyOptions();
349	+ if ($options && $qty > 0) {
350	$qty = $quoteItem->getProduct()->getTypeInstance(true)->prepareQuoteItemQty($qty, $quoteItem->getProduct());
351	$quoteItem->setData('qty', $qty);
352

374	}
375	}
376
377	+ $quoteItemHasErrors = false;
378	foreach ($options as $option) {
379	$optionValue = $option->getValue();
380	/* @var $option Mage_Sales_Model_Quote_Item_Option */

434
435	if ($result->getHasError()) {
436	$option->setHasError(true);
437	+ $quoteItemHasErrors = true;
438
439	$quoteItem->addErrorInfo(
440	'cataloginventory',

448	Mage_CatalogInventory_Helper_Data::ERROR_QTY,
449	$result->getQuoteMessage()
450	);
451	+ } elseif (!$quoteItemHasErrors) {
452	// Delete error from item and its quote, if it was set due to qty lack
453	$this->_removeErrorsFromQuoteAndItem($quoteItem, Mage_CatalogInventory_Helper_Data::ERROR_QTY);
454	}

736	}
737	}
738
739	+ if (count($productIds)) {
740	Mage::getResourceSingleton('cataloginventory/indexer_stock')->reindexProducts($productIds);
741	}
742

782	$items[$item->getProductId()]['qty'] += $qty;
783	} else {
784	$items[$item->getProductId()] = array(
785	+ 'qty' => $qty,
786	+ 'item' => null,
787	);
788	}
789	}

804	$children = $item->getChildrenItems();
805	$qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
806
807	+ $productId = $item->getProductId();
808	+ if ($item->getId() && $productId && empty($children) && $qty) {
809	Mage::getSingleton('cataloginventory/stock')->backItemQty($productId, $qty);
810	}
811

app/code/core/Mage/CatalogRule/Model/Resource/Rule.php CHANGED Viewed

	@@ -246,7 +246,7 @@ class Mage_CatalogRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abst
246	));
247
248	if (count($productIds) > 0) {
249	- $selectByStore->where('p.entity_id IN (?)', $productIds);
250	}
251
252	$selects = $write->selectsByRange('entity_id', $selectByStore, self::RANGE_PRODUCT_STEP);


246	));
247
248	if (count($productIds) > 0) {
249	+ $selectByStore->where('p.entity_id IN (?)', array_keys($productIds));
250	}
251
252	$selects = $write->selectsByRange('entity_id', $selectByStore, self::RANGE_PRODUCT_STEP);

app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php CHANGED Viewed

	@@ -89,11 +89,13 @@ class Mage_CatalogRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Cond
89	*/
90	protected function _getAttributeValue($object)
91	{

92	$storeId = $object->getStoreId();
93	$defaultStoreId = Mage_Core_Model_App::ADMIN_STORE_ID;
94	$productValues = isset($this->_entityAttributeValues[$object->getId()])
95	? $this->_entityAttributeValues[$object->getId()] : array();
96	- $defaultValue = isset($productValues[$defaultStoreId]) ~~? $productValues[$defaultStoreId] : null;~~

97	$value = isset($productValues[$storeId]) ? $productValues[$storeId] : $defaultValue;
98
99	$value = $this->_prepareDatetimeValue($value, $object);


89	*/
90	protected function _getAttributeValue($object)
91	{
92	+ $attrCode = $this->getAttribute();
93	$storeId = $object->getStoreId();
94	$defaultStoreId = Mage_Core_Model_App::ADMIN_STORE_ID;
95	$productValues = isset($this->_entityAttributeValues[$object->getId()])
96	? $this->_entityAttributeValues[$object->getId()] : array();
97	+ $defaultValue = isset($productValues[$defaultStoreId])
98	+ ? $productValues[$defaultStoreId] : $object->getData($attrCode);
99	$value = isset($productValues[$storeId]) ? $productValues[$storeId] : $defaultValue;
100
101	$value = $this->_prepareDatetimeValue($value, $object);

app/code/core/Mage/CatalogSearch/Helper/Data.php CHANGED Viewed

	@@ -31,7 +31,14 @@
31	*/
32	class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract
33	{



34	const QUERY_VAR_NAME = 'q';




35	const MAX_QUERY_LEN = 200;
36
37	/**
	@@ -166,7 +173,7 @@ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract
166	{
167	return $this->_getUrl('catalogsearch/result', array(
168	'_query' => array(self::QUERY_VAR_NAME => $query),
169	- '_secure' => ~~Mage::app~~()->getFrontController()->getRequest()->isSecure()
170	));
171	}
172
	@@ -178,10 +185,20 @@ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract
178	public function getSuggestUrl()
179	{
180	return $this->_getUrl('catalogsearch/ajax/suggest', array(
181	- '_secure' => ~~Mage::app()~~->~~getFrontController~~()->~~getRequest~~()->~~isSecure~~()
182	));
183	}
184










185	/**
186	* Retrieve search term url
187	*


31	*/
32	class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract
33	{
34	+ /**
35	+ * Query variable name
36	+ */
37	const QUERY_VAR_NAME = 'q';
38	+
39	+ /*
40	+ * Maximum query length
41	+ */
42	const MAX_QUERY_LEN = 200;
43
44	/**

173	{
174	return $this->_getUrl('catalogsearch/result', array(
175	'_query' => array(self::QUERY_VAR_NAME => $query),
176	+ '_secure' => $this->_getApp()->getFrontController()->getRequest()->isSecure()
177	));
178	}
179

185	public function getSuggestUrl()
186	{
187	return $this->_getUrl('catalogsearch/ajax/suggest', array(
188	+ '_secure' => $this->_getApp()->getStore()->isCurrentlySecure()
189	));
190	}
191
192	+ /**
193	+ * Get App
194	+ *
195	+ * @return Mage_Core_Model_App
196	+ */
197	+ protected function _getApp()
198	+ {
199	+ return Mage::app();
200	+ }
201	+
202	/**
203	* Retrieve search term url
204	*

app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php CHANGED Viewed

	@@ -442,6 +442,9 @@ class Mage_Checkout_Block_Cart_Item_Renderer extends Mage_Core_Block_Template
442	*/
443	public function getCacheTags()
444	{
445	- ~~return~~ ~~array_merge(parent::getCacheTags(),~~ $this->getProduct()->getCacheIdTags());



446	}
447	}


442	*/
443	public function getCacheTags()
444	{
445	+ $tags = $this->getProduct()->getCacheIdTags();
446	+ $tags = is_array($tags) ? $tags : array();
447	+
448	+ return array_merge(parent::getCacheTags(), $tags);
449	}
450	}

app/code/core/Mage/Checkout/Helper/Data.php CHANGED Viewed

	@@ -93,6 +93,7 @@ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
93
94	/**
95	* Get sales item (quote item, order item etc) price including tax based on row total and tax amount

96	*
97	* @param Varien_Object $item
98	* @return float
	@@ -103,9 +104,9 @@ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
103	return $item->getPriceInclTax();
104	}
105	$qty = ($item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1));
106	- ~~$taxAmount = $item->getTaxAmount() + $item->getDiscountTaxCompensation();~~
107	- $price = ~~(floatval($~~qty~~)) ? ($item->getRowTotal() + $taxAmount)/$qty : 0;~~
108	- return ~~Mage::app()~~->~~getStore~~(~~)->roundPrice(~~$~~price~~);
109	}
110
111	/**
	@@ -119,21 +120,46 @@ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
119	if ($item->getRowTotalInclTax()) {
120	return $item->getRowTotalInclTax();
121	}
122	- $tax = ~~$item->getTaxAmount()~~ + ~~$item->getDiscountTaxCompensation();~~



123	return $item->getRowTotal() + $tax;
124	}
125
















126	public function getBasePriceInclTax($item)
127	{
128	$qty = ($item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1));
129	- ~~$taxAmount = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation();~~
130	- ~~$price~~ ~~= (floatval(~~$qty)) ? ($item~~->getBaseRowTotal(~~) + $~~taxAmount)/$~~qty : 0;
131	- return Mage::app()->getStore()->roundPrice($price);
132	}
133






134	public function getBaseSubtotalInclTax($item)
135	{
136	- $tax = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation();

137	return $item->getBaseRowTotal()+$tax;
138	}
139
	@@ -193,32 +219,32 @@ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
193	foreach ($checkout->getAllVisibleItems() as $_item) {
194	/* @var $_item Mage_Sales_Model_Quote_Item */
195	$items .= $_item->getProduct()->getName() . ' x '. $_item->getQty() . ' '
196	- . $checkout->getStoreCurrencyCode() . ' '
197	- . $_item->getProduct()->getFinalPrice($_item->getQty()) . "\n";
198	}
199	$total = $checkout->getStoreCurrencyCode() . ' ' . $checkout->getGrandTotal();
200
201	foreach ($sendTo as $recipient) {
202	$mailTemplate->setDesignConfig(array('area'=>'frontend', 'store'=>$checkout->getStoreId()))
203	->sendTransactional(
204	- $template,
205	- Mage::getStoreConfig('checkout/payment_failed/identity', $checkout->getStoreId()),
206	- $recipient['email'],
207	- $recipient['name'],
208	- array(
209	- 'reason' => $message,
210	- 'checkoutType' => $checkoutType,
211	- 'dateAndTime' => Mage::app()->getLocale()->date(),
212	- 'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(),
213	- 'customerEmail' => $checkout->getCustomerEmail(),
214	- 'billingAddress' => $checkout->getBillingAddress(),
215	- 'shippingAddress' => $checkout->getShippingAddress(),
216	- 'shippingMethod' => Mage::getStoreConfig('carriers/'.$shippingMethod.'/title'),
217	- 'paymentMethod' => Mage::getStoreConfig('payment/'.$paymentMethod.'/title'),
218	- 'items' => nl2br($items),
219	- 'total' => $total
220	- )
221	- );
222	}
223
224	$translate->setTranslateInline(true);
	@@ -255,7 +281,7 @@ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract
255	&& (($quote->getItemsSummaryQty() - $quote->getItemVirtualQty()) > 0)
256	&& ($quote->getItemsSummaryQty() <= $maximunQty)
257	&& !$quote->hasNominalItems()
258	- ;
259	}
260
261	/**


93
94	/**
95	* Get sales item (quote item, order item etc) price including tax based on row total and tax amount
96	+ * excluding weee tax
97	*
98	* @param Varien_Object $item
99	* @return float

104	return $item->getPriceInclTax();
105	}
106	$qty = ($item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1));
107	+
108	+ //Unit price is rowtotal/qty
109	+ return $qty > 0 ? $this->getSubtotalInclTax($item)/$qty :0;
110	}
111
112	/**

120	if ($item->getRowTotalInclTax()) {
121	return $item->getRowTotalInclTax();
122	}
123	+ //Since tax amount contains weee tax
124	+ $tax = $item->getTaxAmount() + $item->getDiscountTaxCompensation()
125	+ - $this->_getWeeeHelper()->getTotalRowTaxAppliedForWeeeTax($item);;
126	+
127	return $item->getRowTotal() + $tax;
128	}
129
130	+ /**
131	+ * Returns the helper for weee
132	+ *
133	+ * @return Mage_Weee_Helper_Data
134	+ */
135	+ protected function _getWeeeHelper()
136	+ {
137	+ return Mage::helper('weee');
138	+ }
139	+
140	+ /**
141	+ * Get the base price of the item including tax , excluding weee
142	+ *
143	+ * @param Varien_Object $item
144	+ * @return float
145	+ */
146	public function getBasePriceInclTax($item)
147	{
148	$qty = ($item->getQty() ? $item->getQty() : ($item->getQtyOrdered() ? $item->getQtyOrdered() : 1));
149	+
150	+ return $qty > 0 ? $this->getBaseSubtotalInclTax($item) / $qty : 0;

151	}
152
153	+ /**
154	+ * Get sales item (quote item, order item etc) row total price including tax excluding wee
155	+ *
156	+ * @param Varien_Object $item
157	+ * @return float
158	+ */
159	public function getBaseSubtotalInclTax($item)
160	{
161	+ $tax = $item->getBaseTaxAmount() + $item->getBaseDiscountTaxCompensation()
162	+ - $this->_getWeeeHelper()->getBaseTotalRowTaxAppliedForWeeeTax($item);
163	return $item->getBaseRowTotal()+$tax;
164	}
165

219	foreach ($checkout->getAllVisibleItems() as $_item) {
220	/* @var $_item Mage_Sales_Model_Quote_Item */
221	$items .= $_item->getProduct()->getName() . ' x '. $_item->getQty() . ' '
222	+ . $checkout->getStoreCurrencyCode() . ' '
223	+ . $_item->getProduct()->getFinalPrice($_item->getQty()) . "\n";
224	}
225	$total = $checkout->getStoreCurrencyCode() . ' ' . $checkout->getGrandTotal();
226
227	foreach ($sendTo as $recipient) {
228	$mailTemplate->setDesignConfig(array('area'=>'frontend', 'store'=>$checkout->getStoreId()))
229	->sendTransactional(
230	+ $template,
231	+ Mage::getStoreConfig('checkout/payment_failed/identity', $checkout->getStoreId()),
232	+ $recipient['email'],
233	+ $recipient['name'],
234	+ array(
235	+ 'reason' => $message,
236	+ 'checkoutType' => $checkoutType,
237	+ 'dateAndTime' => Mage::app()->getLocale()->date(),
238	+ 'customer' => $checkout->getCustomerFirstname() . ' ' . $checkout->getCustomerLastname(),
239	+ 'customerEmail' => $checkout->getCustomerEmail(),
240	+ 'billingAddress' => $checkout->getBillingAddress(),
241	+ 'shippingAddress' => $checkout->getShippingAddress(),
242	+ 'shippingMethod' => Mage::getStoreConfig('carriers/'.$shippingMethod.'/title'),
243	+ 'paymentMethod' => Mage::getStoreConfig('payment/'.$paymentMethod.'/title'),
244	+ 'items' => nl2br($items),
245	+ 'total' => $total
246	+ )
247	+ );
248	}
249
250	$translate->setTranslateInline(true);

281	&& (($quote->getItemsSummaryQty() - $quote->getItemVirtualQty()) > 0)
282	&& ($quote->getItemsSummaryQty() <= $maximunQty)
283	&& !$quote->hasNominalItems()
284	+ ;
285	}
286
287	/**

app/code/core/Mage/Checkout/Model/Cart/Product/Api.php CHANGED Viewed

	@@ -31,7 +31,6 @@
31	* @package Mage_Checkout
32	* @author Magento Core Team <core@magentocommerce.com>
33	*/
34	-
35	class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resource_Product
36	{
37	/**
	@@ -51,7 +50,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
51	* @param $store
52	* @return bool
53	*/
54	- public function add($quoteId, $productsData, $store=null)
55	{
56	$quote = $this->_getQuote($quoteId, $store);
57	if (empty($store)) {
	@@ -91,7 +90,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
91
92	try {
93	$quote->collectTotals()->save();
94	- } catch(Exception $e) {
95	$this->_fault("add_product_quote_save_fault", $e->getMessage());
96	}
97
	@@ -104,7 +103,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
104	* @param $store
105	* @return bool
106	*/
107	- public function update($quoteId, $productsData, $store=null)
108	{
109	$quote = $this->_getQuote($quoteId, $store);
110	if (empty($store)) {
	@@ -145,8 +144,8 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
145	}
146
147	try {
148	- $quote->save();
149	- } catch(Exception $e) {
150	$this->_fault("update_product_quote_save_fault", $e->getMessage());
151	}
152
	@@ -159,7 +158,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
159	* @param $store
160	* @return bool
161	*/
162	- public function remove($quoteId, $productsData, $store=null)
163	{
164	$quote = $this->_getQuote($quoteId, $store);
165	if (empty($store)) {
	@@ -201,8 +200,8 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
201	}
202
203	try {
204	- $quote->save();
205	- } catch(Exception $e) {
206	$this->_fault("remove_product_quote_save_fault", $e->getMessage());
207	}
208
	@@ -249,7 +248,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
249	* @param $store
250	* @return bool
251	*/
252	- public function moveToCustomerQuote($quoteId, $productsData, $store=null)
253	{
254	$quote = $this->_getQuote($quoteId, $store);
255
	@@ -281,7 +280,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
281	}
282
283	$errors = array();
284	- foreach($productsData as $key => $productItem){
285	if (isset($productItem['product_id'])) {
286	$productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
287	} else if (isset($productItem['sku'])) {
	@@ -295,7 +294,7 @@ class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resou
295	/** @var $quoteItem Mage_Sales_Model_Quote_Item */
296	$quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem,
297	$this->_getProductRequest($productItem));
298	- if($quoteItem && $quoteItem->getId()){
299	$newQuoteItem = clone $quoteItem;
300	$newQuoteItem->setId(null);
301	$customerQuote->addItem($newQuoteItem);


31	* @package Mage_Checkout
32	* @author Magento Core Team <core@magentocommerce.com>
33	*/

34	class Mage_Checkout_Model_Cart_Product_Api extends Mage_Checkout_Model_Api_Resource_Product
35	{
36	/**

50	* @param $store
51	* @return bool
52	*/
53	+ public function add($quoteId, $productsData, $store = null)
54	{
55	$quote = $this->_getQuote($quoteId, $store);
56	if (empty($store)) {

90
91	try {
92	$quote->collectTotals()->save();
93	+ } catch (Exception $e) {
94	$this->_fault("add_product_quote_save_fault", $e->getMessage());
95	}
96

103	* @param $store
104	* @return bool
105	*/
106	+ public function update($quoteId, $productsData, $store = null)
107	{
108	$quote = $this->_getQuote($quoteId, $store);
109	if (empty($store)) {

144	}
145
146	try {
147	+ $quote->collectTotals()->save();
148	+ } catch (Exception $e) {
149	$this->_fault("update_product_quote_save_fault", $e->getMessage());
150	}
151

158	* @param $store
159	* @return bool
160	*/
161	+ public function remove($quoteId, $productsData, $store = null)
162	{
163	$quote = $this->_getQuote($quoteId, $store);
164	if (empty($store)) {

200	}
201
202	try {
203	+ $quote->collectTotals()->save();
204	+ } catch (Exception $e) {
205	$this->_fault("remove_product_quote_save_fault", $e->getMessage());
206	}
207

248	* @param $store
249	* @return bool
250	*/
251	+ public function moveToCustomerQuote($quoteId, $productsData, $store = null)
252	{
253	$quote = $this->_getQuote($quoteId, $store);
254

280	}
281
282	$errors = array();
283	+ foreach ($productsData as $key => $productItem) {
284	if (isset($productItem['product_id'])) {
285	$productByItem = $this->_getProduct($productItem['product_id'], $store, "id");
286	} else if (isset($productItem['sku'])) {

294	/** @var $quoteItem Mage_Sales_Model_Quote_Item */
295	$quoteItem = $this->_getQuoteItemByProduct($quote, $productByItem,
296	$this->_getProductRequest($productItem));
297	+ if ($quoteItem && $quoteItem->getId()) {
298	$newQuoteItem = clone $quoteItem;
299	$newQuoteItem->setId(null);
300	$customerQuote->addItem($newQuoteItem);

app/code/core/Mage/Checkout/controllers/CartController.php CHANGED Viewed

	@@ -397,6 +397,11 @@ class Mage_Checkout_CartController extends Mage_Core_Controller_Front_Action
397	*/
398	public function updatePostAction()
399	{





400	$updateAction = (string)$this->getRequest()->getParam('update_cart_action');
401
402	switch ($updateAction) {


397	*/
398	public function updatePostAction()
399	{
400	+ if (!$this->_validateFormKey()) {
401	+ $this->_redirect('//');
402	+ return;
403	+ }
404	+
405	$updateAction = (string)$this->getRequest()->getParam('update_cart_action');
406
407	switch ($updateAction) {

app/code/core/Mage/Checkout/controllers/MultishippingController.php CHANGED Viewed

	@@ -267,6 +267,9 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
267	}
268	}
269



270	public function backToAddressesAction()
271	{
272	$this->_getState()->setActiveStep(
	@@ -292,6 +295,11 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
292	$this->_redirect('//addresses');
293	}
294





295	protected function _validateMinimumAmount()
296	{
297	if (!$this->_getCheckout()->validateMinimumAmount()) {
	@@ -326,6 +334,9 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
326	$this->renderLayout();
327	}
328



329	public function backToShippingAction()
330	{
331	$this->_getState()->setActiveStep(
	@@ -337,6 +348,9 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
337	$this->_redirect('//shipping');
338	}
339



340	public function shippingPostAction()
341	{
342	$shippingMethods = $this->getRequest()->getPost('shipping_method');
	@@ -354,7 +368,7 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
354	);
355	$this->_redirect('//billing');
356	}
357	- catch (Exception $e){
358	$this->_getCheckoutSession()->addError($e->getMessage());
359	$this->_redirect('//shipping');
360	}
	@@ -402,6 +416,9 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
402	return true;
403	}
404



405	public function backToBillingAction()
406	{
407	$this->_getState()->setActiveStep(
	@@ -453,8 +470,16 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
453	}
454	}
455



456	public function overviewPostAction()
457	{





458	if (!$this->_validateMinimumAmount()) {
459	return;
460	}
	@@ -489,7 +514,7 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
489	$this->_redirect('//success');
490	} catch (Mage_Payment_Model_Info_Exception $e) {
491	$message = $e->getMessage();
492	- if( !empty($message) ) {
493	$this->_getCheckoutSession()->addError($message);
494	}
495	$this->_redirect('//billing');
	@@ -500,12 +525,12 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
500	$this->_getCheckoutSession()->addError($e->getMessage());
501	$this->_redirect('*/cart');
502	}
503	- catch (Mage_Core_Exception $e){
504	Mage::helper('checkout')
505	->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
506	$this->_getCheckoutSession()->addError($e->getMessage());
507	$this->_redirect('//billing');
508	- } catch (Exception $e){
509	Mage::logException($e);
510	Mage::helper('checkout')
511	->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
	@@ -515,7 +540,7 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
515	}
516
517	/**
518	- * Multishipping checkout ~~succes~~ page
519	*/
520	public function successAction()
521	{
	@@ -533,7 +558,6 @@ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Act
533
534	/**
535	* Redirect to login page
536	- *
537	*/
538	public function redirectLogin()
539	{


267	}
268	}
269
270	+ /**
271	+ * Multishipping checkout action to go back to addresses page
272	+ */
273	public function backToAddressesAction()
274	{
275	$this->_getState()->setActiveStep(

295	$this->_redirect('//addresses');
296	}
297
298	+ /**
299	+ * Returns whether the minimum amount has been reached
300	+ *
301	+ * @return bool
302	+ */
303	protected function _validateMinimumAmount()
304	{
305	if (!$this->_getCheckout()->validateMinimumAmount()) {

334	$this->renderLayout();
335	}
336
337	+ /**
338	+ * Multishipping checkout action to go back to shipping
339	+ */
340	public function backToShippingAction()
341	{
342	$this->_getState()->setActiveStep(

348	$this->_redirect('//shipping');
349	}
350
351	+ /**
352	+ * Multishipping checkout after the shipping page
353	+ */
354	public function shippingPostAction()
355	{
356	$shippingMethods = $this->getRequest()->getPost('shipping_method');

368	);
369	$this->_redirect('//billing');
370	}
371	+ catch (Exception $e) {
372	$this->_getCheckoutSession()->addError($e->getMessage());
373	$this->_redirect('//shipping');
374	}

416	return true;
417	}
418
419	+ /**
420	+ * Multishipping checkout action to go back to billing
421	+ */
422	public function backToBillingAction()
423	{
424	$this->_getState()->setActiveStep(

470	}
471	}
472
473	+ /**
474	+ * Multishipping checkout after the overview page
475	+ */
476	public function overviewPostAction()
477	{
478	+ if (!$this->_validateFormKey()) {
479	+ $this->_forward('backToAddresses');
480	+ return;
481	+ }
482	+
483	if (!$this->_validateMinimumAmount()) {
484	return;
485	}

514	$this->_redirect('//success');
515	} catch (Mage_Payment_Model_Info_Exception $e) {
516	$message = $e->getMessage();
517	+ if ( !empty($message) ) {
518	$this->_getCheckoutSession()->addError($message);
519	}
520	$this->_redirect('//billing');

525	$this->_getCheckoutSession()->addError($e->getMessage());
526	$this->_redirect('*/cart');
527	}
528	+ catch (Mage_Core_Exception $e) {
529	Mage::helper('checkout')
530	->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');
531	$this->_getCheckoutSession()->addError($e->getMessage());
532	$this->_redirect('//billing');
533	+ } catch (Exception $e) {
534	Mage::logException($e);
535	Mage::helper('checkout')
536	->sendPaymentFailedEmail($this->_getCheckout()->getQuote(), $e->getMessage(), 'multi-shipping');

540	}
541
542	/**
543	+ * Multishipping checkout success page
544	*/
545	public function successAction()
546	{

558
559	/**
560	* Redirect to login page

561	*/
562	public function redirectLogin()
563	{

app/code/core/Mage/Cms/Model/Resource/Page.php CHANGED Viewed

	@@ -147,6 +147,9 @@ class Mage_Cms_Model_Resource_Page extends Mage_Core_Model_Resource_Db_Abstract
147	$this->_getWriteAdapter()->insertMultiple($table, $data);
148	}
149



150	return parent::_afterSave($object);
151	}
152


147	$this->_getWriteAdapter()->insertMultiple($table, $data);
148	}
149
150	+ //Mark layout cache as invalidated
151	+ Mage::app()->getCacheInstance()->invalidateType('layout');
152	+
153	return parent::_afterSave($object);
154	}
155

app/code/core/Mage/Cms/Model/Resource/Page/Service.php CHANGED Viewed

	@@ -43,7 +43,7 @@ class Mage_Cms_Model_Resource_Page_Service extends Mage_Core_Model_Resource_Db_A
43	/**
44	* Unlinks from $fromStoreId store pages that have same identifiers as pages in $byStoreId
45	*
46	- * Routine is ~~intented~~ to be used before linking pages of some store ($byStoreId) to other store ($fromStoreId)
47	* to prevent duplication of url keys
48	*
49	* Resolved $byLinkTable can be provided when restoring links from some backup table
	@@ -81,6 +81,7 @@ class Mage_Cms_Model_Resource_Page_Service extends Mage_Core_Model_Resource_Db_A
81	$readAdapter->quoteInto('by_link.page_id = by_entity.page_id AND by_link.store_id = ?', $byStoreId),
82	array()
83	);

84	$pageIds = $readAdapter->fetchCol($select);
85
86	// Unlink found pages
	@@ -88,7 +89,7 @@ class Mage_Cms_Model_Resource_Page_Service extends Mage_Core_Model_Resource_Db_A
88	$writeAdapter = $this->_getWriteAdapter();
89	$where = array(
90	'page_id IN (?)' => $pageIds,
91	- '~~AND~~ store_id = ?' => $fromStoreId
92	);
93	$writeAdapter->delete($linkTable, $where);
94	}


43	/**
44	* Unlinks from $fromStoreId store pages that have same identifiers as pages in $byStoreId
45	*
46	+ * Routine is intended to be used before linking pages of some store ($byStoreId) to other store ($fromStoreId)
47	* to prevent duplication of url keys
48	*
49	* Resolved $byLinkTable can be provided when restoring links from some backup table

81	$readAdapter->quoteInto('by_link.page_id = by_entity.page_id AND by_link.store_id = ?', $byStoreId),
82	array()
83	);
84	+
85	$pageIds = $readAdapter->fetchCol($select);
86
87	// Unlink found pages

89	$writeAdapter = $this->_getWriteAdapter();
90	$where = array(
91	'page_id IN (?)' => $pageIds,
92	+ 'store_id = ?' => $fromStoreId
93	);
94	$writeAdapter->delete($linkTable, $where);
95	}

app/code/core/Mage/{GoogleCheckout/Block/Form.php → Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php} RENAMED Viewed

@@ -19,28 +19,21 @@
              * needs please refer to http://www.magentocommerce.com for more information.
+             *
              * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
              * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
              * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
              */
-            -
            /**
-            -
             * GoogleCheckout Form Block
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Block_Form extends Mage_Payment_Block_Form
-            -
            {
-            -
-            -
                /**
-            -
                 * Varien constructor
-            -
                 */
-            -
                protected function _construct()
-            -
                {
-            -
                    $this->setTemplate('googlecheckout/form.phtml');
-            -
                    parent::_construct();
-            -
                }
-            -
            }


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Cms
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26	+ $content = "<p>This website requires cookies to provide all of its features. For more " .
27	+ "information on what data is contained in the cookies, please see our " .
28	+ "<a href=\"{{store direct_url=\"privacy-policy-cookie-restriction-mode\"}}\">Privacy Policy page</a>. " .
29	+ "To accept cookies from this site, please click the Allow button below.</p>";
30
31	+ $cmsBlock = array(
32	+ 'title' => 'Cookie restriction notice',
33	+ 'identifier' => 'cookie_restriction_notice_block',
34	+ 'content' => $content,
35	+ 'is_active' => 1,
36	+ 'stores' => 0
37	+ );











38
39	+ Mage::getModel('cms/block')->setData($cmsBlock)->save();

app/code/core/Mage/Cms/etc/config.xml CHANGED Viewed

	@@ -28,7 +28,7 @@
28	<config>
29	<modules>
30	<Mage_Cms>
31	- <version>1.6.0.0.1</version>
32	</Mage_Cms>
33	</modules>
34	<frontend>


28	<config>
29	<modules>
30	<Mage_Cms>
31	+ <version>1.6.0.0.2</version>
32	</Mage_Cms>
33	</modules>
34	<frontend>

app/code/core/Mage/Core/Block/Abstract.php CHANGED Viewed

	@@ -86,28 +86,28 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
86	*
87	* @var array
88	*/
89	- protected $_children = array();
90
91	/**
92	* Sorted children list
93	*
94	* @var array
95	*/
96	- protected $_sortedChildren = array();
97
98	/**
99	* Children blocks HTML cache array
100	*
101	* @var array
102	*/
103	- protected $_childrenHtmlCache = array();
104
105	/**
106	* Arbitrary groups of child blocks
107	*
108	* @var array
109	*/
110	- protected $_childGroups = array();
111
112	/**
113	* Request object
	@@ -121,14 +121,14 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
121	*
122	* @var Mage_Core_Block_Messages
123	*/
124	- protected $_messagesBlock = null;
125
126	/**
127	* Whether this block was not explicitly named
128	*
129	* @var boolean
130	*/
131	- protected $_isAnonymous = false;
132
133	/**
134	* Parent block
	@@ -175,6 +175,13 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
175	*/
176	protected $_factory;
177







178	/**
179	* Initialize factory instance
180	*
	@@ -182,7 +189,12 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
182	*/
183	public function __construct(array $args = array())
184	{
185	- ~~$this->_factory~~ = !empty($args['core_factory']) ? $args['core_factory'] : ~~Mage::getSingleton('core/factory'~~);





186	parent::__construct($args);
187	}
188
	@@ -199,6 +211,26 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
199	*/
200	}
201




















202	/**
203	* Retrieve request object
204	*
	@@ -207,7 +239,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
207	*/
208	public function getRequest()
209	{
210	- $controller = ~~Mage::app~~()->getFrontController();
211	if ($controller) {
212	$this->_request = $controller->getRequest();
213	} else {
	@@ -245,7 +277,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
245	*/
246	public function getAction()
247	{
248	- return ~~Mage::app~~()->getFrontController()->getAction();
249	}
250
251	/**
	@@ -478,10 +510,10 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
478	{
479	$child = $this->getChild($alias);
480	if ($child) {
481	- $args = func_get_args();
482	- $alias = array_shift($args);
483	$callback = array_shift($args);
484	- $result = (string)array_shift($args);
485	if (!is_array($params)) {
486	$params = $args;
487	}
	@@ -500,7 +532,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
500	*/
501	public function unsetChildren()
502	{
503	- $this->_children = array();
504	$this->_sortedChildren = array();
505	return $this;
506	}
	@@ -655,7 +687,8 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
655	* if we don't have block - don't throw exception because
656	* block can simply removed using layout method remove
657	*/
658	- //Mage::throwException(Mage::helper('core')~~->__('Invalid block name to set child %s: %s', $alias, $block));~~

659	return $this;
660	}
661	if ($block->getIsAnonymous()) {
	@@ -711,7 +744,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
711	}
712	$this->_sortInstructions[$name][2] = true;
713
714	- $index = array_search($name, $this->_sortedChildren);
715	$siblingKey = array_search($siblingName, $this->_sortedChildren);
716
717	if ($index === false \|\| $siblingKey === false) {
	@@ -896,7 +929,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
896	* Check framing options
897	*/
898	if ($this->_frameOpenTag) {
899	- $html = '<'.$this->_frameOpenTag.'>'.$html.'<'.$this->_frameCloseTag.'>';
900	}
901
902	/**
	@@ -907,7 +940,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
907	}
908	self::$_transportObject->setHtml($html);
909	Mage::dispatchEvent('core_block_abstract_to_html_after',
910	- array('block' => $this, 'transport' => self::$_transportObject));
911	$html = self::$_transportObject->getHtml();
912
913	return $html;
	@@ -1060,7 +1093,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1060	* @param bool $showTime
1061	* @return string
1062	*/
1063	- public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false)
1064	{
1065	return $this->helper('core')->formatDate($date, $format, $showTime);
1066	}
	@@ -1073,7 +1106,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1073	* @param bool $showDate
1074	* @return string
1075	*/
1076	- public function formatTime($time = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showDate = false)
1077	{
1078	return $this->helper('core')->formatTime($time, $format, $showDate);
1079	}
	@@ -1104,7 +1137,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1104	$args = func_get_args();
1105	$expr = new Mage_Core_Model_Translate_Expr(array_shift($args), $this->getModuleName());
1106	array_unshift($args, $expr);
1107	- return ~~Mage::app~~()->getTranslator()->translate($args);
1108	}
1109
1110	/**
	@@ -1212,8 +1245,8 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1212	*/
1213	protected function _beforeCacheUrl()
1214	{
1215	- if (~~Mage::app~~()->useCache(self::CACHE_GROUP)) {
1216	- ~~Mage::app~~()->setUseSessionVar(true);
1217	}
1218	return $this;
1219	}
	@@ -1226,8 +1259,8 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1226	*/
1227	protected function _afterCacheUrl($html)
1228	{
1229	- if (~~Mage::app~~()->useCache(self::CACHE_GROUP)) {
1230	- ~~Mage::app~~()->setUseSessionVar(false);
1231	Varien_Profiler::start('CACHE_URL');
1232	$html = Mage::getSingleton($this->_getUrlModelClass())->sessionUrlVar($html);
1233	Varien_Profiler::stop('CACHE_URL');
	@@ -1264,7 +1297,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1264	*/
1265	$key = $this->getCacheKeyInfo();
1266	//ksort($key); // ignore order
1267	- $key = array_values($key); // ignore array keys
1268	$key = implode('\|', $key);
1269	$key = sha1($key);
1270	return $key;
	@@ -1277,7 +1310,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1277	*/
1278	public function getCacheTags()
1279	{
1280	- $tagsCache = ~~Mage::app~~()->loadCache($this->_getTagsCacheKey());
1281	if ($tagsCache) {
1282	$tags = json_decode($tagsCache);
1283	}
	@@ -1341,13 +1374,13 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1341	*/
1342	protected function _loadCache()
1343	{
1344	- if (is_null($this->getCacheLifetime()) \|\| ~~!Mage::app~~()->useCache(self::CACHE_GROUP)) {
1345	return false;
1346	}
1347	$cacheKey = $this->getCacheKey();
1348	/** @var $session Mage_Core_Model_Session */
1349	$session = Mage::getSingleton('core/session');
1350	- $cacheData = ~~Mage::app~~()->loadCache($cacheKey);
1351	if ($cacheData) {
1352	$cacheData = str_replace(
1353	$this->_getSidPlaceholder($cacheKey),
	@@ -1366,7 +1399,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1366	*/
1367	protected function _saveCache($data)
1368	{
1369	- if (is_null($this->getCacheLifetime()) \|\| ~~!Mage::app~~()->useCache(self::CACHE_GROUP)) {
1370	return false;
1371	}
1372	$cacheKey = $this->getCacheKey();
	@@ -1380,8 +1413,8 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1380
1381	$tags = $this->getCacheTags();
1382
1383	- ~~Mage::app~~()->saveCache($data, $cacheKey, $tags, $this->getCacheLifetime());
1384	- ~~Mage::app~~()->saveCache(
1385	json_encode($tags),
1386	$this->_getTagsCacheKey($cacheKey),
1387	$tags,
	@@ -1429,7 +1462,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object
1429	{
1430	$tags = array();
1431	/** @var $item Mage_Core_Model_Abstract */
1432	- foreach($items as $item) {
1433	$itemTags = $item->getCacheIdTags();
1434	if (false === $itemTags) {
1435	continue;


86	*
87	* @var array
88	*/
89	+ protected $_children = array();
90
91	/**
92	* Sorted children list
93	*
94	* @var array
95	*/
96	+ protected $_sortedChildren = array();
97
98	/**
99	* Children blocks HTML cache array
100	*
101	* @var array
102	*/
103	+ protected $_childrenHtmlCache = array();
104
105	/**
106	* Arbitrary groups of child blocks
107	*
108	* @var array
109	*/
110	+ protected $_childGroups = array();
111
112	/**
113	* Request object

121	*
122	* @var Mage_Core_Block_Messages
123	*/
124	+ protected $_messagesBlock = null;
125
126	/**
127	* Whether this block was not explicitly named
128	*
129	* @var boolean
130	*/
131	+ protected $_isAnonymous = false;
132
133	/**
134	* Parent block

175	*/
176	protected $_factory;
177
178	+ /**
179	+ * Application instance
180	+ *
181	+ * @var Mage_Core_Model_App
182	+ */
183	+ protected $_app;
184	+
185	/**
186	* Initialize factory instance
187	*

189	*/
190	public function __construct(array $args = array())
191	{
192	+ if (!empty($args['core_factory']) && ($args['core_factory'] instanceof Mage_Core_Model_Factory)) {
193	+ $this->_factory = $args['core_factory'];
194	+ }
195	+ if (!empty($args['app']) && ($args['app'] instanceof Mage_Core_Model_App)) {
196	+ $this->_app = $args['app'];
197	+ }
198	parent::__construct($args);
199	}
200

211	*/
212	}
213
214	+ /**
215	+ * Retrieve factory instance
216	+ *
217	+ * @return Mage_Core_Model_Factory
218	+ */
219	+ protected function _getFactory()
220	+ {
221	+ return is_null($this->_factory) ? Mage::getSingleton('core/factory') : $this->_factory;
222	+ }
223	+
224	+ /**
225	+ * Retrieve application instance
226	+ *
227	+ * @return Mage_Core_Model_App
228	+ */
229	+ protected function _getApp()
230	+ {
231	+ return is_null($this->_app) ? Mage::app() : $this->_app;
232	+ }
233	+
234	/**
235	* Retrieve request object
236	*

239	*/
240	public function getRequest()
241	{
242	+ $controller = $this->_getApp()->getFrontController();
243	if ($controller) {
244	$this->_request = $controller->getRequest();
245	} else {

277	*/
278	public function getAction()
279	{
280	+ return $this->_getApp()->getFrontController()->getAction();
281	}
282
283	/**

510	{
511	$child = $this->getChild($alias);
512	if ($child) {
513	+ $args = func_get_args();
514	+ $alias = array_shift($args);
515	$callback = array_shift($args);
516	+ $result = (string)array_shift($args);
517	if (!is_array($params)) {
518	$params = $args;
519	}

532	*/
533	public function unsetChildren()
534	{
535	+ $this->_children = array();
536	$this->_sortedChildren = array();
537	return $this;
538	}

687	* if we don't have block - don't throw exception because
688	* block can simply removed using layout method remove
689	*/
690	+ //Mage::throwException(Mage::helper('core')
691	+ // ->__('Invalid block name to set child %s: %s', $alias, $block));
692	return $this;
693	}
694	if ($block->getIsAnonymous()) {

744	}
745	$this->_sortInstructions[$name][2] = true;
746
747	+ $index = array_search($name, $this->_sortedChildren);
748	$siblingKey = array_search($siblingName, $this->_sortedChildren);
749
750	if ($index === false \|\| $siblingKey === false) {

929	* Check framing options
930	*/
931	if ($this->_frameOpenTag) {
932	+ $html = '<' . $this->_frameOpenTag . '>' . $html . '<' . $this->_frameCloseTag . '>';
933	}
934
935	/**

940	}
941	self::$_transportObject->setHtml($html);
942	Mage::dispatchEvent('core_block_abstract_to_html_after',
943	+ array('block' => $this, 'transport' => self::$_transportObject));
944	$html = self::$_transportObject->getHtml();
945
946	return $html;

1093	* @param bool $showTime
1094	* @return string
1095	*/
1096	+ public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showTime = false)
1097	{
1098	return $this->helper('core')->formatDate($date, $format, $showTime);
1099	}

1106	* @param bool $showDate
1107	* @return string
1108	*/
1109	+ public function formatTime($time = null, $format = Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, $showDate = false)
1110	{
1111	return $this->helper('core')->formatTime($time, $format, $showDate);
1112	}

1137	$args = func_get_args();
1138	$expr = new Mage_Core_Model_Translate_Expr(array_shift($args), $this->getModuleName());
1139	array_unshift($args, $expr);
1140	+ return $this->_getApp()->getTranslator()->translate($args);
1141	}
1142
1143	/**

1245	*/
1246	protected function _beforeCacheUrl()
1247	{
1248	+ if ($this->_getApp()->useCache(self::CACHE_GROUP)) {
1249	+ $this->_getApp()->setUseSessionVar(true);
1250	}
1251	return $this;
1252	}

1259	*/
1260	protected function _afterCacheUrl($html)
1261	{
1262	+ if ($this->_getApp()->useCache(self::CACHE_GROUP)) {
1263	+ $this->_getApp()->setUseSessionVar(false);
1264	Varien_Profiler::start('CACHE_URL');
1265	$html = Mage::getSingleton($this->_getUrlModelClass())->sessionUrlVar($html);
1266	Varien_Profiler::stop('CACHE_URL');

1297	*/
1298	$key = $this->getCacheKeyInfo();
1299	//ksort($key); // ignore order
1300	+ $key = array_values($key); // ignore array keys
1301	$key = implode('\|', $key);
1302	$key = sha1($key);
1303	return $key;

1310	*/
1311	public function getCacheTags()
1312	{
1313	+ $tagsCache = $this->_getApp()->loadCache($this->_getTagsCacheKey());
1314	if ($tagsCache) {
1315	$tags = json_decode($tagsCache);
1316	}

1374	*/
1375	protected function _loadCache()
1376	{
1377	+ if (is_null($this->getCacheLifetime()) \|\| !$this->_getApp()->useCache(self::CACHE_GROUP)) {
1378	return false;
1379	}
1380	$cacheKey = $this->getCacheKey();
1381	/** @var $session Mage_Core_Model_Session */
1382	$session = Mage::getSingleton('core/session');
1383	+ $cacheData = $this->_getApp()->loadCache($cacheKey);
1384	if ($cacheData) {
1385	$cacheData = str_replace(
1386	$this->_getSidPlaceholder($cacheKey),

1399	*/
1400	protected function _saveCache($data)
1401	{
1402	+ if (is_null($this->getCacheLifetime()) \|\| !$this->_getApp()->useCache(self::CACHE_GROUP)) {
1403	return false;
1404	}
1405	$cacheKey = $this->getCacheKey();

1413
1414	$tags = $this->getCacheTags();
1415
1416	+ $this->_getApp()->saveCache($data, $cacheKey, $tags, $this->getCacheLifetime());
1417	+ $this->_getApp()->saveCache(
1418	json_encode($tags),
1419	$this->_getTagsCacheKey($cacheKey),
1420	$tags,

1462	{
1463	$tags = array();
1464	/** @var $item Mage_Core_Model_Abstract */
1465	+ foreach ($items as $item) {
1466	$itemTags = $item->getCacheIdTags();
1467	if (false === $itemTags) {
1468	continue;

app/code/core/Mage/Core/Helper/Cookie.php CHANGED Viewed

	@@ -48,6 +48,11 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract
48	*/
49	const XML_PATH_COOKIE_RESTRICTION_LIFETIME = 'web/cookie/cookie_restriction_lifetime';
50





51	/**
52	* Store instance
53	*
	@@ -142,4 +147,14 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract
142	{
143	return (int)$this->_currentStore->getConfig(self::XML_PATH_COOKIE_RESTRICTION_LIFETIME);
144	}










145	}


48	*/
49	const XML_PATH_COOKIE_RESTRICTION_LIFETIME = 'web/cookie/cookie_restriction_lifetime';
50
51	+ /**
52	+ * Cookie restriction notice cms block identifier
53	+ */
54	+ const COOKIE_RESTRICTION_NOTICE_CMS_BLOCK_IDENTIFIER = 'cookie_restriction_notice_block';
55	+
56	/**
57	* Store instance
58	*

147	{
148	return (int)$this->_currentStore->getConfig(self::XML_PATH_COOKIE_RESTRICTION_LIFETIME);
149	}
150	+
151	+ /**
152	+ * Get cookie restriction notice cms block identifier
153	+ *
154	+ * @return string
155	+ */
156	+ public function getCookieRestrictionNoticeCmsBlockIdentifier()
157	+ {
158	+ return self::COOKIE_RESTRICTION_NOTICE_CMS_BLOCK_IDENTIFIER;
159	+ }
160	}

app/code/core/Mage/Core/Model/Design/Package.php CHANGED Viewed

	@@ -819,6 +819,9 @@ class Mage_Core_Model_Design_Package
819	$pathParts = explode(DS, $uri);
820	$fileDirParts = explode(DS, $this->_callbackFileDir);
821	$store = $this->getStore();



822	if ($store->isAdmin()) {
823	$secure = $store->isAdminUrlSecure();
824	} else {


819	$pathParts = explode(DS, $uri);
820	$fileDirParts = explode(DS, $this->_callbackFileDir);
821	$store = $this->getStore();
822	+ if (is_int($store)) {
823	+ $store = Mage::app()->getStore($store);
824	+ }
825	if ($store->isAdmin()) {
826	$secure = $store->isAdminUrlSecure();
827	} else {

app/code/core/Mage/Core/Model/Locale.php CHANGED Viewed

	@@ -411,13 +411,14 @@ class Mage_Core_Model_Locale
411
412	/**
413	* Retrieve ISO date format

414	*
415	* @param string $type
416	* @return string
417	*/
418	public function getDateFormat($type=null)
419	{
420	- return $this->getTranslation($type, 'date');
421	}
422
423	/**
	@@ -431,7 +432,6 @@ class Mage_Core_Model_Locale
431	$this->getTranslation(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, 'date'));
432	}
433
434	-
435	/**
436	* Retrieve ISO time format
437	*
	@@ -576,7 +576,15 @@ class Mage_Core_Model_Locale
576	try {
577	$currencyObject = new Zend_Currency($currency, $this->getLocale());
578	} catch (Exception $e) {
579	- ~~$currencyObject = new Zend_Currency($this->getCurrency(), $this->getLocale());~~








580	$options['name'] = $currency;
581	$options['currency'] = $currency;
582	$options['symbol'] = $currency;
	@@ -753,7 +761,18 @@ class Mage_Core_Model_Locale
753	return $this->getLocale()->getTranslation($value, $path, $this->getLocale());
754	}
755
756	- /**











757	* Returns the localized country name
758	*
759	* @param string $value Name to get detailed information about


411
412	/**
413	* Retrieve ISO date format
414	+ * and filter for 2 digit year format, it must be 4 digits
415	*
416	* @param string $type
417	* @return string
418	*/
419	public function getDateFormat($type=null)
420	{
421	+ return preg_replace('/(?<!y)yy(?!y)/', 'yyyy', $this->getTranslation($type, 'date'));
422	}
423
424	/**

432	$this->getTranslation(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT, 'date'));
433	}
434

435	/**
436	* Retrieve ISO time format
437	*

576	try {
577	$currencyObject = new Zend_Currency($currency, $this->getLocale());
578	} catch (Exception $e) {
579	+ /**
580	+ * catch specific exceptions like "Currency 'USD' not found"
581	+ * - back end falls with specific locals as Malaysia and etc.
582	+ *
583	+ * as we can see from Zend framework ticket
584	+ * http://framework.zend.com/issues/browse/ZF-10038
585	+ * zend team is not going to change it behaviour in the near time
586	+ */
587	+ $currencyObject = new Zend_Currency($currency);
588	$options['name'] = $currency;
589	$options['currency'] = $currency;
590	$options['symbol'] = $currency;

761	return $this->getLocale()->getTranslation($value, $path, $this->getLocale());
762	}
763
764	+ /**
765	+ * Replace all yy date format to yyyy
766	+ *
767	+ * @param $currentFormat
768	+ * @return mixed
769	+ */
770	+ protected function _convertYearTwoDigitTo4($currentFormat)
771	+ {
772	+ return preg_replace('/(\byy\b)/', 'yyyy', $currentFormat);
773	+ }
774	+
775	+ /**
776	* Returns the localized country name
777	*
778	* @param string $value Name to get detailed information about

app/code/core/Mage/Core/Model/Resource/Design.php CHANGED Viewed

	@@ -52,27 +52,22 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
52	*/
53	public function _beforeSave(Mage_Core_Model_Abstract $object)
54	{
55	- ~~if (~~$~~date~~ = $object->getDateFrom()~~) {~~
56	- $object->~~setDateFrom~~(~~$this->formatDate($date~~));
57	- } ~~else~~ {
58	- $~~object->setDateFrom~~(~~null~~);
59	- }
60	-
61	- ~~if ($date = $object->getDateTo()) {~~
62	- ~~$object->setDateTo~~($~~this->formatDate~~($~~date~~));
63	- } ~~else~~ {
64	- ~~$object->setDateTo(null);~~
65	- }
66	-
67	- if (!is_null($object->getDateFrom()) && !is_null($object->getDateTo())
68	- && Varien_Date::toTimestamp($object->getDateFrom()) > Varien_Date::toTimestamp($object->getDateTo())) {
69	- Mage::throwException(Mage::helper('core')->__('Start date cannot be greater than end date.'));
70	}
71
72	$check = $this->_checkIntersection(
73	$object->getStoreId(),
74	- $~~object->getDateFrom()~~,
75	- $~~object->getDateTo()~~,
76	$object->getId()
77	);
78
	@@ -81,11 +76,6 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
81	Mage::helper('core')->__('Your design change for the specified store intersects with another one, please specify another date range.'));
82	}
83
84	- if ($object->getDateFrom() === null)
85	- $object->setDateFrom(new Zend_Db_Expr('null'));
86	- if ($object->getDateTo() === null)
87	- $object->setDateTo(new Zend_Db_Expr('null'));
88	-
89	parent::_beforeSave($object);
90	}
91
	@@ -109,7 +99,7 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
109
110	$dateConditions = array('date_to IS NULL AND date_from IS NULL');
111
112	- if (!~~is_null~~($dateFrom)) {
113	$dateConditions[] = ':date_from BETWEEN date_from AND date_to';
114	$dateConditions[] = ':date_from >= date_from and date_to IS NULL';
115	$dateConditions[] = ':date_from <= date_to and date_from IS NULL';
	@@ -117,7 +107,7 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
117	$dateConditions[] = 'date_from IS NULL';
118	}
119
120	- if (!~~is_null~~($dateTo)) {
121	$dateConditions[] = ':date_to BETWEEN date_from AND date_to';
122	$dateConditions[] = ':date_to >= date_from AND date_to IS NULL';
123	$dateConditions[] = ':date_to <= date_to AND date_from IS NULL';
	@@ -125,18 +115,18 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
125	$dateConditions[] = 'date_to IS NULL';
126	}
127
128	- if (~~is_null~~($dateFrom) && !~~is_null~~($dateTo)) {
129	$dateConditions[] = 'date_to <= :date_to OR date_from <= :date_to';
130	}
131
132	- if (!~~is_null~~($dateFrom) && ~~is_null~~($dateTo)) {
133	$dateConditions[] = 'date_to >= :date_from OR date_from >= :date_from';
134	}
135
136	- if (!~~is_null~~($dateFrom) && !~~is_null~~($dateTo)) {
137	$dateConditions[] = 'date_from BETWEEN :date_from AND :date_to';
138	$dateConditions[] = 'date_to BETWEEN :date_from AND :date_to';
139	- } elseif (~~is_null~~($dateFrom) && ~~is_null~~($dateTo)) {
140	$dateConditions = array();
141	}
142
	@@ -151,10 +141,10 @@ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstra
151	'current_id' => (int)$currentId,
152	);
153
154	- if (!~~is_null~~($dateTo)) {
155	$bind['date_to'] = $dateTo;
156	}
157	- if (!~~is_null~~($dateFrom)) {
158	$bind['date_from'] = $dateFrom;
159	}
160


52	*/
53	public function _beforeSave(Mage_Core_Model_Abstract $object)
54	{
55	+ $dateFrom = $object->getDateFrom();
56	+ $dateTo = $object->getDateTo();
57	+ if (!empty($dateFrom) && !empty($dateTo)) {
58	+ $validator = new Zend_Validate_Date();
59	+ if (!$validator->isValid($dateFrom) \|\| !$validator->isValid($dateTo)) {
60	+ Mage::throwException(Mage::helper('core')->__('Invalid date'));
61	+ }
62	+ if (Varien_Date::toTimestamp($dateFrom) > Varien_Date::toTimestamp($dateTo)) {
63	+ Mage::throwException(Mage::helper('core')->__('Start date cannot be greater than end date.'));
64	+ }





65	}
66
67	$check = $this->_checkIntersection(
68	$object->getStoreId(),
69	+ $dateFrom,
70	+ $dateTo,
71	$object->getId()
72	);
73

76	Mage::helper('core')->__('Your design change for the specified store intersects with another one, please specify another date range.'));
77	}
78





79	parent::_beforeSave($object);
80	}
81

99
100	$dateConditions = array('date_to IS NULL AND date_from IS NULL');
101
102	+ if (!empty($dateFrom)) {
103	$dateConditions[] = ':date_from BETWEEN date_from AND date_to';
104	$dateConditions[] = ':date_from >= date_from and date_to IS NULL';
105	$dateConditions[] = ':date_from <= date_to and date_from IS NULL';

107	$dateConditions[] = 'date_from IS NULL';
108	}
109
110	+ if (!empty($dateTo)) {
111	$dateConditions[] = ':date_to BETWEEN date_from AND date_to';
112	$dateConditions[] = ':date_to >= date_from AND date_to IS NULL';
113	$dateConditions[] = ':date_to <= date_to AND date_from IS NULL';

115	$dateConditions[] = 'date_to IS NULL';
116	}
117
118	+ if (empty($dateFrom) && !empty($dateTo)) {
119	$dateConditions[] = 'date_to <= :date_to OR date_from <= :date_to';
120	}
121
122	+ if (!empty($dateFrom) && empty($dateTo)) {
123	$dateConditions[] = 'date_to >= :date_from OR date_from >= :date_from';
124	}
125
126	+ if (!empty($dateFrom) && !empty($dateTo)) {
127	$dateConditions[] = 'date_from BETWEEN :date_from AND :date_to';
128	$dateConditions[] = 'date_to BETWEEN :date_from AND :date_to';
129	+ } elseif (empty($dateFrom) && empty($dateTo)) {
130	$dateConditions = array();
131	}
132

141	'current_id' => (int)$currentId,
142	);
143
144	+ if (!empty($dateTo)) {
145	$bind['date_to'] = $dateTo;
146	}
147	+ if (!empty($dateFrom)) {
148	$bind['date_from'] = $dateFrom;
149	}
150

app/code/core/Mage/Core/Model/Store.php CHANGED Viewed

	@@ -52,38 +52,92 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract
52	* Configuration pathes
53	*/
54	const XML_PATH_STORE_STORE_NAME = 'general/store_information/name';



55	const XML_PATH_STORE_STORE_PHONE = 'general/store_information/phone';



56	const XML_PATH_STORE_IN_URL = 'web/url/use_store';



57	const XML_PATH_USE_REWRITES = 'web/seo/use_rewrites';



58	const XML_PATH_UNSECURE_BASE_URL = 'web/unsecure/base_url';



59	const XML_PATH_SECURE_BASE_URL = 'web/secure/base_url';



60	const XML_PATH_SECURE_IN_FRONTEND = 'web/secure/use_in_frontend';



61	const XML_PATH_SECURE_IN_ADMINHTML = 'web/secure/use_in_adminhtml';



62	const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';



63	const XML_PATH_UNSECURE_BASE_LINK_URL = 'web/unsecure/base_link_url';



64	const XML_PATH_OFFLOADER_HEADER = 'web/secure/offloader_header';



65	const XML_PATH_PRICE_SCOPE = 'catalog/price/scope';
66
67	/**
68	* Price scope constants
69	*/
70	const PRICE_SCOPE_GLOBAL = 0;



71	const PRICE_SCOPE_WEBSITE = 1;
72
73	/**
74	* Possible URL types
75	*/
76	const URL_TYPE_LINK = 'link';



77	const URL_TYPE_DIRECT_LINK = 'direct_link';



78	const URL_TYPE_WEB = 'web';



79	const URL_TYPE_SKIN = 'skin';



80	const URL_TYPE_JS = 'js';



81	const URL_TYPE_MEDIA = 'media';
82
83	/**
84	* Code constants
85	*/
86	const DEFAULT_CODE = 'default';



87	const ADMIN_CODE = 'admin';
88
89	/**
	@@ -259,7 +313,7 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract
259	* @param string $field
260	* @return Mage_Core_Model_Store
261	*/
262	- public function load($id, $field=null)
263	{
264	if (!is_numeric($id) && is_null($field)) {
265	$this->_getResource()->load($this, $id, 'code');
	@@ -964,13 +1018,11 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract
964	$this->_priceFilter = $this->getCurrentCurrency()->getFilter();
965	$this->_priceFilter->setRate($this->getBaseCurrency()->getRate($this->getCurrentCurrency()));
966	}
967	- elseif($this->getDefaultCurrency()) {
968	$this->_priceFilter = $this->getDefaultCurrency()->getFilter();
969	- }
970	- else {
971	$this->_priceFilter = new Varien_Filter_Sprintf('%s', 2);
972	}
973	- }
974	return $this->_priceFilter;
975	}
976


52	* Configuration pathes
53	*/
54	const XML_PATH_STORE_STORE_NAME = 'general/store_information/name';
55	+ /**
56	+ *
57	+ */
58	const XML_PATH_STORE_STORE_PHONE = 'general/store_information/phone';
59	+ /**
60	+ *
61	+ */
62	const XML_PATH_STORE_IN_URL = 'web/url/use_store';
63	+ /**
64	+ *
65	+ */
66	const XML_PATH_USE_REWRITES = 'web/seo/use_rewrites';
67	+ /**
68	+ *
69	+ */
70	const XML_PATH_UNSECURE_BASE_URL = 'web/unsecure/base_url';
71	+ /**
72	+ *
73	+ */
74	const XML_PATH_SECURE_BASE_URL = 'web/secure/base_url';
75	+ /**
76	+ *
77	+ */
78	const XML_PATH_SECURE_IN_FRONTEND = 'web/secure/use_in_frontend';
79	+ /**
80	+ *
81	+ */
82	const XML_PATH_SECURE_IN_ADMINHTML = 'web/secure/use_in_adminhtml';
83	+ /**
84	+ *
85	+ */
86	const XML_PATH_SECURE_BASE_LINK_URL = 'web/secure/base_link_url';
87	+ /**
88	+ *
89	+ */
90	const XML_PATH_UNSECURE_BASE_LINK_URL = 'web/unsecure/base_link_url';
91	+ /**
92	+ *
93	+ */
94	const XML_PATH_OFFLOADER_HEADER = 'web/secure/offloader_header';
95	+ /**
96	+ *
97	+ */
98	const XML_PATH_PRICE_SCOPE = 'catalog/price/scope';
99
100	/**
101	* Price scope constants
102	*/
103	const PRICE_SCOPE_GLOBAL = 0;
104	+ /**
105	+ *
106	+ */
107	const PRICE_SCOPE_WEBSITE = 1;
108
109	/**
110	* Possible URL types
111	*/
112	const URL_TYPE_LINK = 'link';
113	+ /**
114	+ *
115	+ */
116	const URL_TYPE_DIRECT_LINK = 'direct_link';
117	+ /**
118	+ *
119	+ */
120	const URL_TYPE_WEB = 'web';
121	+ /**
122	+ *
123	+ */
124	const URL_TYPE_SKIN = 'skin';
125	+ /**
126	+ *
127	+ */
128	const URL_TYPE_JS = 'js';
129	+ /**
130	+ *
131	+ */
132	const URL_TYPE_MEDIA = 'media';
133
134	/**
135	* Code constants
136	*/
137	const DEFAULT_CODE = 'default';
138	+ /**
139	+ *
140	+ */
141	const ADMIN_CODE = 'admin';
142
143	/**

313	* @param string $field
314	* @return Mage_Core_Model_Store
315	*/
316	+ public function load($id, $field = null)
317	{
318	if (!is_numeric($id) && is_null($field)) {
319	$this->_getResource()->load($this, $id, 'code');

1018	$this->_priceFilter = $this->getCurrentCurrency()->getFilter();
1019	$this->_priceFilter->setRate($this->getBaseCurrency()->getRate($this->getCurrentCurrency()));
1020	}
1021	+ } elseif ($this->getDefaultCurrency()) {
1022	$this->_priceFilter = $this->getDefaultCurrency()->getFilter();
1023	+ } else {

1024	$this->_priceFilter = new Varien_Filter_Sprintf('%s', 2);
1025	}

1026	return $this->_priceFilter;
1027	}
1028

app/code/core/Mage/Core/etc/config.xml CHANGED Viewed

	@@ -28,7 +28,7 @@
28	<config>
29	<modules>
30	<Mage_Core>
31	- <version>1.6.0.3</version>
32	</Mage_Core>
33	</modules>
34	<global>


28	<config>
29	<modules>
30	<Mage_Core>
31	+ <version>1.6.0.4</version>
32	</Mage_Core>
33	</modules>
34	<global>

app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php CHANGED Viewed

	@@ -29,7 +29,7 @@ $installer = $this;
29
30	$installer->startSetup();
31
32	- $rows = $installer->_conn->fetchAll("select * from {$this->getTable('core_config_data')} where path in ('~~google/checkout/merchant_id', 'google/checkout/merchant_key', '~~paypal/wpp/api_password', 'paypal/wpp/api_signature', 'paypal/wpp/api_username', 'paypal/wps/business_account', 'paypal/wpuk/user', 'paypal/wpuk/pwd', 'carriers/dhl/id', 'carriers/dhl/password', 'carriers/dhl/shipping_key', 'carriers/dhl/shipping_intlkey', 'carriers/fedex/account', 'carriers/ups/account_license_number', 'carriers/ups/username', 'carriers/usps/userid', 'payment/authorizenet/login', 'payment/authorizenet/trans_key', 'payment/verisign/pwd', 'payment/verisign/user')");
33
34	$hlp = Mage::helper('core');
35	foreach ($rows as $r) {


29
30	$installer->startSetup();
31
32	+ $rows = $installer->_conn->fetchAll("select * from {$this->getTable('core_config_data')} where path in ('paypal/wpp/api_password', 'paypal/wpp/api_signature', 'paypal/wpp/api_username', 'paypal/wps/business_account', 'paypal/wpuk/user', 'paypal/wpuk/pwd', 'carriers/dhl/id', 'carriers/dhl/password', 'carriers/dhl/shipping_key', 'carriers/dhl/shipping_intlkey', 'carriers/fedex/account', 'carriers/ups/account_license_number', 'carriers/ups/username', 'carriers/usps/userid', 'payment/authorizenet/login', 'payment/authorizenet/trans_key', 'payment/verisign/pwd', 'payment/verisign/user')");
33
34	$hlp = Mage::helper('core');
35	foreach ($rows as $r) {

app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php → Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php} RENAMED Viewed

	@@ -19,17 +19,22 @@
19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	- * @package ~~Mage_GoogleCheckout~~
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	- /* @var $installer ~~Mage_GoogleCheckout_Model_Resource_Setup~~ */
28	$installer = $this;
29
30	- $installer->~~updateAttribute~~(
31	- ~~Mage_Catalog_Model_Product::ENTITY,~~
32	- ~~'enable_googlecheckout',~~
33	- ~~'frontend_label',~~
34	- '~~Is Product Available for Purchase with Google Checkout~~'



35	);


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Core
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	+ /* @var $installer Mage_Core_Model_Resource_Setup */
28	$installer = $this;
29
30	+ $installer->startSetup();
31	+ $connection = $installer->getConnection();
32	+
33	+ $connection->delete(
34	+ $this->getTable('core_config_data'),
35	+ $connection->prepareSqlCondition('path', array(
36	+ 'like' => 'google/checkout%'
37	+ ))
38	);
39	+
40	+ $installer->endSetup();

app/code/core/Mage/Customer/Helper/Address.php CHANGED Viewed

	@@ -126,7 +126,7 @@ class Mage_Customer_Helper_Address extends Mage_Core_Helper_Abstract
126	if($lines <= 0) {
127	$lines = 2;
128	}
129	- $this->_streetLines[$websiteId] = min(4, $lines);
130	}
131
132	return $this->_streetLines[$websiteId];


126	if($lines <= 0) {
127	$lines = 2;
128	}
129	+ $this->_streetLines[$websiteId] = min(20, $lines);
130	}
131
132	return $this->_streetLines[$websiteId];

app/code/core/Mage/Customer/Model/Address/Abstract.php CHANGED Viewed

	@@ -53,6 +53,13 @@ class Mage_Customer_Model_Address_Abstract extends Mage_Core_Model_Abstract
53	*/
54	protected $_eventObject = 'customer_address';
55







56	/**
57	* Directory country models
58	*
	@@ -350,53 +357,94 @@ class Mage_Customer_Model_Address_Abstract extends Mage_Core_Model_Abstract
350	/**
351	* Validate address attribute values
352	*
353	- * @return bool
354	*/
355	public function validate()
356	{
357	- $~~errors = array~~();

358	$this->implodeStreetAddress();

359	if (!Zend_Validate::is($this->getFirstname(), 'NotEmpty')) {
360	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the first name.');
361	}
362
363	if (!Zend_Validate::is($this->getLastname(), 'NotEmpty')) {
364	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the last name.');
365	}
366
367	if (!Zend_Validate::is($this->getStreet(1), 'NotEmpty')) {
368	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the street.');
369	}
370
371	if (!Zend_Validate::is($this->getCity(), 'NotEmpty')) {
372	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the city.');
373	}
374
375	if (!Zend_Validate::is($this->getTelephone(), 'NotEmpty')) {
376	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the telephone number.');
377	}
378
379	$_havingOptionalZip = Mage::helper('directory')->getCountriesWithOptionalZip();
380	if (!in_array($this->getCountryId(), $_havingOptionalZip)
381	&& !Zend_Validate::is($this->getPostcode(), 'NotEmpty')
382	) {
383	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the zip/postal code.');
384	}
385
386	if (!Zend_Validate::is($this->getCountryId(), 'NotEmpty')) {
387	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the country.');
388	}
389
390	if ($this->getCountryModel()->getRegionCollection()->getSize()
391	&& !Zend_Validate::is($this->getRegionId(), 'NotEmpty')
392	&& Mage::helper('directory')->isRegionRequired($this->getCountryId())
393	) {
394	- $~~errors[] =~~ Mage::helper('customer')->__('Please enter the state/province.');
395	}
396






397	if (empty($errors) \|\| $this->getShouldIgnoreValidation()) {
398	return true;
399	}
400	return $errors;
401	}

































402	}


53	*/
54	protected $_eventObject = 'customer_address';
55
56	+ /**
57	+ * List of errors
58	+ *
59	+ * @var array
60	+ */
61	+ protected $_errors = array();
62	+
63	/**
64	* Directory country models
65	*

357	/**
358	* Validate address attribute values
359	*
360	+ * @return array \| bool
361	*/
362	public function validate()
363	{
364	+ $this->_resetErrors();
365	+
366	$this->implodeStreetAddress();
367	+
368	if (!Zend_Validate::is($this->getFirstname(), 'NotEmpty')) {
369	+ $this->addError(Mage::helper('customer')->__('Please enter the first name.'));
370	}
371
372	if (!Zend_Validate::is($this->getLastname(), 'NotEmpty')) {
373	+ $this->addError(Mage::helper('customer')->__('Please enter the last name.'));
374	}
375
376	if (!Zend_Validate::is($this->getStreet(1), 'NotEmpty')) {
377	+ $this->addError(Mage::helper('customer')->__('Please enter the street.'));
378	}
379
380	if (!Zend_Validate::is($this->getCity(), 'NotEmpty')) {
381	+ $this->addError(Mage::helper('customer')->__('Please enter the city.'));
382	}
383
384	if (!Zend_Validate::is($this->getTelephone(), 'NotEmpty')) {
385	+ $this->addError(Mage::helper('customer')->__('Please enter the telephone number.'));
386	}
387
388	$_havingOptionalZip = Mage::helper('directory')->getCountriesWithOptionalZip();
389	if (!in_array($this->getCountryId(), $_havingOptionalZip)
390	&& !Zend_Validate::is($this->getPostcode(), 'NotEmpty')
391	) {
392	+ $this->addError(Mage::helper('customer')->__('Please enter the zip/postal code.'));
393	}
394
395	if (!Zend_Validate::is($this->getCountryId(), 'NotEmpty')) {
396	+ $this->addError(Mage::helper('customer')->__('Please enter the country.'));
397	}
398
399	if ($this->getCountryModel()->getRegionCollection()->getSize()
400	&& !Zend_Validate::is($this->getRegionId(), 'NotEmpty')
401	&& Mage::helper('directory')->isRegionRequired($this->getCountryId())
402	) {
403	+ $this->addError(Mage::helper('customer')->__('Please enter the state/province.'));
404	}
405
406	+ Mage::dispatchEvent('customer_address_validation_after', array('address' => $this));
407	+
408	+ $errors = $this->_getErrors();
409	+
410	+ $this->_resetErrors();
411	+
412	if (empty($errors) \|\| $this->getShouldIgnoreValidation()) {
413	return true;
414	}
415	return $errors;
416	}
417	+
418	+ /**
419	+ * Add error
420	+ *
421	+ * @param $error
422	+ * @return Mage_Customer_Model_Address_Abstract
423	+ */
424	+ public function addError($error)
425	+ {
426	+ $this->_errors[] = $error;
427	+ return $this;
428	+ }
429	+
430	+ /**
431	+ * Retreive errors
432	+ *
433	+ * @return array
434	+ */
435	+ protected function _getErrors()
436	+ {
437	+ return $this->_errors;
438	+ }
439	+
440	+ /**
441	+ * Reset errors array
442	+ *
443	+ * @return Mage_Customer_Model_Address_Abstract
444	+ */
445	+ protected function _resetErrors()
446	+ {
447	+ $this->_errors = array();
448	+ return $this;
449	+ }
450	}

app/code/core/Mage/Customer/controllers/AccountController.php CHANGED Viewed

	@@ -136,6 +136,11 @@ class Mage_Customer_AccountController extends Mage_Core_Controller_Front_Action
136	*/
137	public function loginPostAction()
138	{





139	if ($this->_getSession()->isLoggedIn()) {
140	$this->_redirect('//');
141	return;
	@@ -559,8 +564,7 @@ class Mage_Customer_AccountController extends Mage_Core_Controller_Front_Action
559	{
560	$session = $this->_getSession();
561	if ($session->isLoggedIn()) {
562	- $this->~~_redirect~~(~~'//'~~);
563	- return;
564	}
565	try {
566	$id = $this->getRequest()->getParam('id', false);


136	*/
137	public function loginPostAction()
138	{
139	+ if (!$this->_validateFormKey()) {
140	+ $this->_redirect('//');
141	+ return;
142	+ }
143	+
144	if ($this->_getSession()->isLoggedIn()) {
145	$this->_redirect('//');
146	return;

564	{
565	$session = $this->_getSession();
566	if ($session->isLoggedIn()) {
567	+ $this->_getSession()->logout()->regenerateSessionId();

568	}
569	try {
570	$id = $this->getRequest()->getParam('id', false);

app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.3-0.7.4.php → Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php} RENAMED Viewed

	@@ -19,20 +19,23 @@
19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	- * @package ~~Mage_GoogleCheckout~~
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26

27	$installer = $this;
28	- ~~/* @var~~ $~~installer~~ ~~Mage_GoogleCheckout_Model_Mysql4_Setup~~ */


29
30	- ~~$installer->run("~~
31	- ~~CREATE~~ ~~TABLE~~ `{$~~this~~->~~getTable~~('~~googlecheckout/notification~~')~~}` (~~
32	- ~~`serial_number` varchar(30) NOT NULL,~~
33	- ~~`started_at`~~ ~~datetime~~ ~~default NULL,~~
34	- ~~`status`~~ ~~smallint(5)~~ ~~unsigned NOT NULL default '0'~~,
35	- PRIMARY KEY (`serial_number`)
36	- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
37	);
38


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Customer
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	+ /** @var $installer Mage_Customer_Model_Entity_Setup */
28	$installer = $this;
29	+ $datetimeType = 'datetime';
30	+ // implementation new type for static date attributes
31	+ $installer->updateAttribute('customer', 'created_at', 'frontend_input', $datetimeType);
32
33	+ // implement new input filter for datetime type attribute
34	+ $attribute = $installer->getAttribute('customer', 'created_at');
35	+
36	+ $attributeBind = array(
37	+ 'input_filter' => $datetimeType,


38	);
39
40	+ $attributeWhere = $installer->getConnection()->quoteInto('attribute_id=?', $attribute['attribute_id']);
41	+ $installer->getConnection()->update($installer->getTable('customer/eav_attribute'), $attributeBind, $attributeWhere);

app/code/core/Mage/Customer/etc/config.xml CHANGED Viewed

	@@ -28,7 +28,7 @@
28	<config>
29	<modules>
30	<Mage_Customer>
31	- <version>1.6.2.0.1</version>
32	</Mage_Customer>
33	</modules>
34	<admin>


28	<config>
29	<modules>
30	<Mage_Customer>
31	+ <version>1.6.2.0.3</version>
32	</Mage_Customer>
33	</modules>
34	<admin>

app/code/core/Mage/Customer/etc/wsdl.xml CHANGED Viewed

	@@ -11,10 +11,16 @@
11	<element name="email" type="xsd:string" minOccurs="0" />
12	<element name="firstname" type="xsd:string" minOccurs="0" />
13	<element name="lastname" type="xsd:string" minOccurs="0" />

14	<element name="password" type="xsd:string" minOccurs="0" />
15	<element name="website_id" type="xsd:int" minOccurs="0" />
16	<element name="store_id" type="xsd:int" minOccurs="0" />
17	<element name="group_id" type="xsd:int" minOccurs="0" />





18	</all>
19	</complexType>
20	<complexType name="customerCustomerEntity">


11	<element name="email" type="xsd:string" minOccurs="0" />
12	<element name="firstname" type="xsd:string" minOccurs="0" />
13	<element name="lastname" type="xsd:string" minOccurs="0" />
14	+ <element name="middlename" type="xsd:string" minOccurs="0" />
15	<element name="password" type="xsd:string" minOccurs="0" />
16	<element name="website_id" type="xsd:int" minOccurs="0" />
17	<element name="store_id" type="xsd:int" minOccurs="0" />
18	<element name="group_id" type="xsd:int" minOccurs="0" />
19	+ <element name="prefix" type="xsd:string" minOccurs="0" />
20	+ <element name="suffix" type="xsd:string" minOccurs="0" />
21	+ <element name="dob" type="xsd:string" minOccurs="0" />
22	+ <element name="taxvat" type="xsd:string" minOccurs="0" />
23	+ <element name="gender" type="xsd:int" minOccurs="0" />
24	</all>
25	</complexType>
26	<complexType name="customerCustomerEntity">

app/code/core/Mage/Customer/etc/wsi.xml CHANGED Viewed

	@@ -14,10 +14,16 @@
14	<xsd:element name="email" type="xsd:string" minOccurs="0" />
15	<xsd:element name="firstname" type="xsd:string" minOccurs="0" />
16	<xsd:element name="lastname" type="xsd:string" minOccurs="0" />

17	<xsd:element name="password" type="xsd:string" minOccurs="0" />
18	<xsd:element name="website_id" type="xsd:int" minOccurs="0" />
19	<xsd:element name="store_id" type="xsd:int" minOccurs="0" />
20	<xsd:element name="group_id" type="xsd:int" minOccurs="0" />





21	</xsd:sequence>
22	</xsd:complexType>
23	<xsd:complexType name="customerCustomerEntity">


14	<xsd:element name="email" type="xsd:string" minOccurs="0" />
15	<xsd:element name="firstname" type="xsd:string" minOccurs="0" />
16	<xsd:element name="lastname" type="xsd:string" minOccurs="0" />
17	+ <xsd:element name="middlename" type="xsd:string" minOccurs="0" />
18	<xsd:element name="password" type="xsd:string" minOccurs="0" />
19	<xsd:element name="website_id" type="xsd:int" minOccurs="0" />
20	<xsd:element name="store_id" type="xsd:int" minOccurs="0" />
21	<xsd:element name="group_id" type="xsd:int" minOccurs="0" />
22	+ <xsd:element name="prefix" type="xsd:string" minOccurs="0" />
23	+ <xsd:element name="suffix" type="xsd:string" minOccurs="0" />
24	+ <xsd:element name="dob" type="xsd:string" minOccurs="0" />
25	+ <xsd:element name="taxvat" type="xsd:string" minOccurs="0" />
26	+ <xsd:element name="gender" type="xsd:int" minOccurs="0" />
27	</xsd:sequence>
28	</xsd:complexType>
29	<xsd:complexType name="customerCustomerEntity">

app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php ADDED Viewed

	@@ -0,0 +1,82 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Open Software License (OSL 3.0)
8	+ * that is bundled with this package in the file LICENSE.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/osl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category Mage
22	+ * @package Mage_Customer
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	+ */
26	+
27	+ /**
28	+ * @var $this Mage_Catalog_Model_Resource_Setup
29	+ * @var $conn Varien_Db_Adapter_Interface
30	+ */
31	+ $conn = $this->getConnection();
32	+
33	+ //get all duplicated emails
34	+ $select = $conn->select()
35	+ ->from($this->getTable('customer/entity'), array('email', 'website_id', 'cnt' => 'COUNT(*)'))
36	+ ->group('email')
37	+ ->group('website_id')
38	+ ->having('cnt > 1');
39	+ $emails = $conn->fetchAll($select);
40	+
41	+ foreach ($emails as $data) {
42	+ $email = $data['email'];
43	+ $websiteId = $data['website_id'];
44	+
45	+ $select = $conn->select()
46	+ ->from($this->getTable('customer/entity'), array('entity_id'))
47	+ ->where('email = ?', $email)
48	+ ->where('website_id = ?', $websiteId);
49	+ $activeId = $conn->fetchOne($select);
50	+
51	+ //receive all other duplicated customer ids
52	+ $select = $conn->select()
53	+ ->from($this->getTable('customer/entity'), array('entity_id', 'email'))
54	+ ->where('email = ?', $email)
55	+ ->where('website_id = ?', $websiteId)
56	+ ->where('entity_id <> ?', $activeId);
57	+ $result = $conn->fetchAll($select);
58	+
59	+ //change email to unique value
60	+ foreach ($result as $row) {
61	+ $changedEmail = $conn->getConcatSql(array('"(duplicate"', $row['entity_id'], '")"', '"' . $row['email'] . '"'));
62	+ $conn->update(
63	+ $this->getTable('customer/entity'),
64	+ array('email' => $changedEmail),
65	+ array('entity_id =?' => $row['entity_id'])
66	+ );
67	+ }
68	+ }
69	+
70	+ /**
71	+ * Add unique index for customer_entity table
72	+ */
73	+ $conn->addIndex(
74	+ $this->getTable('customer/entity'),
75	+ $this->getIdxName(
76	+ 'customer/entity',
77	+ array('email', 'website_id'),
78	+ Varien_Db_Adapter_Interface::INDEX_TYPE_UNIQUE
79	+ ),
80	+ array('email', 'website_id'),
81	+ Varien_Db_Adapter_Interface::INDEX_TYPE_UNIQUE
82	+ );

app/code/core/Mage/Directory/Model/Currency.php CHANGED Viewed

	@@ -34,12 +34,21 @@
34	class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
35	{
36	/**
37	- * CONFIG path ~~constants~~
38	*/
39	const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';



40	const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';



41	const XML_PATH_CURRENCY_BASE = 'currency/options/base';
42



43	protected $_filter;
44
45	/**
	@@ -50,6 +59,9 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
50	protected $_rates;
51
52



53	protected function _construct()
54	{
55	$this->_init('directory/currency');
	@@ -65,6 +77,11 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
65	return $this->_getData('currency_code');
66	}
67





68	public function getCurrencyCode()
69	{
70	return $this->_getData('currency_code');
	@@ -99,7 +116,7 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
99	* @param string $field
100	* @return Mage_Directory_Model_Currency
101	*/
102	- public function load($id, $field=null)
103	{
104	$this->unsRate();
105	$this->setData('currency_code', $id);
	@@ -109,8 +126,9 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
109	/**
110	* Get currency rate (only base=>allowed)
111	*
112	- * @param string $toCurrency
113	- * @return ~~double~~

114	*/
115	public function getRate($toCurrency)
116	{
	@@ -132,8 +150,9 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
132	/**
133	* Get currency rate (base=>allowed or allowed=>base)
134	*
135	- * @param string $toCurrency
136	- * @return ~~double~~

137	*/
138	public function getAnyRate($toCurrency)
139	{
	@@ -155,20 +174,24 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
155	/**
156	* Convert price to currency format
157	*
158	- * @param ~~double~~ $price
159	- * @param string $toCurrency
160	- * @return ~~double~~

161	*/
162	- public function convert($price, $toCurrency=null)
163	{
164	if (is_null($toCurrency)) {
165	return $price;
166	- }
167	- ~~elseif (~~$rate = $this->getRate($toCurrency)~~) {~~
168	- ~~return~~ $~~price*$~~rate;


169	}
170
171	- throw new Exception(Mage::helper('directory')->__('Undefined rate from "%s-%s".', $this->getCode(), ~~$toCurrency->getCode()));~~

172	}
173
174	/**
	@@ -188,11 +211,13 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
188	/**
189	* Format price to currency format
190	*
191	- * @param ~~double~~ $price
192	- * @param ~~bool~~ $~~includeContainer~~
193	- * @~~return string~~


194	*/
195	- public function format($price, $options=array(), $includeContainer = true, $addBrackets = false)
196	{
197	return $this->formatPrecision($price, 2, $options, $includeContainer, $addBrackets);
198	}
	@@ -207,18 +232,27 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
207	* @param bool $addBrackets
208	* @return string
209	*/
210	- public function formatPrecision($price, $precision, $options=array(), $includeContainer = true, ~~$addBrackets = false)~~

211	{
212	if (!isset($options['precision'])) {
213	$options['precision'] = $precision;
214	}
215	if ($includeContainer) {
216	- return '<span class="price">' . ($addBrackets ? '[' : '') . $this->formatTxt($price, $options) . ~~($addBrackets ? ']' : '') . '</span>';~~

217	}
218	return $this->formatTxt($price, $options);
219	}
220
221	- ~~public function formatTxt($price, $options=array())~~







222	{
223	if (!is_numeric($price)) {
224	$price = Mage::app()->getLocale()->getNumber($price);
	@@ -230,19 +264,28 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
230	* %F - the argument is treated as a float, and presented as a floating-point number (non-locale aware).
231	*/
232	$price = sprintf("%F", $price);



233	return Mage::app()->getLocale()->currency($this->getCode())->toCurrency($price, $options);
234	}
235





236	public function getOutputFormat()
237	{
238	$formated = $this->formatTxt(0);
239	- $number = $this->formatTxt(0, array('display'=>Zend_Currency::NO_SYMBOL));
240	return str_replace($number, '%s', $formated);
241	}
242
243	/**
244	* Retrieve allowed currencies according to config
245	*

246	*/
247	public function getConfigAllowCurrencies()
248	{
	@@ -264,6 +307,7 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
264	/**
265	* Retrieve default currencies according to config
266	*

267	*/
268	public function getConfigDefaultCurrencies()
269	{
	@@ -272,6 +316,11 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
272	}
273
274





275	public function getConfigBaseCurrencies()
276	{
277	$defaultCurrencies = $this->_getResource()->getConfigCurrencies($this, self::XML_PATH_CURRENCY_BASE);
	@@ -285,7 +334,7 @@ class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
285	* @param array $toCurrencies
286	* @return array
287	*/
288	- public function getCurrencyRates($currency, $toCurrencies=null)
289	{
290	if ($currency instanceof Mage_Directory_Model_Currency) {
291	$currency = $currency->getCode();


34	class Mage_Directory_Model_Currency extends Mage_Core_Model_Abstract
35	{
36	/**
37	+ * CONFIG path constant: ALLOW
38	*/
39	const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';
40	+ /**
41	+ * CONFIG path constant: DEFAULT
42	+ */
43	const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';
44	+ /**
45	+ * CONFIG path constant: BASE
46	+ */
47	const XML_PATH_CURRENCY_BASE = 'currency/options/base';
48
49	+ /**
50	+ * @var Mage_Directory_Model_Currency_Filter - currency filter
51	+ */
52	protected $_filter;
53
54	/**

59	protected $_rates;
60
61
62	+ /**
63	+ * Class constructor
64	+ */
65	protected function _construct()
66	{
67	$this->_init('directory/currency');

77	return $this->_getData('currency_code');
78	}
79
80	+ /**
81	+ * Get currency code
82	+ *
83	+ * @return string
84	+ */
85	public function getCurrencyCode()
86	{
87	return $this->_getData('currency_code');

116	* @param string $field
117	* @return Mage_Directory_Model_Currency
118	*/
119	+ public function load($id, $field = null)
120	{
121	$this->unsRate();
122	$this->setData('currency_code', $id);

126	/**
127	* Get currency rate (only base=>allowed)
128	*
129	+ * @param string\|Mage_Directory_Model_Currency $toCurrency
130	+ * @return string
131	+ * @throws Mage_Core_Exception
132	*/
133	public function getRate($toCurrency)
134	{

150	/**
151	* Get currency rate (base=>allowed or allowed=>base)
152	*
153	+ * @param string\|Mage_Directory_Model_Currency $toCurrency
154	+ * @return string
155	+ * @throws Mage_Core_Exception
156	*/
157	public function getAnyRate($toCurrency)
158	{

174	/**
175	* Convert price to currency format
176	*
177	+ * @param float $price
178	+ * @param null\|string\|Mage_Directory_Model_Currency $toCurrency
179	+ * @return float
180	+ * @throws Exception
181	*/
182	+ public function convert($price, $toCurrency = null)
183	{
184	if (is_null($toCurrency)) {
185	return $price;
186	+ } else {
187	+ $rate = $this->getRate($toCurrency);
188	+ if ($rate) {
189	+ return $price * $rate;
190	+ }
191	}
192
193	+ throw new Exception(Mage::helper('directory')->__('Undefined rate from "%s-%s".', $this->getCode(),
194	+ $toCurrency->getCode()));
195	}
196
197	/**

211	/**
212	* Format price to currency format
213	*
214	+ * @param float $price
215	+ * @param array $options
216	+ * @param bool $includeContainer
217	+ * @param bool $addBrackets
218	+ * @return string
219	*/
220	+ public function format($price, $options = array(), $includeContainer = true, $addBrackets = false)
221	{
222	return $this->formatPrecision($price, 2, $options, $includeContainer, $addBrackets);
223	}

232	* @param bool $addBrackets
233	* @return string
234	*/
235	+ public function formatPrecision($price, $precision, $options = array(), $includeContainer = true,
236	+ $addBrackets = false)
237	{
238	if (!isset($options['precision'])) {
239	$options['precision'] = $precision;
240	}
241	if ($includeContainer) {
242	+ return '<span class="price">' . ($addBrackets ? '[' : '') . $this->formatTxt($price, $options) .
243	+ ($addBrackets ? ']' : '') . '</span>';
244	}
245	return $this->formatTxt($price, $options);
246	}
247
248	+ /**
249	+ * Returns the formatted price
250	+ *
251	+ * @param float $price
252	+ * @param null\|array $options
253	+ * @return string
254	+ */
255	+ public function formatTxt($price, $options = array())
256	{
257	if (!is_numeric($price)) {
258	$price = Mage::app()->getLocale()->getNumber($price);

264	* %F - the argument is treated as a float, and presented as a floating-point number (non-locale aware).
265	*/
266	$price = sprintf("%F", $price);
267	+ if ($price == -0) {
268	+ $price = 0;
269	+ }
270	return Mage::app()->getLocale()->currency($this->getCode())->toCurrency($price, $options);
271	}
272
273	+ /**
274	+ * Returns the formatting template for numbers
275	+ *
276	+ * @return string
277	+ */
278	public function getOutputFormat()
279	{
280	$formated = $this->formatTxt(0);
281	+ $number = $this->formatTxt(0, array('display' => Zend_Currency::NO_SYMBOL));
282	return str_replace($number, '%s', $formated);
283	}
284
285	/**
286	* Retrieve allowed currencies according to config
287	*
288	+ * @return array
289	*/
290	public function getConfigAllowCurrencies()
291	{

307	/**
308	* Retrieve default currencies according to config
309	*
310	+ * @return array
311	*/
312	public function getConfigDefaultCurrencies()
313	{

316	}
317
318
319	+ /**
320	+ * Retrieve base currencies according to config
321	+ *
322	+ * @return array
323	+ */
324	public function getConfigBaseCurrencies()
325	{
326	$defaultCurrencies = $this->_getResource()->getConfigCurrencies($this, self::XML_PATH_CURRENCY_BASE);

334	* @param array $toCurrencies
335	* @return array
336	*/
337	+ public function getCurrencyRates($currency, $toCurrencies = null)
338	{
339	if ($currency instanceof Mage_Directory_Model_Currency) {
340	$currency = $currency->getCode();

app/code/core/Mage/Directory/Model/Resource/Region/Collection.php CHANGED Viewed

	@@ -180,7 +180,7 @@ class Mage_Directory_Model_Resource_Region_Collection extends Mage_Core_Model_Re
180	if (count($options) > 0) {
181	array_unshift($options, array(
182	'title '=> null,
183	- 'value' => ~~'0'~~,
184	'label' => Mage::helper('directory')->__('-- Please select --')
185	));
186	}


180	if (count($options) > 0) {
181	array_unshift($options, array(
182	'title '=> null,
183	+ 'value' => "",
184	'label' => Mage::helper('directory')->__('-- Please select --')
185	));
186	}

app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-install-0.7.0.php → Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php} RENAMED Viewed

@@ -19,28 +19,41 @@
              * needs please refer to http://www.magentocommerce.com for more information.
+             *
              * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
              * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
              * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
              */
             $installer = $this;
-            -
            /* @var $installer Mage_GoogleCheckout_Model_Mysql4_Setup */
-            -
             $installer->startSetup();
-            -
            $installer->run("
-            -
            -- drop table if exists {$this->getTable('googlecheckout_api_debug')};
-            -
            CREATE TABLE {$this->getTable('googlecheckout_api_debug')} (
-            -
              `debug_id` int(10) unsigned NOT NULL auto_increment,
-            -
              `dir` enum('in', 'out'),
-            -
              `url` varchar(255),
-            -
              `request_body` text,
-            -
              `response_body` text,
-            -
              PRIMARY KEY  (`debug_id`)
-            -
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-            -
                ");
             $installer->endSetup();


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Directory
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	+ /* @var $installer Mage_Core_Model_Resource_Setup */
28	$installer = $this;


29	$installer->startSetup();
30
31	+ /* @var $connection Varien_Db_Adapter_Pdo_Mysql */
32	+ $connection = $installer->getConnection();
33	+
34	+ $regionTable = $installer->getTable('directory/country_region');
35	+
36	+ /* Armed Forces changes based on USPS */
37	+
38	+ /* Armed Forces Middle East (AM) is now served by Armed Forces Europe (AE) */
39	+ $bind = array('code' => 'AE');
40	+ $where = array('code = ?' => 'AM');
41	+
42	+ $connection->update($regionTable, $bind, $where);
43	+
44	+ /* Armed Forces Canada (AC) is now served by Armed Forces Europe (AE) */
45	+ $bind = array('code' => 'AE');
46	+ $where = array('code = ?' => 'AC');
47	+
48	+ $connection->update($regionTable, $bind, $where);
49	+
50	+
51	+ /* Armed Forces Africa (AF) is now served by Armed Forces Europe (AE) */
52	+ $bind = array('code' => 'AE');
53	+ $where = array('code = ?' => 'AF');
54	+
55	+ $connection->update($regionTable, $bind, $where);
56









57

58
59	$installer->endSetup();

app/code/core/Mage/{GoogleCheckout/Model/Resource/Api/Debug.php → Eav/Model/Attribute/Data/Datetime.php} RENAMED Viewed

	@@ -19,27 +19,49 @@
19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	- * @package ~~Mage_GoogleCheckout~~
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27
28	/**
29	- * ~~Enter~~ ~~description~~ ~~here~~ ~~...~~
30	*
31	* @category Mage
32	- * @package ~~Mage_GoogleCheckout~~
33	* @author Magento Core Team <core@magentocommerce.com>
34	*/
35	- class ~~Mage_GoogleCheckout_Model_Resource_Api_Debug~~ extends ~~Mage_Core_Model_Resource_Db_Abstract~~
36	{
37	/**
38	- * ~~Resource~~ ~~constructor~~
39	*

40	*/
41	- protected function ~~_construct~~()
42	{
43	- $this->~~_init~~(~~'googlecheckout/api_debug', 'debug_id'~~);





















44	}
45	}


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Eav
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27
28	/**
29	+ * EAV Entity Attribute Date time Data Model
30	*
31	* @category Mage
32	+ * @package Mage_Eav
33	* @author Magento Core Team <core@magentocommerce.com>
34	*/
35	+ class Mage_Eav_Model_Attribute_Data_Datetime extends Mage_Eav_Model_Attribute_Data_Date
36	{
37	/**
38	+ * Return Data Form Input/Output Filter
39	*
40	+ * @return Varien_Data_Form_Filter_Interface\|false
41	*/
42	+ protected function _getFormFilter()
43	{
44	+ $filterCode = $this->getAttribute()->getInputFilter();
45	+ if ($filterCode) {
46	+ $filterClass = 'Varien_Data_Form_Filter_' . ucfirst($filterCode);
47	+ if ($filterCode == 'datetime') {
48	+ $filter = new $filterClass(
49	+ $this->_getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT),
50	+ $this->_getLocale()->getLocale());
51	+ } else {
52	+ $filter = new $filterClass();
53	+ }
54	+ return $filter;
55	+ }
56	+ return false;
57	+ }
58	+
59	+ /**
60	+ * Get Locale
61	+ *
62	+ * @return Mage_Core_Model_Locale
63	+ */
64	+ protected function _getLocale(){
65	+ return Mage::app()->getLocale();
66	}
67	}

app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php CHANGED Viewed

@@ -35,6 +35,7 @@ class Mage_Eav_Model_Entity_Attribute_Backend_Time_Created extends Mage_Eav_Mode
+            {
                 /**
                  * Set created date
+                 *
                  * @param Mage_Core_Model_Object $object
                  * @return Mage_Eav_Model_Entity_Attribute_Backend_Time_Created
@@ -42,10 +43,36 @@ class Mage_Eav_Model_Entity_Attribute_Backend_Time_Created extends Mage_Eav_Mode
                 public function beforeSave($object)
+                {
                     $attributeCode = $this->getAttribute()->getAttributeCode();
-            -
                    if ($object->isObjectNew() && is_null($object->getData($attributeCode))) {
-            -
                        $object->setData($attributeCode, Varien_Date::now());
+                    }
                     return $this;
+                }
+            }


35	{
36	/**
37	* Set created date
38	+ * Set created date in UTC time zone
39	*
40	* @param Mage_Core_Model_Object $object
41	* @return Mage_Eav_Model_Entity_Attribute_Backend_Time_Created

43	public function beforeSave($object)
44	{
45	$attributeCode = $this->getAttribute()->getAttributeCode();
46	+ $date = $object->getData($attributeCode);
47	+ if (is_null($date)) {
48	+ if ($object->isObjectNew()) {
49	+ $object->setData($attributeCode, Varien_Date::now());
50	+ }
51	+ } else {
52	+ // convert to UTC
53	+ $zendDate = Mage::app()->getLocale()->utcDate(null, $date, true);
54	+ $object->setData($attributeCode, $zendDate->getIso());
55	}
56
57	return $this;
58	}
59	+
60	+ /**
61	+ * Convert create date from UTC to current store time zone
62	+ *
63	+ * @param Varien_Object $object
64	+ * @return Mage_Eav_Model_Entity_Attribute_Backend_Time_Created
65	+ */
66	+ public function afterLoad($object)
67	+ {
68	+ $attributeCode = $this->getAttribute()->getAttributeCode();
69	+ $date = $object->getData($attributeCode);
70	+
71	+ $zendDate = Mage::app()->getLocale()->storeDate(null, $date, true);
72	+ $object->setData($attributeCode, $zendDate->getIso());
73	+
74	+ parent::afterLoad($object);
75	+
76	+ return $this;
77	+ }
78	}

app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php CHANGED Viewed

	@@ -431,7 +431,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute extends Mage_Core_Model_Resource_
431	public function getFlatUpdateSelect(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $storeId)
432	{
433	$adapter = $this->_getReadAdapter();
434	- $joinConditionTemplate = "%s.entity_id=%s.entity_id"
435	." AND %s.entity_type_id = ".$attribute->getEntityTypeId()
436	." AND %s.attribute_id = ".$attribute->getId()
437	." AND %s.store_id = %d";
	@@ -452,7 +452,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute extends Mage_Core_Model_Resource_
452	array())
453	->joinLeft(
454	array('t2' => $attribute->getBackend()->getTable()),
455	- sprintf($joinConditionTemplate, 't1', 't2', 't2', 't2', 't2', $storeId),
456	array($attribute->getAttributeCode() => $valueExpr));
457	if ($attribute->getFlatAddChildData()) {
458	$select->where("e.is_child = ?", 0);


431	public function getFlatUpdateSelect(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $storeId)
432	{
433	$adapter = $this->_getReadAdapter();
434	+ $joinConditionTemplate = "%s.entity_id = %s.entity_id"
435	." AND %s.entity_type_id = ".$attribute->getEntityTypeId()
436	." AND %s.attribute_id = ".$attribute->getId()
437	." AND %s.store_id = %d";

452	array())
453	->joinLeft(
454	array('t2' => $attribute->getBackend()->getTable()),
455	+ sprintf($joinConditionTemplate, 'e', 't2', 't2', 't2', 't2', $storeId),
456	array($attribute->getAttributeCode() => $valueExpr));
457	if ($attribute->getFlatAddChildData()) {
458	$select->where("e.is_child = ?", 0);

app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php CHANGED Viewed

	@@ -108,7 +108,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute_Option extends Mage_Core_Model_Re
108	$select = $adapter->select()
109	->joinLeft(array('t1' => $attributeTable), $joinCondition, array())
110	->joinLeft(array('t2' => $attributeTable),
111	- sprintf($joinConditionTemplate, 't1', 't2', 't2', 't2', 't2', $store),
112	array($attributeCode => $valueExpr));
113
114	if (($attribute->getFrontend()->getInputType() != 'multiselect') && $hasValueField) {
	@@ -122,7 +122,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute_Option extends Mage_Core_Model_Re
122	}
123
124	if ($attribute->getFlatAddChildData()) {
125	- $select->where('e.is_child = 0');
126	}
127
128	return $select;


108	$select = $adapter->select()
109	->joinLeft(array('t1' => $attributeTable), $joinCondition, array())
110	->joinLeft(array('t2' => $attributeTable),
111	+ sprintf($joinConditionTemplate, 'e', 't2', 't2', 't2', 't2', $store),
112	array($attributeCode => $valueExpr));
113
114	if (($attribute->getFrontend()->getInputType() != 'multiselect') && $hasValueField) {

122	}
123
124	if ($attribute->getFlatAddChildData()) {
125	+ $select->where("e.is_child = ?", 0);
126	}
127
128	return $select;

app/code/core/Mage/Eav/etc/config.xml CHANGED Viewed

	@@ -28,7 +28,7 @@
28	<config>
29	<modules>
30	<Mage_Eav>
31	- <version>1.6.0.0</version>
32	</Mage_Eav>
33	</modules>
34	<global>


28	<config>
29	<modules>
30	<Mage_Eav>
31	+ <version>1.6.0.1</version>
32	</Mage_Eav>
33	</modules>
34	<global>

app/code/core/Mage/{GoogleCheckout/sql/googlecheckout_setup/mysql4-upgrade-0.7.2-0.7.3.php → Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php} RENAMED Viewed

	@@ -19,18 +19,20 @@
19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	- * @package ~~Mage_GoogleCheckout~~
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26

27	$installer = $this;
28	- /* @var $installer Mage_GoogleCheckout_Model_Mysql4_Setup */
29
30	$installer->startSetup();

31
32	- $~~installer~~->~~updateAttribute~~(~~'catalog_product', 'enable_googlecheckout', array(~~
33	- '~~default_value~~' ~~=> '1'~~,
34	- ));

35
36	$installer->endSetup();


19	* needs please refer to http://www.magentocommerce.com for more information.
20	*
21	* @category Mage
22	+ * @package Mage_Eav
23	* @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	+ /* @var $installer Mage_Core_Model_Resource_Setup */
28	$installer = $this;

29
30	$installer->startSetup();
31	+ $connection = $installer->getConnection();
32
33	+ $connection->delete(
34	+ $this->getTable('eav/attribute'),
35	+ $connection->prepareSqlCondition('attribute_code', 'enable_googlecheckout')
36	+ );
37
38	$installer->endSetup();

app/code/core/Mage/GoogleAnalytics/Block/Ga.php CHANGED Viewed

	@@ -92,6 +92,7 @@ class Mage_GoogleAnalytics_Block_Ga extends Mage_Core_Block_Template
92	}
93	return "
94	_gaq.push(['_setAccount', '{$this->jsQuoteEscape($accountId)}']);

95	_gaq.push(['_trackPageview'{$optPageURL}]);
96	";
97	}
	@@ -151,7 +152,19 @@ _gaq.push(['_trackPageview'{$optPageURL}]);
151	if (!Mage::helper('googleanalytics')->isGoogleAnalyticsAvailable()) {
152	return '';
153	}
154	-
155	return parent::_toHtml();
156	}













157	}


92	}
93	return "
94	_gaq.push(['_setAccount', '{$this->jsQuoteEscape($accountId)}']);
95	+ " . $this->_getAnonymizationCode() . "
96	_gaq.push(['_trackPageview'{$optPageURL}]);
97	";
98	}

152	if (!Mage::helper('googleanalytics')->isGoogleAnalyticsAvailable()) {
153	return '';
154	}

155	return parent::_toHtml();
156	}
157	+
158	+ /**
159	+ * Render IP anonymization code for page tracking javascript code
160	+ *
161	+ * @return string
162	+ */
163	+ protected function _getAnonymizationCode()
164	+ {
165	+ if (!Mage::helper('googleanalytics')->isIpAnonymizationEnabled()) {
166	+ return '';
167	+ }
168	+ return "_gaq.push (['_gat._anonymizeIp']);";
169	+ }
170	}

app/code/core/Mage/GoogleAnalytics/Helper/Data.php CHANGED Viewed

	@@ -36,8 +36,9 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
36	/**
37	* Config paths for using throughout the code
38	*/
39	- const XML_PATH_ACTIVE = 'google/analytics/active';
40	- const XML_PATH_ACCOUNT = 'google/analytics/account';

41
42	/**
43	* Whether GA is ready to use
	@@ -50,4 +51,15 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
50	$accountId = Mage::getStoreConfig(self::XML_PATH_ACCOUNT, $store);
51	return $accountId && Mage::getStoreConfigFlag(self::XML_PATH_ACTIVE, $store);
52	}











53	}


36	/**
37	* Config paths for using throughout the code
38	*/
39	+ const XML_PATH_ACTIVE = 'google/analytics/active';
40	+ const XML_PATH_ACCOUNT = 'google/analytics/account';
41	+ const XML_PATH_ANONYMIZATION = 'google/analytics/anonymization';
42
43	/**
44	* Whether GA is ready to use

51	$accountId = Mage::getStoreConfig(self::XML_PATH_ACCOUNT, $store);
52	return $accountId && Mage::getStoreConfigFlag(self::XML_PATH_ACTIVE, $store);
53	}
54	+
55	+ /**
56	+ * Whether GA IP Anonymization is enabled
57	+ *
58	+ * @param null $store
59	+ * @return bool
60	+ */
61	+ public function isIpAnonymizationEnabled($store = null)
62	+ {
63	+ return Mage::getStoreConfigFlag(self::XML_PATH_ANONYMIZATION, $store);
64	+ }
65	}

app/code/core/Mage/GoogleAnalytics/Model/Observer.php CHANGED Viewed

@@ -33,12 +33,6 @@
              */
             class Mage_GoogleAnalytics_Model_Observer
+            {
-            -
                /**
-            -
                 * Whether the google checkout inclusion link was rendered by this observer instance
-            -
                 * @var bool
-            -
                 */
-            -
                protected $_isGoogleCheckoutLinkAdded = false;
-            -
                 /**
                  * Create Google Analytics block for success page view
+                 *
@@ -66,37 +60,4 @@ class Mage_GoogleAnalytics_Model_Observer
                         $block->setOrderIds($orderIds);
+                    }
+                }
-            -
-            -
                /**
-            -
                 * Add google analytics tracking to google checkout shortcuts
-            -
                 *
-            -
                 * If there is at least one GC button on the page, there should be the script for GA/GC integration included
-            -
                 * a each shortcut should track submits to GA
-            -
                 * There should be no tracking if there is no GA available
-            -
                 * This method assumes that the observer instance is run as a "singleton" (through Mage::getSingleton())
-            -
                 *
-            -
                 * @param Varien_Event_Observer $observer
-            -
                 */
-            -
                public function injectAnalyticsInGoogleCheckoutLink(Varien_Event_Observer $observer)
-            -
                {
-            -
                    $block = $observer->getEvent()->getBlock();
-            -
                    if (!$block || !Mage::helper('googleanalytics')->isGoogleAnalyticsAvailable()) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // make sure to track google checkout "onsubmit"
-            -
                    $onsubmitJs = $block->getOnsubmitJs();
-            -
                    $block->setOnsubmitJs($onsubmitJs . ($onsubmitJs ? '; ' : '') . '_gaq.push(function() {var pageTracker = _gaq._getAsyncTracker(); setUrchinInputCode(pageTracker);});');
-            -
-            -
                    // add a link that includes google checkout/analytics script, to the first instance of the link block
-            -
                    if ($this->_isGoogleCheckoutLinkAdded) {
-            -
                        return;
-            -
                    }
-            -
                    $beforeHtml = $block->getBeforeHtml();
-            -
                    $protocol = Mage::app()->getStore()->isCurrentlySecure() ? 'https' : 'http';
-            -
                    $block->setBeforeHtml($beforeHtml . '<script src="' . $protocol
-            -
                        . '://checkout.google.com/files/digital/ga_post.js" type="text/javascript"></script>'
-            -
                    );
-            -
                    $this->_isGoogleCheckoutLinkAdded = true;
-            -
                }
+            }

              */
             class Mage_GoogleAnalytics_Model_Observer
+            {
                 /**
                  * Create Google Analytics block for success page view
+                 *
                         $block->setOrderIds($orderIds);
+                    }
+                }
+            }

app/code/core/Mage/GoogleAnalytics/etc/config.xml CHANGED Viewed

	@@ -75,14 +75,6 @@
75	</googleanalytics_order_success>
76	</observers>
77	</checkout_multishipping_controller_success_action>
78	- <googlecheckout_block_link_html_before>
79	- <observers>
80	- <googleanalytics_googlecheckout_integration>
81	- <class>googleanalytics/observer</class>
82	- <method>injectAnalyticsInGoogleCheckoutLink</method>
83	- </googleanalytics_googlecheckout_integration>
84	- </observers>
85	- </googlecheckout_block_link_html_before>
86	</events>
87	<layout>
88	<updates>


75	</googleanalytics_order_success>
76	</observers>
77	</checkout_multishipping_controller_success_action>








78	</events>
79	<layout>
80	<updates>

app/code/core/Mage/GoogleAnalytics/etc/system.xml CHANGED Viewed

	@@ -61,6 +61,15 @@
61	<show_in_website>1</show_in_website>
62	<show_in_store>1</show_in_store>
63	</account>









64	</fields>
65	</analytics>
66	</groups>


61	<show_in_website>1</show_in_website>
62	<show_in_store>1</show_in_store>
63	</account>
64	+ <anonymization translate="label">
65	+ <label>Enable IP anonymization</label>
66	+ <frontend_type>select</frontend_type>
67	+ <source_model>adminhtml/system_config_source_yesno</source_model>
68	+ <sort_order>30</sort_order>
69	+ <show_in_default>1</show_in_default>
70	+ <show_in_website>1</show_in_website>
71	+ <show_in_store>1</show_in_store>
72	+ </anonymization>
73	</fields>
74	</analytics>
75	</groups>

app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Applicable/Countries.php DELETED Viewed

@@ -1,65 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Applicable_Countries
-            -
                extends Mage_Adminhtml_Block_System_Config_Form_Field
-            -
            {
-            -
                protected $_addRowButtonHtml = array();
-            -
                protected $_removeRowButtonHtml = array();
-            -
-            -
                protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
-            -
                {
-            -
                    $html = parent::_getElementHtml($element);
-            -
                    $html .= $this->_appendJs($element);
-            -
                    return $html;
-            -
                }
-            -
-            -
                protected function _appendJs($element)
-            -
                {
-            -
                    $elId = $element->getHtmlId();
-            -
                    $childId = str_replace('sallowspecific', 'specificcountry', $elId);
-            -
                    $html = "<script type='text/javascript'>
-            -
                    var dwvie = function ()
-            -
                    {
-            -
                        var valueSelectId = '{$elId}';
-            -
                        var elementToDisableId = '{$childId}';
-            -
-            -
                        var source = $(valueSelectId);
-            -
                        var target = $(elementToDisableId);
-            -
-            -
                        if (source.options[source.selectedIndex].value == '0') {
-            -
                            target.disabled = true;
-            -
                        } else {
-            -
                            target.disabled = false;
-            -
                        }
-            -
                    }
-            -
-            -
                    Event.observe('{$elId}', 'change', dwvie);
-            -
                    Event.observe(window, 'load', dwvie);
-            -
                    </script>";
-            -
                    return $html;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Block/Adminhtml/Shipping/Merchant.php DELETED Viewed

@@ -1,181 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Block_Adminhtml_Shipping_Merchant
-            -
                extends Mage_Adminhtml_Block_System_Config_Form_Field
-            -
            {
-            -
                protected $_addRowButtonHtml = array();
-            -
                protected $_removeRowButtonHtml = array();
-            -
-            -
                protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
-            -
                {
-            -
                    $this->setElement($element);
-            -
-            -
                    $html = '<div id="merchant_allowed_methods_template" style="display:none">';
-            -
                    $html .= $this->_getRowTemplateHtml();
-            -
                    $html .= '</div>';
-            -
-            -
                    $html .= '<ul id="merchant_allowed_methods_container">';
-            -
                    if ($this->_getValue('method')) {
-            -
                        foreach ($this->_getValue('method') as $i => $f) {
-            -
                            if ($i) {
-            -
                                $html .= $this->_getRowTemplateHtml($i);
-            -
                            }
-            -
                        }
-            -
                    }
-            -
                    $html .= '</ul>';
-            -
                    $html .= $this->_getAddRowButtonHtml('merchant_allowed_methods_container',
-            -
                        'merchant_allowed_methods_template', $this->__('Add Shipping Method'));
-            -
-            -
                    return $html;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve html template for shipping method row
-            -
                 *
-            -
                 * @param int $rowIndex
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getRowTemplateHtml($rowIndex = 0)
-            -
                {
-            -
                    $html = '<li>';
-            -
                    $html .= '<select name="' . $this->getElement()->getName() . '[method][]" ' . $this->_getDisabled() . '>';
-            -
                    $html .= '<option value="">' . $this->__('* Select shipping method') . '</option>';
-            -
-            -
                    foreach ($this->getShippingMethods() as $carrierCode => $carrier) {
-            -
                        $html .= '<optgroup label="' . $this->escapeHtml($carrier['title'])
-            -
                            . '" style="border-top:solid 1px black; margin-top:3px;">';
-            -
-            -
                        foreach ($carrier['methods'] as $methodCode => $method) {
-            -
                            $code = $carrierCode . '/' . $methodCode;
-            -
                            $html .= '<option value="' . $this->escapeHtml($code) . '" '
-            -
                                . $this->_getSelected('method/' . $rowIndex, $code)
-            -
                                . ' style="background:white;">' . $this->escapeHtml($method['title']) . '</option>';
-            -
                        }
-            -
                        $html .= '</optgroup>';
-            -
                    }
-            -
                    $html .= '</select>';
-            -
-            -
                    $html .= '<div style="margin:5px 0 10px;">';
-            -
                    $html .= '<label>' . $this->__('Default price:') . '</label> ';
-            -
                    $html .= '<input class="input-text" style="width:70px;" name="'
-            -
                        . $this->getElement()->getName() . '[price][]" value="'
-            -
                        . $this->_getValue('price/' . $rowIndex) . '" ' . $this->_getDisabled() . '/> ';
-            -
-            -
                    $html .= $this->_getRemoveRowButtonHtml();
-            -
                    $html .= '</div>';
-            -
                    $html .= '</li>';
-            -
-            -
                    return $html;
-            -
                }
-            -
-            -
                protected function getShippingMethods()
-            -
                {
-            -
                    if (!$this->hasData('shipping_methods')) {
-            -
                        $website = $this->getRequest()->getParam('website');
-            -
                        $store   = $this->getRequest()->getParam('store');
-            -
-            -
                        $storeId = null;
-            -
                        if (!is_null($website)) {
-            -
                            $storeId = Mage::getModel('core/website')
-            -
                                ->load($website, 'code')
-            -
                                ->getDefaultGroup()
-            -
                                ->getDefaultStoreId();
-            -
                        } elseif (!is_null($store)) {
-            -
                            $storeId = Mage::getModel('core/store')
-            -
                                ->load($store, 'code')
-            -
                                ->getId();
-            -
                        }
-            -
-            -
                        $methods = array();
-            -
                        $carriers = Mage::getSingleton('shipping/config')->getActiveCarriers($storeId);
-            -
                        foreach ($carriers as $carrierCode=>$carrierModel) {
-            -
                            if (!$carrierModel->isActive()) {
-            -
                                continue;
-            -
                            }
-            -
                            $carrierMethods = $carrierModel->getAllowedMethods();
-            -
                            if (!$carrierMethods) {
-            -
                                continue;
-            -
                            }
-            -
                            $carrierTitle = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $storeId);
-            -
                            $methods[$carrierCode] = array(
-            -
                                'title'   => $carrierTitle,
-            -
                                'methods' => array(),
-            -
                            );
-            -
                            foreach ($carrierMethods as $methodCode=>$methodTitle) {
-            -
                                $methods[$carrierCode]['methods'][$methodCode] = array(
-            -
                                    'title' => '[' . $carrierCode . '] ' . $methodTitle,
-            -
                                );
-            -
                            }
-            -
                        }
-            -
                        $this->setData('shipping_methods', $methods);
-            -
                    }
-            -
                    return $this->getData('shipping_methods');
-            -
                }
-            -
-            -
                protected function _getDisabled()
-            -
                {
-            -
                    return $this->getElement()->getDisabled() ? ' disabled' : '';
-            -
                }
-            -
-            -
                protected function _getValue($key)
-            -
                {
-            -
                    return $this->getElement()->getData('value/' . $key);
-            -
                }
-            -
-            -
                protected function _getSelected($key, $value)
-            -
                {
-            -
                    return $this->getElement()->getData('value/' . $key) == $value ? 'selected="selected"' : '';
-            -
                }
-            -
-            -
                protected function _getAddRowButtonHtml($container, $template, $title='Add')
-            -
                {
-            -
                    if (!isset($this->_addRowButtonHtml[$container])) {
-            -
                        $this->_addRowButtonHtml[$container] = $this->getLayout()->createBlock('adminhtml/widget_button')
-            -
                                ->setType('button')
-            -
                                ->setClass('add ' . $this->_getDisabled())
-            -
                                ->setLabel($this->__($title))
-            -
                                ->setOnClick("Element.insert($('" . $container . "'), {bottom: $('" . $template . "').innerHTML})")
-            -
                                ->setDisabled($this->_getDisabled())
-            -
                                ->toHtml();
-            -
                    }
-            -
                    return $this->_addRowButtonHtml[$container];
-            -
                }
-            -
-            -
                protected function _getRemoveRowButtonHtml($selector = 'li', $title = 'Remove')
-            -
                {
-            -
                    if (!$this->_removeRowButtonHtml) {
-            -
                        $this->_removeRowButtonHtml = $this->getLayout()->createBlock('adminhtml/widget_button')
-            -
                                ->setType('button')
-            -
                                ->setClass('delete v-middle ' . $this->_getDisabled())
-            -
                                ->setLabel($this->__($title))
-            -
                                ->setOnClick("Element.remove($(this).up('" . $selector . "'))")
-            -
                                ->setDisabled($this->_getDisabled())
-            -
                                ->toHtml();
-            -
                    }
-            -
                    return $this->_removeRowButtonHtml;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Block/Link.php DELETED Viewed

@@ -1,108 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            /**
-            -
             * Google Checkout shortcut link
-            -
             *
-            -
             * @category   Mage
-            -
             * @package    Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Block_Link extends Mage_Core_Block_Template
-            -
            {
-            -
                public function getImageStyle()
-            -
                {
-            -
                    $s = Mage::getStoreConfig('google/checkout/checkout_image');
-            -
                    if (!$s) {
-            -
                        $s = '180/46/trans';
-            -
                    }
-            -
                    return explode('/', $s);
-            -
                }
-            -
-            -
                public function getImageUrl()
-            -
                {
-            -
                    $url = 'https://checkout.google.com/buttons/checkout.gif';
-            -
                    $url .= '?merchant_id='.Mage::getStoreConfig('google/checkout/merchant_id');
-            -
                    $v = $this->getImageStyle();
-            -
                    $url .= '&w='.$v[0].'&h='.$v[1].'&style='.$v[2];
-            -
                    $url .= '&variant='.($this->getIsDisabled() ? 'disabled' : 'text');
-            -
                    $url .= '&loc='.Mage::getStoreConfig('google/checkout/locale');
-            -
                    return $url;
-            -
                }
-            -
-            -
                public function getCheckoutUrl()
-            -
                {
-            -
                    return $this->getUrl('googlecheckout/redirect/checkout');
-            -
                }
-            -
-            -
                /**
-            -
                 * @deprecated after 1.4.1.1
-            -
                 * @return bool
-            -
                 */
-            -
                public function getIsActiveAanalytics()
-            -
                {
-            -
                    return false;
-            -
                }
-            -
-            -
                public function getImageWidth()
-            -
                {
-            -
                     $v = $this->getImageStyle();
-            -
                     return $v[0];
-            -
                }
-            -
-            -
                public function getImageHeight()
-            -
                {
-            -
                     $v = $this->getImageStyle();
-            -
                     return $v[1];
-            -
                }
-            -
-            -
                /**
-            -
                 * Check whether method is available and render HTML
-            -
                 * @return string
-            -
                 */
-            -
                public function _toHtml()
-            -
                {
-            -
                    $quote = Mage::getSingleton('checkout/session')->getQuote();
-            -
                    if (Mage::getModel('googlecheckout/payment')->isAvailable($quote) && $quote->validateMinimumAmount()) {
-            -
                        Mage::dispatchEvent('googlecheckout_block_link_html_before', array('block' => $this));
-            -
                        return parent::_toHtml();
-            -
                    }
-            -
                    return '';
-            -
                }
-            -
-            -
                public function getIsDisabled()
-            -
                {
-            -
                    $quote = Mage::getSingleton('checkout/session')->getQuote();
-            -
                    /* @var $quote Mage_Sales_Model_Quote */
-            -
                    foreach ($quote->getAllVisibleItems() as $item) {
-            -
                        /* @var $item Mage_Sales_Model_Quote_Item */
-            -
                        if (!$item->getProduct()->getEnableGooglecheckout()) {
-            -
                            return true;
-            -
                        }
-            -
                    }
-            -
                    return false;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Exception.php DELETED Viewed

@@ -1,30 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Exception extends Mage_Core_Exception
-            -
            {
-            -
-            -
            }

app/code/core/Mage/GoogleCheckout/Helper/Data.php DELETED Viewed

@@ -1,192 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            /**
-            -
             * GoogleCheckout data helper
-            -
             */
-            -
            class Mage_GoogleCheckout_Helper_Data extends Mage_Core_Helper_Abstract
-            -
            {
-            -
                /**
-            -
                 * Google Checkout settings
-            -
                 */
-            -
                const XML_PATH_REQUEST_PHONE                     = 'google/checkout/request_phone';
-            -
                const XML_PATH_DISABLE_DEFAULT_TAX_TABLES        = 'google/checkout/disable_default_tax_tables';
-            -
-            -
                /**
-            -
                 * Google Checkout Shipping - Digital Delivery settings
-            -
                 */
-            -
                const XML_PATH_SHIPPING_VIRTUAL_ACTIVE           = 'google/checkout_shipping_virtual/active';
-            -
                const XML_PATH_SHIPPING_VIRTUAL_SCHEDULE         = 'google/checkout_shipping_virtual/schedule';
-            -
                const XML_PATH_SHIPPING_VIRTUAL_METHOD           = 'google/checkout_shipping_virtual/method';
-            -
-            -
                /**
-            -
                 * Google Checkout Shipping - Carrier Calculated settings
-            -
                 */
-            -
                const XML_PATH_SHIPPING_CARRIER_ACTIVE           = 'google/checkout_shipping_carrier/active';
-            -
                const XML_PATH_SHIPPING_CARRIER_METHODS          = 'google/checkout_shipping_carrier/methods';
-            -
                const XML_PATH_SHIPPING_CARRIER_DEFAULT_PRICE    = 'google/checkout_shipping_carrier/default_price';
-            -
                const XML_PATH_SHIPPING_CARRIER_DEFAULT_WIDTH    = 'google/checkout_shipping_carrier/default_width';
-            -
                const XML_PATH_SHIPPING_CARRIER_DEFAULT_HEIGHT   = 'google/checkout_shipping_carrier/default_height';
-            -
                const XML_PATH_SHIPPING_CARRIER_DEFAULT_LENGTH   = 'google/checkout_shipping_carrier/default_length';
-            -
                const XML_PATH_SHIPPING_CARRIER_ADDRESS_CATEGORY = 'google/checkout_shipping_carrier/address_category';
-            -
-            -
                /**
-            -
                 * Google Checkout Shipping - Flat Rate settings
-            -
                 */
-            -
                const XML_PATH_SHIPPING_FLATRATE_ACTIVE          = 'google/checkout_shipping_flatrate/active';
-            -
-            -
                /**
-            -
                 * Google Checkout Shipping - Merchant Calculated settings
-            -
                 */
-            -
                const XML_PATH_SHIPPING_MERCHANT_ACTIVE          = 'google/checkout_shipping_merchant/active';
-            -
                const XML_PATH_SHIPPING_MERCHANT_ALLOWED_METHODS = 'google/checkout_shipping_merchant/allowed_methods';
-            -
-            -
                /**
-            -
                 * Google Checkout Shipping - Pickup settings
-            -
                 */
-            -
                const XML_PATH_SHIPPING_PICKUP_ACTIVE            = 'google/checkout_shipping_pickup/active';
-            -
                const XML_PATH_SHIPPING_PICKUP_TITLE             = 'google/checkout_shipping_pickup/title';
-            -
                const XML_PATH_SHIPPING_PICKUP_PRICE             = 'google/checkout_shipping_pickup/price';
-            -
-            -
                /**
-            -
                 * Check if option googlecheckout shipping carrier is enabled
-            -
                 *
-            -
                 * @param  $storeId
-            -
                 * @return bool
-            -
                 */
-            -
                public function isShippingCarrierActive($storeId)
-            -
                {
-            -
                    return (true == Mage::getStoreConfig(self::XML_PATH_SHIPPING_CARRIER_ACTIVE, $storeId));
-            -
                }
-            -
-            -
                /**
-            -
                 * Convert Magento zip range to array of Google Checkout zip-patterns
-            -
                 * (e.g., 12000-13999 -> [12*, 13*])
-            -
                 *
-            -
                 * @param  string $zipRange
-            -
                 * @return array
-            -
                 */
-            -
                public function zipRangeToZipPattern($zipRange)
-            -
                {
-            -
                    $zipLength = 5;
-            -
                    $zipPattern = array();
-            -
-            -
                    if (!preg_match("/^(.+)-(.+)$/", $zipRange, $zipParts)) {
-            -
                        return array($zipRange);
-            -
                    }
-            -
-            -
                    if ($zipParts[1] == $zipParts[2]) {
-            -
                        return array($zipParts[1]);
-            -
                    }
-            -
-            -
                    if ($zipParts[1] > $zipParts[2]) {
-            -
                        list($zipParts[2], $zipParts[1]) = array($zipParts[1], $zipParts[2]);
-            -
                    }
-            -
-            -
                    $from = str_split($zipParts[1]);
-            -
                    $to = str_split($zipParts[2]);
-            -
-            -
                    $startZip = '';
-            -
                    $diffPosition = null;
-            -
                    for ($pos = 0; $pos < $zipLength; $pos++) {
-            -
                        if ($from[$pos] == $to[$pos]) {
-            -
                            $startZip .= $from[$pos];
-            -
                        } else {
-            -
                            $diffPosition = $pos;
-            -
                            break;
-            -
                        }
-            -
                    }
-            -
-            -
                    /*
-            -
                     * calculate zip-patterns
-            -
                     */
-            -
                    if (min(array_slice($to, $diffPosition)) == 9 && max(array_slice($from, $diffPosition)) == 0) {
-            -
                        // particular case like 11000-11999 -> 11*
-            -
                        return array($startZip . '*');
-            -
                    } else {
-            -
                        // calculate approximate zip-patterns
-            -
                        $start = $from[$diffPosition];
-            -
                        $finish = $to[$diffPosition];
-            -
                        if ($diffPosition < $zipLength - 1) {
-            -
                            $start++;
-            -
                            $finish--;
-            -
                        }
-            -
                        $end = $diffPosition < $zipLength - 1 ? '*' : '';
-            -
                        for ($digit = $start; $digit <= $finish; $digit++) {
-            -
                            $zipPattern[] = $startZip . $digit . $end;
-            -
                        }
-            -
                    }
-            -
-            -
                    if ($diffPosition == $zipLength - 1) {
-            -
                        return $zipPattern;
-            -
                    }
-            -
-            -
                    $nextAsteriskFrom = true;
-            -
                    $nextAsteriskTo = true;
-            -
                    for ($pos = $zipLength - 1; $pos > $diffPosition; $pos--) {
-            -
                        // calculate zip-patterns based on $from value
-            -
                        if ($from[$pos] == 0 && $nextAsteriskFrom) {
-            -
                            $nextAsteriskFrom = true;
-            -
                        } else {
-            -
                            $subZip = '';
-            -
                            for ($k = $diffPosition; $k < $pos; $k++) {
-            -
                                $subZip .= $from[$k];
-            -
                            }
-            -
                            $delta = $nextAsteriskFrom ? 0 : 1;
-            -
                            $end = $pos < $zipLength - 1 ? '*' : '';
-            -
                            for ($i = $from[$pos] + $delta; $i <= 9; $i++) {
-            -
                                $zipPattern[] = $startZip . $subZip . $i . $end;
-            -
                            }
-            -
                            $nextAsteriskFrom = false;
-            -
                        }
-            -
-            -
                        // calculate zip-patterns based on $to value
-            -
                        if ($to[$pos] == 9 && $nextAsteriskTo) {
-            -
                            $nextAsteriskTo = true;
-            -
                        } else {
-            -
                            $subZip = '';
-            -
                            for ($k = $diffPosition; $k < $pos; $k++) {
-            -
                                $subZip .= $to[$k];
-            -
                            }
-            -
                            $delta = $nextAsteriskTo ? 0 : 1;
-            -
                            $end = $pos < $zipLength - 1 ? '*' : '';
-            -
                            for ($i = 0; $i <= $to[$pos] - $delta; $i++) {
-            -
                                $zipPattern[] = $startZip . $subZip . $i . $end;
-            -
                            }
-            -
                            $nextAsteriskTo = false;
-            -
                        }
-            -
                    }
-            -
-            -
                    if ($nextAsteriskFrom) {
-            -
                        $zipPattern[] = $startZip . $from[$diffPosition] . '*';
-            -
                    }
-            -
                    if ($nextAsteriskTo) {
-            -
                        $zipPattern[] = $startZip . $to[$diffPosition] . '*';
-            -
                    }
-            -
-            -
                    return $zipPattern;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api.php DELETED Viewed

@@ -1,233 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Model_Api extends Varien_Object
-            -
            {
-            -
                /**
-            -
                 * Fields that should be replaced in debug with '***'
-            -
                 *
-            -
                 * @var array
-            -
                 */
-            -
                protected $_debugReplacePrivateDataKeys = array();
-            -
-            -
                protected function _getApi($area)
-            -
                {
-            -
                    $api = Mage::getModel('googlecheckout/api_xml_' . $area)->setStoreId($this->getStoreId());
-            -
                    $api->setApi($this);
-            -
                    return $api;
-            -
                }
-            -
-            -
            // CHECKOUT
-            -
                public function checkout(Mage_Sales_Model_Quote $quote)
-            -
                {
-            -
                    $api = $this->_getApi('checkout')
-            -
                        ->setQuote($quote)
-            -
                        ->checkout();
-            -
                    return $api;
-            -
                }
-            -
-            -
            // FINANCIAL COMMANDS
-            -
                public function authorize($gOrderId)
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->authorize();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function charge($gOrderId, $amount)
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->charge($amount);
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function refund($gOrderId, $amount, $reason, $comment = '')
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->refund($amount, $reason, $comment);
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function cancel($gOrderId, $reason, $comment = '')
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->cancel($reason, $comment);
-            -
                    return $api;
-            -
                }
-            -
-            -
            // FULFILLMENT COMMANDS (ORDER BASED)
-            -
-            -
                public function process($gOrderId)
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->process();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function deliver($gOrderId, $carrier, $trackingNo, $sendMail = true)
-            -
                {
-            -
                    $this->setCarriers(array('dhl' => 'DHL', 'fedex' => 'FedEx', 'ups' => 'UPS', 'usps' => 'USPS'));
-            -
                    Mage::dispatchEvent('googlecheckout_api_deliver_carriers_array', array('api' => $this));
-            -
                    $gCarriers = $this->getCarriers();
-            -
                    $carrier = strtolower($carrier);
-            -
                    $carrier = isset($gCarriers[$carrier]) ? $gCarriers[$carrier] : 'Other';
-            -
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->deliver($carrier, $trackingNo, $sendMail);
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function addTrackingData($gOrderId, $carrier, $trackingNo)
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->addTrackingData($carrier, $trackingNo);
-            -
                    return $api;
-            -
                }
-            -
-            -
            // FULFILLMENT COMMANDS (ITEM BASED)
-            -
-            -
                public function shipItems($gOrderId, array $items)
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setGoogleOrderNumber($gOrderId)
-            -
                        ->shipItems($items);
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function backorderItems()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function returnItems()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function cancelItems()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function resetItemsShippingInformation()
-            -
                {
-            -
-            -
                }
-            -
-            -
                public function addMerchantOrderNumber()
-            -
                {
-            -
-            -
                }
-            -
-            -
                public function sendBuyerMessage()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
            // OTHER ORDER COMMANDS
-            -
-            -
                public function archiveOrder()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
                public function unarchiveOrder()
-            -
                {
-            -
                    $api = $this->_getApi('order')
-            -
                        ->setOrder($order)
-            -
                        ->setItems($items)
-            -
                        ->shipItems();
-            -
                    return $api;
-            -
                }
-            -
-            -
            // WEB SERVICE SERVER PROCEDURES
-            -
-            -
                public function processCallback()
-            -
                {
-            -
                    $api = $this->_getApi('callback')->process();
-            -
                    return $api;
-            -
                }
-            -
-            -
                /**
-            -
                 * @deprecated after 1.4.1.0
-            -
                 *
-            -
                 */
-            -
                public function processBeacon(){}
-            -
-            -
                /**
-            -
                 * Log debug data to file
-            -
                 *
-            -
                 * @param mixed $debugData
-            -
                 */
-            -
                public function debugData($debugData)
-            -
                {
-            -
                    if ($this->getDebugFlag()) {
-            -
                        Mage::getModel('core/log_adapter', 'payment_googlecheckout.log')
-            -
                           ->setFilterDataKeys($this->_debugReplacePrivateDataKeys)
-            -
                           ->log($debugData);
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Define if debugging is enabled
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                public function getDebugFlag()
-            -
                {
-            -
                    if (!$this->hasData('debug_flag')) {
-            -
                        $this->setData('debug_flag', Mage::getStoreConfig('google/checkout/debug', $this->getStoreId()));
-            -
                    }
-            -
                    return $this->getData('debug_flag');
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api/Debug.php DELETED Viewed

@@ -1,52 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Enter description here ...
-            -
             *
-            -
             * @method Mage_GoogleCheckout_Model_Resource_Api_Debug _getResource()
-            -
             * @method Mage_GoogleCheckout_Model_Resource_Api_Debug getResource()
-            -
             * @method string getDir()
-            -
             * @method Mage_GoogleCheckout_Model_Api_Debug setDir(string $value)
-            -
             * @method string getUrl()
-            -
             * @method Mage_GoogleCheckout_Model_Api_Debug setUrl(string $value)
-            -
             * @method string getRequestBody()
-            -
             * @method Mage_GoogleCheckout_Model_Api_Debug setRequestBody(string $value)
-            -
             * @method string getResponseBody()
-            -
             * @method Mage_GoogleCheckout_Model_Api_Debug setResponseBody(string $value)
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Api_Debug extends Mage_Core_Model_Abstract
-            -
            {
-            -
                protected function _construct()
-            -
                {
-            -
                    $this->_init('googlecheckout/api_debug');
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Abstract.php DELETED Viewed

@@ -1,245 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            set_include_path(get_include_path().PS.Mage::getBaseDir('lib').DS.'googlecheckout');
-            -
-            -
            require_once('googleresponse.php');
-            -
            require_once('googlemerchantcalculations.php');
-            -
            require_once('googleresult.php');
-            -
            require_once('googlerequest.php');
-            -
-            -
            abstract class Mage_GoogleCheckout_Model_Api_Xml_Abstract extends Varien_Object
-            -
            {
-            -
                public function log($text, $nl=true)
-            -
                {
-            -
                    error_log(print_r($text, 1) . ($nl ? "\n" : ''), 3, Mage::getBaseDir('log') . DS . 'callback.log');
-            -
                    return $this;
-            -
                }
-            -
-            -
                public function __()
-            -
                {
-            -
                    $args = func_get_args();
-            -
                    $expr = new Mage_Core_Model_Translate_Expr(array_shift($args), 'Mage_GoogleCheckout');
-            -
                    array_unshift($args, $expr);
-            -
                    return Mage::app()->getTranslator()->translate($args);
-            -
                }
-            -
-            -
                public function getMerchantId()
-            -
                {
-            -
                    if (!$this->hasData('merchant_id')) {
-            -
                        $this->setData('merchant_id', Mage::getStoreConfig('google/checkout/merchant_id', $this->getStoreId()));
-            -
                    }
-            -
                    return $this->getData('merchant_id');
-            -
                }
-            -
-            -
                public function getMerchantKey()
-            -
                {
-            -
                    if (!$this->hasData('merchant_key')) {
-            -
                        $this->setData('merchant_key', Mage::getStoreConfig('google/checkout/merchant_key', $this->getStoreId()));
-            -
                    }
-            -
                    return $this->getData('merchant_key');
-            -
                }
-            -
-            -
                public function getServerType()
-            -
                {
-            -
                    if (!$this->hasData('server_type')) {
-            -
                        $this->setData(
-            -
                            'server_type',
-            -
                            Mage::getStoreConfig('google/checkout/sandbox', $this->getStoreId()) ? "sandbox" : ""
-            -
                        );
-            -
                    }
-            -
                    return $this->getData('server_type');
-            -
                }
-            -
-            -
                public function getLocale()
-            -
                {
-            -
                    if (!$this->hasData('locale')) {
-            -
                        $this->setData('locale', Mage::getStoreConfig('google/checkout/locale', $this->getStoreId()));
-            -
                    }
-            -
                    return $this->getData('locale');
-            -
                }
-            -
-            -
                public function getCurrency()
-            -
                {
-            -
                    if (!$this->hasData('currency')) {
-            -
                        $this->setData('currency', Mage::app()->getStore()->getBaseCurrencyCode());
-            -
                        //$this->setData('currency', $this->getLocale()=='en_US' ? 'USD' : 'GBP');
-            -
                    }
-            -
                    return $this->getData('currency');
-            -
                }
-            -
-            -
                /**
-            -
                 * Google Checkout Request instance
-            -
                 *
-            -
                 * @return GoogleRequest
-            -
                 */
-            -
                public function getGRequest()
-            -
                {
-            -
                    if (!$this->hasData('g_request')) {
-            -
                        $this->setData('g_request', new GoogleRequest(
-            -
                            $this->getMerchantId(),
-            -
                            $this->getMerchantKey(),
-            -
                            $this->getServerType(),
-            -
                            $this->getCurrency()
-            -
                        ));
-            -
-            -
                        //Setup the log file
-            -
                        $logDir = Mage::getBaseDir('log');
-            -
                        $this->getData('g_request')->SetLogFiles(
-            -
                            $logDir . DS . 'googleerror.log',
-            -
                            $logDir . DS . 'googlemessage.log',
-            -
                            L_ALL
-            -
                        );
-            -
                    }
-            -
                    return $this->getData('g_request');
-            -
                }
-            -
-            -
                /**
-            -
                 * Google Checkout Response instance
-            -
                 *
-            -
                 * @return GoogleResponse
-            -
                 */
-            -
                public function getGResponse()
-            -
                {
-            -
                    $merchantId = $this->getMerchantId();
-            -
                    $merchantKey = $this->getMerchantKey();
-            -
                    if (empty($merchantId) || empty($merchantKey)) {
-            -
                        Mage::throwException(Mage::helper('googlecheckout')->__('GoogleCheckout is not configured'));
-            -
                    }
-            -
                    if (!$this->hasData('g_response')) {
-            -
                        $this->setData('g_response', new GoogleResponse(
-            -
                            $this->getMerchantId(),
-            -
                            $this->getMerchantKey()
-            -
                        ));
-            -
-            -
                        //Setup the log file
-            -
                        $logDir = Mage::getBaseDir('log');
-            -
                        $this->getData('g_response')->SetLogFiles(
-            -
                            $logDir . DS . 'googleerror.log',
-            -
                            $logDir . DS . 'googlemessage.log',
-            -
                            L_ALL
-            -
                        );
-            -
                    }
-            -
                    return $this->getData('g_response');
-            -
                }
-            -
-            -
                protected function _getBaseApiUrl()
-            -
                {
-            -
                    $url = 'https://';
-            -
                    if ($this->getServerType()=='sandbox') {
-            -
                        $url .= 'sandbox.google.com/checkout/api/checkout/v2/';
-            -
                    } else {
-            -
                        $url .= 'checkout.google.com/api/checkout/v2/';
-            -
                    }
-            -
                    return $url;
-            -
                }
-            -
-            -
                abstract protected function _getApiUrl();
-            -
-            -
                public function _call($xml)
-            -
                {
-            -
                    $auth = 'Basic ' . base64_encode($this->getMerchantId() . ':' . $this->getMerchantKey());
-            -
-            -
                    $headers = array(
-            -
                        'Authorization: ' . $auth,
-            -
                        'Content-Type: application/xml;charset=UTF-8',
-            -
                        'Accept: application/xml;charset=UTF-8',
-            -
                    );
-            -
-            -
                    $url = $this->_getApiUrl();
-            -
                    $xml = '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . $xml;
-            -
-            -
                    $debugData = array('request' => $xml, 'dir' => 'out');
-            -
-            -
                    try {
-            -
                        $http = new Varien_Http_Adapter_Curl();
-            -
                        $http->write('POST', $url, '1.1', $headers, $xml);
-            -
                        $response = $http->read();
-            -
                        $response = preg_split('/^\r?$/m', $response, 2);
-            -
                        $response = trim($response[1]);
-            -
                        $debugData['result'] = $response;
-            -
                        $http->close();
-            -
                    }
-            -
                    catch (Exception $e) {
-            -
                        $debugData['result'] = array('error' => $e->getMessage(), 'code' => $e->getCode());
-            -
                        $this->getApi()->debugData($debugData);
-            -
                        throw $e;
-            -
                    }
-            -
-            -
                    $this->getApi()->debugData($debugData);
-            -
                    $result = @simplexml_load_string($response);
-            -
                    if (!$result) {
-            -
                        $result = simplexml_load_string(
-            -
                            '<error><error-message>Invalid response from Google Checkout server</error-message></error>'
-            -
                        );
-            -
                    }
-            -
                    if ($result->getName() == 'error') {
-            -
                        $this->setError($this->__('Google Checkout: %s', (string)$result->{'error-message'}));
-            -
                        $this->setWarnings((array)$result->{'warning-messages'});
-            -
                    } else {
-            -
                        $this->unsError()->unsWarnings();
-            -
                    }
-            -
-            -
                    $this->setResult($result);
-            -
-            -
                    return $result;
-            -
                }
-            -
-            -
                protected function _getCallbackUrl()
-            -
                {
-            -
                    return Mage::getUrl(
-            -
                        'googlecheckout/api',
-            -
                        array('_forced_secure'=>Mage::getStoreConfig('google/checkout/use_secure_callback_url',$this->getStoreId()))
-            -
                    );
-            -
                }
-            -
-            -
                /**
-            -
                 * Recalculate amount to store currency
-            -
                 *
-            -
                 * @param float $amount
-            -
                 * @param Mage_Sales_Model_Quote $quote
-            -
                 * @return float
-            -
                 */
-            -
                protected function _reCalculateToStoreCurrency($amount, $quote)
-            -
                {
-            -
                    if ($quote->getQuoteCurrencyCode() != $quote->getBaseCurrencyCode()) {
-            -
                        $amount = $amount * $quote->getStoreToQuoteRate();
-            -
                        $amount = Mage::app()->getStore()->roundPrice($amount);
-            -
                    }
-            -
                    return $amount;
-            -
                }
-            -
-            -
                /**
-            -
                 * Get Tax Class for Shipping option
-            -
                 *
-            -
                 * @param Mage_Sales_Model_Quote $quote
-            -
                 * @return mixed
-            -
                 */
-            -
                protected function _getTaxClassForShipping($quote)
-            -
                {
-            -
                    return Mage::getStoreConfig(Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $quote->getStoreId());
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Callback.php DELETED Viewed

@@ -1,1107 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Model_Api_Xml_Callback extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
-            -
            {
-            -
                protected $_cachedShippingInfo = array(); // Cache of possible shipping carrier-methods combinations per storeId
-            -
-            -
                /**
-            -
                 * Process notification from google
-            -
                 * @return Mage_GoogleCheckout_Model_Api_Xml_Callback
-            -
                 */
-            -
                public function process()
-            -
                {
-            -
                    // Retrieve the XML sent in the HTTP POST request to the ResponseHandler
-            -
                    $xmlResponse = isset($GLOBALS['HTTP_RAW_POST_DATA']) ?
-            -
                        $GLOBALS['HTTP_RAW_POST_DATA'] : file_get_contents("php://input");
-            -
                    if (get_magic_quotes_gpc()) {
-            -
                        $xmlResponse = stripslashes($xmlResponse);
-            -
                    }
-            -
-            -
                    $debugData = array('request' => $xmlResponse, 'dir' => 'in');
-            -
-            -
                    if (empty($xmlResponse)) {
-            -
                        $this->getApi()->debugData($debugData);
-            -
                        return false;
-            -
                    }
-            -
-            -
                    list($root, $data) = $this->getGResponse()->GetParsedXML($xmlResponse);
-            -
-            -
                    $this->getGResponse()->SetMerchantAuthentication($this->getMerchantId(), $this->getMerchantKey());
-            -
                    $status = $this->getGResponse()->HttpAuthentication();
-            -
-            -
                    if (!$status || empty($data[$root])) {
-            -
                        exit;
-            -
                    }
-            -
-            -
                    $this->setRootName($root)->setRoot($data[$root]);
-            -
                    $serialNumber = $this->getData('root/serial-number');
-            -
                    $this->getGResponse()->setSerialNumber($serialNumber);
-            -
-            -
                    /*
-            -
                     * Prevent multiple notification processing
-            -
                     */
-            -
                    $notification = Mage::getModel('googlecheckout/notification')
-            -
                        ->setSerialNumber($serialNumber)
-            -
                        ->loadNotificationData();
-            -
-            -
                    if ($notification->getStartedAt()) {
-            -
                        if ($notification->isProcessed()) {
-            -
                            $this->getGResponse()->SendAck();
-            -
                            return;
-            -
                        }
-            -
                        if ($notification->isTimeout()) {
-            -
                            $notification->updateProcess();
-            -
                        } else {
-            -
                            $this->getGResponse()->SendServerErrorStatus();
-            -
                            return;
-            -
                        }
-            -
                    } else {
-            -
                        $notification->startProcess();
-            -
                    }
-            -
-            -
                    $method = '_response' . uc_words($root, '', '-');
-            -
                    if (method_exists($this, $method)) {
-            -
                        ob_start();
-            -
-            -
                        try {
-            -
                            $this->$method();
-            -
                            $notification->stopProcess();
-            -
                        } catch (Exception $e) {
-            -
                            $this->getGResponse()->log->logError($e->__toString());
-            -
                        }
-            -
-            -
                        $debugData['result'] = ob_get_flush();
-            -
                        $this->getApi()->debugData($debugData);
-            -
                    } else {
-            -
                        $this->getGResponse()->SendBadRequestStatus("Invalid or not supported Message");
-            -
                    }
-            -
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Load quote from request and make sure the proper payment method is set
-            -
                 *
-            -
                 * @return Mage_Sales_Model_Quote
-            -
                 */
-            -
                protected function _loadQuote()
-            -
                {
-            -
                    $quoteId = $this->getData('root/shopping-cart/merchant-private-data/quote-id/VALUE');
-            -
                    $storeId = $this->getData('root/shopping-cart/merchant-private-data/store-id/VALUE');
-            -
                    $quote = Mage::getModel('sales/quote')
-            -
                        ->setStoreId($storeId)
-            -
                        ->load($quoteId);
-            -
                    if ($quote->isVirtual()) {
-            -
                        $quote->getBillingAddress()->setPaymentMethod('googlecheckout');
-            -
                    } else {
-            -
                        $quote->getShippingAddress()->setPaymentMethod('googlecheckout');
-            -
                    }
-            -
                    return $quote;
-            -
                }
-            -
-            -
                protected function _getApiUrl()
-            -
                {
-            -
                    return null;
-            -
                }
-            -
-            -
                protected function getGoogleOrderNumber()
-            -
                {
-            -
                    return $this->getData('root/google-order-number/VALUE');
-            -
                }
-            -
-            -
                protected function _responseRequestReceived()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _responseError()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _responseDiagnosis()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _responseCheckoutRedirect()
-            -
                {
-            -
-            -
                }
-            -
-            -
                /**
-            -
                 * Calculate available shipping amounts and taxes
-            -
                 */
-            -
                protected function _responseMerchantCalculationCallback()
-            -
                {
-            -
                    $merchantCalculations = new GoogleMerchantCalculations($this->getCurrency());
-            -
-            -
                    $quote = $this->_loadQuote();
-            -
-            -
                    $billingAddress = $quote->getBillingAddress();
-            -
                    $address = $quote->getShippingAddress();
-            -
-            -
                    $googleAddress = $this->getData('root/calculate/addresses/anonymous-address');
-            -
-            -
                    $googleAddresses = array();
-            -
                    if ( isset( $googleAddress['id'] ) ) {
-            -
                        $googleAddresses[] = $googleAddress;
-            -
                    } else {
-            -
                        $googleAddresses = $googleAddress;
-            -
                    }
-            -
-            -
                    $methods = Mage::getStoreConfig('google/checkout_shipping_merchant/allowed_methods', $this->getStoreId());
-            -
                    $methods = unserialize($methods);
-            -
                    $limitCarrier = array();
-            -
                    foreach ($methods['method'] as $method) {
-            -
                        if ($method) {
-            -
                            list($carrierCode, $methodCode) = explode('/', $method);
-            -
                            $limitCarrier[$carrierCode] = $carrierCode;
-            -
                        }
-            -
                    }
-            -
                    $limitCarrier = array_values($limitCarrier);
-            -
-            -
                    foreach($googleAddresses as $googleAddress) {
-            -
                        $addressId = $googleAddress['id'];
-            -
                        $regionCode = $googleAddress['region']['VALUE'];
-            -
                        $countryCode = $googleAddress['country-code']['VALUE'];
-            -
                        $regionModel = Mage::getModel('directory/region')->loadByCode($regionCode, $countryCode);
-            -
                        $regionId = $regionModel->getId();
-            -
-            -
                        $address->setCountryId($countryCode)
-            -
                            ->setRegion($regionCode)
-            -
                            ->setRegionId($regionId)
-            -
                            ->setCity($googleAddress['city']['VALUE'])
-            -
                            ->setPostcode($googleAddress['postal-code']['VALUE'])
-            -
                            ->setLimitCarrier($limitCarrier);
-            -
                        $billingAddress->setCountryId($countryCode)
-            -
                            ->setRegion($regionCode)
-            -
                            ->setRegionId($regionId)
-            -
                            ->setCity($googleAddress['city']['VALUE'])
-            -
                            ->setPostcode($googleAddress['postal-code']['VALUE'])
-            -
                            ->setLimitCarrier($limitCarrier);
-            -
-            -
                        $billingAddress->collectTotals();
-            -
                        $shippingTaxClass = $this->_getTaxClassForShipping($quote);
-            -
-            -
                        $gRequestMethods = $this->getData('root/calculate/shipping/method');
-            -
                        if ($gRequestMethods) {
-            -
                            // Make stable format of $gRequestMethods for convenient usage
-            -
                            if (array_key_exists('VALUE', $gRequestMethods)) {
-            -
                                $gRequestMethods = array($gRequestMethods);
-            -
                            }
-            -
-            -
                            // Form list of mapping Google method names to applicable address rates
-            -
                            $rates = array();
-            -
                            $address->setCollectShippingRates(true)
-            -
                                ->collectShippingRates();
-            -
                            foreach ($address->getAllShippingRates() as $rate) {
-            -
                                if ($rate instanceof Mage_Shipping_Model_Rate_Result_Error) {
-            -
                                    continue;
-            -
                                }
-            -
                                $methodName = sprintf('%s - %s', $rate->getCarrierTitle(), $rate->getMethodTitle());
-            -
                                $rates[$methodName] = $rate;
-            -
                            }
-            -
-            -
                            foreach ($gRequestMethods as $method) {
-            -
                                $result = new GoogleResult($addressId);
-            -
                                $methodName = $method['name'];
-            -
-            -
                                if (isset($rates[$methodName])) {
-            -
                                    $rate = $rates[$methodName];
-            -
-            -
                                    $address->setShippingMethod($rate->getCode())
-            -
                                        ->setLimitCarrier($rate->getCarrier())
-            -
                                        ->setCollectShippingRates(true)
-            -
                                        ->collectTotals();
-            -
                                    $shippingRate = $address->getBaseShippingAmount() - $address->getBaseShippingDiscountAmount();
-            -
                                    $result->SetShippingDetails($methodName, $shippingRate, 'true');
-            -
-            -
                                    if ($this->getData('root/calculate/tax/VALUE') == 'true') {
-            -
                                        $taxAmount = $address->getBaseTaxAmount();
-            -
                                        $taxAmount += $billingAddress->getBaseTaxAmount();
-            -
                                        $result->setTaxDetails($taxAmount);
-            -
                                    }
-            -
                                } else {
-            -
                                    if ($shippingTaxClass &&
-            -
                                        $this->getData('root/calculate/tax/VALUE') == 'true') {
-            -
                                        $i = 1;
-            -
                                        $price = Mage::getStoreConfig(
-            -
                                            'google/checkout_shipping_flatrate/price_'.$i,
-            -
                                            $quote->getStoreId()
-            -
                                        );
-            -
                                        $price = number_format($price, 2, '.','');
-            -
                                        $price = (float) Mage::helper('tax')->getShippingPrice($price, false, false);
-            -
                                        $address->setShippingMethod(null);
-            -
                                        $address->setCollectShippingRates(true)->collectTotals();
-            -
                                        $billingAddress->setCollectShippingRates(true)->collectTotals();
-            -
                                        $address->setBaseShippingAmount($price);
-            -
                                        $address->setShippingAmount(
-            -
                                            $this->_reCalculateToStoreCurrency($price, $quote)
-            -
                                        );
-            -
                                        $this->_applyShippingTaxClass($address, $shippingTaxClass);
-            -
                                        $taxAmount = $address->getBaseTaxAmount();
-            -
                                        $taxAmount += $billingAddress->getBaseTaxAmount();
-            -
                                        $result->SetShippingDetails(
-            -
                                            $methodName,
-            -
                                            $price - $address->getBaseShippingDiscountAmount(),
-            -
                                            'true'
-            -
                                        );
-            -
                                        $result->setTaxDetails($taxAmount);
-            -
                                        $i++;
-            -
                                    } else {
-            -
                                        $result->SetShippingDetails($methodName, 0, 'false');
-            -
                                    }
-            -
                                }
-            -
                                $merchantCalculations->AddResult($result);
-            -
                            }
-            -
-            -
                        } else if ($this->getData('root/calculate/tax/VALUE') == 'true') {
-            -
                            $address->setShippingMethod(null);
-            -
                            $address->setCollectShippingRates(true)->collectTotals();
-            -
                            $billingAddress->setCollectShippingRates(true)->collectTotals();
-            -
                            if (!Mage::helper('googlecheckout')->isShippingCarrierActive($this->getStoreId())) {
-            -
                                $this->_applyShippingTaxClass($address, $shippingTaxClass);
-            -
                            }
-            -
-            -
                            $taxAmount = $address->getBaseTaxAmount();
-            -
                            $taxAmount += $billingAddress->getBaseTaxAmount();
-            -
-            -
                            $result = new GoogleResult($addressId);
-            -
                            $result->setTaxDetails($taxAmount);
-            -
                            $merchantCalculations->addResult($result);
-            -
                        }
-            -
                    }
-            -
-            -
                    $this->getGResponse()->ProcessMerchantCalculations($merchantCalculations);
-            -
                }
-            -
-            -
                /**
-            -
                 * Apply shipping tax class
-            -
                 *
-            -
                 * @param Varien_Object $qAddress
-            -
                 * @param mixed $shippingTaxClass
-            -
                 */
-            -
                protected function _applyShippingTaxClass($qAddress, $shippingTaxClass)
-            -
                {
-            -
                    if (!$shippingTaxClass) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    $quote = $qAddress->getQuote();
-            -
                    $taxCalculationModel = Mage::getSingleton('tax/calculation');
-            -
                    $request = $taxCalculationModel->getRateRequest($qAddress);
-            -
                    $rate = $taxCalculationModel->getRate($request->setProductClassId($shippingTaxClass));
-            -
-            -
                    if (!Mage::helper('tax')->shippingPriceIncludesTax()) {
-            -
                        $shippingTax    = $qAddress->getShippingAmount() * $rate/100;
-            -
                        $shippingBaseTax= $qAddress->getBaseShippingAmount() * $rate/100;
-            -
                    } else {
-            -
                        $shippingTax    = $qAddress->getShippingTaxAmount();
-            -
                        $shippingBaseTax= $qAddress->getBaseShippingTaxAmount();
-            -
                    }
-            -
-            -
                    $shippingTax    = $quote->getStore()->roundPrice($shippingTax);
-            -
                    $shippingBaseTax= $quote->getStore()->roundPrice($shippingBaseTax);
-            -
-            -
                    $qAddress->setTaxAmount($qAddress->getTaxAmount() + $shippingTax);
-            -
                    $qAddress->setBaseTaxAmount($qAddress->getBaseTaxAmount() + $shippingBaseTax);
-            -
                }
-            -
-            -
                /**
-            -
                 * Process new order creation notification from google.
-            -
                 * Convert customer quote to order
-            -
                 */
-            -
                protected function _responseNewOrderNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    // LOOK FOR EXISTING ORDER TO AVOID DUPLICATES
-            -
                    $orders = Mage::getModel('sales/order')->getCollection()
-            -
                        ->addAttributeToFilter('ext_order_id', $this->getGoogleOrderNumber());
-            -
                    if (count($orders)) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // IMPORT GOOGLE ORDER DATA INTO QUOTE
-            -
                    /* @var $quote Mage_Sales_Model_Quote */
-            -
                    $quote = $this->_loadQuote();
-            -
                    $quote->setIsActive(true)->reserveOrderId();
-            -
-            -
                    Mage::dispatchEvent('googlecheckout_create_order_before', array('quote' => $quote));
-            -
                    if ($quote->getErrorMessage()) {
-            -
                        $this->getGRequest()->SendCancelOrder($this->getGoogleOrderNumber(),
-            -
                            $this->__('Order creation error'),
-            -
                            $quote->getErrorMessage()
-            -
                        );
-            -
                        return;
-            -
                    }
-            -
-            -
                    $storeId = $quote->getStoreId();
-            -
-            -
                    Mage::app()->setCurrentStore(Mage::app()->getStore($storeId));
-            -
                    if ($quote->getQuoteCurrencyCode() != $quote->getBaseCurrencyCode()) {
-            -
                        Mage::app()->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());
-            -
                    }
-            -
-            -
                    $billing = $this->_importGoogleAddress($this->getData('root/buyer-billing-address'));
-            -
                    $quote->setBillingAddress($billing);
-            -
-            -
                    $shipping = $this->_importGoogleAddress($this->getData('root/buyer-shipping-address'));
-            -
-            -
                    $quote->setShippingAddress($shipping);
-            -
-            -
                    $this->_importGoogleTotals($quote->getShippingAddress());
-            -
-            -
                    $quote->getPayment()->importData(array('method'=>'googlecheckout'));
-            -
-            -
                    $taxMessage = $this->_applyCustomTax($quote->getShippingAddress());
-            -
-            -
                    // CONVERT QUOTE TO ORDER
-            -
                    $convertQuote = Mage::getSingleton('sales/convert_quote');
-            -
-            -
                    /* @var $order Mage_Sales_Model_Order */
-            -
                    $order = $convertQuote->toOrder($quote);
-            -
-            -
                    if ($quote->isVirtual()) {
-            -
                        $convertQuote->addressToOrder($quote->getBillingAddress(), $order);
-            -
                    } else {
-            -
                        $convertQuote->addressToOrder($quote->getShippingAddress(), $order);
-            -
                    }
-            -
-            -
                    $order->setExtOrderId($this->getGoogleOrderNumber());
-            -
                    $order->setExtCustomerId($this->getData('root/buyer-id/VALUE'));
-            -
-            -
                    if (!$order->getCustomerEmail()) {
-            -
                        $order->setCustomerEmail($billing->getEmail())
-            -
                            ->setCustomerPrefix($billing->getPrefix())
-            -
                            ->setCustomerFirstname($billing->getFirstname())
-            -
                            ->setCustomerMiddlename($billing->getMiddlename())
-            -
                            ->setCustomerLastname($billing->getLastname())
-            -
                            ->setCustomerSuffix($billing->getSuffix());
-            -
                    }
-            -
-            -
                    $order->setBillingAddress($convertQuote->addressToOrderAddress($quote->getBillingAddress()));
-            -
-            -
                    if (!$quote->isVirtual()) {
-            -
                        $order->setShippingAddress($convertQuote->addressToOrderAddress($quote->getShippingAddress()));
-            -
                    }
-            -
                    #$order->setPayment($convertQuote->paymentToOrderPayment($quote->getPayment()));
-            -
-            -
                    foreach ($quote->getAllItems() as $item) {
-            -
                        $orderItem = $convertQuote->itemToOrderItem($item);
-            -
                        if ($item->getParentItem()) {
-            -
                            $orderItem->setParentItem($order->getItemByQuoteItemId($item->getParentItem()->getId()));
-            -
                        }
-            -
                        $order->addItem($orderItem);
-            -
                    }
-            -
-            -
                    /*
-            -
                     * Adding transaction for correct transaction information displaying on order view at back end.
-            -
                     * It has no influence on api interaction logic.
-            -
                     */
-            -
                    $payment = Mage::getModel('sales/order_payment')
-            -
                        ->setMethod('googlecheckout')
-            -
                        ->setTransactionId($this->getGoogleOrderNumber())
-            -
                        ->setIsTransactionClosed(false);
-            -
                    $order->setPayment($payment);
-            -
                    $payment->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH);
-            -
                    $order->setCanShipPartiallyItem(false);
-            -
-            -
                    $emailAllowed = ($this->getData('root/buyer-marketing-preferences/email-allowed/VALUE') === 'true');
-            -
-            -
                    $emailStr = $emailAllowed ? $this->__('Yes') : $this->__('No');
-            -
                    $message = $this->__('Google Order Number: %s', '<strong>' . $this->getGoogleOrderNumber() . '</strong><br />')
-            -
                            . $this->__('Google Buyer ID: %s', '<strong>' . $this->getData('root/buyer-id/VALUE') . '</strong><br />')
-            -
                            . $this->__('Is Buyer Willing to Receive Marketing Emails: %s', '<strong>' . $emailStr . '</strong>');
-            -
                    if ($taxMessage) {
-            -
                        $message .= $this->__('<br />Warning: <strong>%s</strong><br />', $taxMessage);
-            -
                    }
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $message);
-            -
                    $order->place();
-            -
                    $order->save();
-            -
                    $order->sendNewOrderEmail();
-            -
                    Mage::dispatchEvent('googlecheckout_save_order_after', array('order' => $order));
-            -
-            -
                    $quote->setIsActive(false)->save();
-            -
-            -
                    if ($emailAllowed) {
-            -
                        $customer = $quote->getCustomer();
-            -
                        if ($customer && $customer->getId()) {
-            -
                            $customer->setIsSubscribed(true);
-            -
                            Mage::getModel('newsletter/subscriber')->subscribeCustomer($customer);
-            -
                        } else {
-            -
                            Mage::getModel('newsletter/subscriber')->subscribe($order->getCustomerEmail());
-            -
                        }
-            -
                    }
-            -
-            -
                    Mage::dispatchEvent('checkout_submit_all_after', array('order' => $order, 'quote' => $quote));
-            -
-            -
                    $this->getGRequest()->SendMerchantOrderNumber($order->getExtOrderId(), $order->getIncrementId());
-            -
                }
-            -
-            -
                /**
-            -
                 * If tax value differs tax which is setted on magento,
-            -
                 * apply Google tax and recollect quote
-            -
                 *
-            -
                 * @param Varien_Object $qAddress
-            -
                 * @return string | false
-            -
                 */
-            -
                protected function _applyCustomTax($qAddress)
-            -
                {
-            -
                    $quote = $qAddress->getQuote();
-            -
                    $qTaxAmount = $qAddress->getBaseTaxAmount();
-            -
                    $newTaxAmount = $this->getData('root/order-adjustment/total-tax/VALUE');
-            -
-            -
                    if ($qTaxAmount != $newTaxAmount) {
-            -
                        $taxQuotient = (int) $qTaxAmount ? $newTaxAmount/$qTaxAmount : $newTaxAmount;
-            -
-            -
                        $qAddress->setTaxAmount(
-            -
                            $this->_reCalculateToStoreCurrency($newTaxAmount, $quote)
-            -
                        );
-            -
                        $qAddress->setBaseTaxAmount($newTaxAmount);
-            -
-            -
                        $grandTotal = $qAddress->getBaseGrandTotal() - $qTaxAmount + $newTaxAmount;
-            -
                        $qAddress->setGrandTotal(
-            -
                            $this->_reCalculateToStoreCurrency($grandTotal, $quote)
-            -
                        );
-            -
                        $qAddress->setBaseGrandTotal($grandTotal);
-            -
-            -
                        $subtotalInclTax = $qAddress->getSubtotalInclTax() - $qTaxAmount + $newTaxAmount;
-            -
                        $qAddress->setSubtotalInclTax($subtotalInclTax);
-            -
-            -
                        foreach ($quote->getAllVisibleItems() as $item) {
-            -
                            if ($item->getParentItem()) {
-            -
                                continue;
-            -
                            }
-            -
                            if ($item->getTaxAmount()) {
-            -
                                $item->setTaxAmount($item->getTaxAmount()*$taxQuotient);
-            -
                                $item->setBaseTaxAmount($item->getBaseTaxAmount()*$taxQuotient);
-            -
                                $taxPercent = round(($item->getTaxAmount()/$item->getRowTotal())*100);
-            -
                                $item->setTaxPercent($taxPercent);
-            -
                            }
-            -
                        }
-            -
-            -
                        $grandTotal = $quote->getBaseGrandTotal() - $qTaxAmount + $newTaxAmount;
-            -
                        $quote->setGrandTotal(
-            -
                            $this->_reCalculateToStoreCurrency($grandTotal, $quote)
-            -
                        );
-            -
                        $quote->setBaseGrandTotal($grandTotal);
-            -
-            -
                        $message = $this->__('The tax amount has been applied based on the information received from Google Checkout, because tax amount received from Google Checkout is different from the calculated tax amount');
-            -
                        return $message;
-            -
                    }
-            -
-            -
                    return false;
-            -
                }
-            -
-            -
                /**
-            -
                 * Import address data from google request to address object
-            -
                 *
-            -
                 * @param array | Varien_Object $gAddress
-            -
                 * @param Varien_Object $qAddress
-            -
                 * @return Varien_Object
-            -
                 */
-            -
                protected function _importGoogleAddress($gAddress, Varien_Object $qAddress=null)
-            -
                {
-            -
                    if (is_array($gAddress)) {
-            -
                        $gAddress = new Varien_Object($gAddress);
-            -
                    }
-            -
-            -
                    if (!$qAddress) {
-            -
                        $qAddress = Mage::getModel('sales/quote_address');
-            -
                    }
-            -
                    $nameArr = $gAddress->getData('structured-name');
-            -
                    if ($nameArr) {
-            -
                        $qAddress->setFirstname($nameArr['first-name']['VALUE'])
-            -
                            ->setLastname($nameArr['last-name']['VALUE']);
-            -
                    } else {
-            -
                        $nameArr = explode(' ', $gAddress->getData('contact-name/VALUE'), 2);
-            -
                        $qAddress->setFirstname($nameArr[0]);
-            -
                        if (!empty($nameArr[1])) {
-            -
                            $qAddress->setLastname($nameArr[1]);
-            -
                        }
-            -
                    }
-            -
                    $region = Mage::getModel('directory/region')->loadByCode(
-            -
                        $gAddress->getData('region/VALUE'),
-            -
                        $gAddress->getData('country-code/VALUE')
-            -
                    );
-            -
-            -
                    $qAddress->setCompany($gAddress->getData('company-name/VALUE'))
-            -
                        ->setEmail($gAddress->getData('email/VALUE'))
-            -
                        ->setStreet(trim($gAddress->getData('address1/VALUE') . "\n" . $gAddress->getData('address2/VALUE')))
-            -
                        ->setCity($gAddress->getData('city/VALUE'))
-            -
                        ->setRegion($gAddress->getData('region/VALUE'))
-            -
                        ->setRegionId($region->getId())
-            -
                        ->setPostcode($gAddress->getData('postal-code/VALUE'))
-            -
                        ->setCountryId($gAddress->getData('country-code/VALUE'))
-            -
                        ->setTelephone($gAddress->getData('phone/VALUE'))
-            -
                        ->setFax($gAddress->getData('fax/VALUE'));
-            -
-            -
                    return $qAddress;
-            -
                }
-            -
-            -
                /**
-            -
                 * Returns array of possible shipping methods combinations
-            -
                 * Includes internal GoogleCheckout shipping methods, that can be created
-            -
                 * after successful Google Checkout
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                protected function _getShippingInfos($storeId = null)
-            -
                {
-            -
                    $cacheKey = ($storeId === null) ? 'nofilter' : $storeId;
-            -
                    if (!isset($this->_cachedShippingInfo[$cacheKey])) {
-            -
                        /* @var $shipping Mage_Shipping_Model_Shipping */
-            -
                        $shipping = Mage::getModel('shipping/shipping');
-            -
                        $carriers = Mage::getStoreConfig('carriers', $storeId);
-            -
                        $infos = array();
-            -
-            -
                        foreach (array_keys($carriers) as $carrierCode) {
-            -
                            $carrier = $shipping->getCarrierByCode($carrierCode);
-            -
                            if (!$carrier) {
-            -
                                continue;
-            -
                            }
-            -
-            -
                            if ($carrierCode == 'googlecheckout') {
-            -
                                // Add info about internal google checkout methods
-            -
                                $methods = array_merge($carrier->getAllowedMethods(), $carrier->getInternallyAllowedMethods());
-            -
                                $carrierName = 'Google Checkout';
-            -
                            } else {
-            -
                                $methods = $carrier->getAllowedMethods();
-            -
                                $carrierName = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $storeId);
-            -
                            }
-            -
-            -
                            foreach ($methods as $methodCode => $methodName) {
-            -
                                $code = $carrierCode . '_' . $methodCode;
-            -
                                $name = sprintf('%s - %s', $carrierName, $methodName);
-            -
                                $infos[$code] = array(
-            -
                                    'code' => $code,
-            -
                                    'name' => $name, // Internal name for google checkout api - to distinguish it in google requests
-            -
                                    'carrier' => $carrierCode,
-            -
                                    'carrier_title' => $carrierName,
-            -
                                    'method' => $methodCode,
-            -
                                    'method_title' => $methodName
-            -
                                );
-            -
                            }
-            -
                        }
-            -
                        $this->_cachedShippingInfo[$cacheKey] = $infos;
-            -
                    }
-            -
-            -
                    return $this->_cachedShippingInfo[$cacheKey];
-            -
                }
-            -
-            -
                /**
-            -
                 * Return shipping method code by shipping method name received from Google
-            -
                 *
-            -
                 * @param string $name
-            -
                 * @param int|string|Mage_Core_Model_Store $storeId
-            -
                 * @return string|false
-            -
                 */
-            -
                protected function _getShippingMethodByName($name, $storeId = null)
-            -
                {
-            -
                    $code = false;
-            -
                    $infos = $this->_getShippingInfos($storeId);
-            -
                    foreach ($infos as $info) {
-            -
                        if ($info['name'] == $name) {
-            -
                            $code = $info['code'];
-            -
                            break;
-            -
                        }
-            -
                    }
-            -
                    return $code;
-            -
                }
-            -
-            -
                /**
-            -
                 * Creates rate by method code
-            -
                 * Sets shipping rate's accurate description, titles and so on,
-            -
                 * so it will get in order description properly
-            -
                 *
-            -
                 * @param string $code
-            -
                 * @return Mage_Sales_Model_Quote_Address_Rate
-            -
                 */
-            -
                protected function _createShippingRate($code, $storeId = null)
-            -
                {
-            -
                    $rate = Mage::getModel('sales/quote_address_rate')
-            -
                        ->setCode($code);
-            -
-            -
                    $infos = $this->_getShippingInfos($storeId);
-            -
                    if (isset($infos[$code])) {
-            -
                        $info = $infos[$code];
-            -
                        $rate->setCarrier($info['carrier'])
-            -
                            ->setCarrierTitle($info['carrier_title'])
-            -
                            ->setMethod($info['method'])
-            -
                            ->setMethodTitle($info['method_title']);
-            -
                    }
-            -
-            -
                    return $rate;
-            -
                }
-            -
-            -
                /**
-            -
                 * Import totals information from google request to quote address
-            -
                 *
-            -
                 * @param Varien_Object $qAddress
-            -
                 */
-            -
                protected function _importGoogleTotals($qAddress)
-            -
                {
-            -
                    $quote = $qAddress->getQuote();
-            -
                    $qAddress->setTaxAmount(
-            -
                        $this->_reCalculateToStoreCurrency($this->getData('root/order-adjustment/total-tax/VALUE'), $quote)
-            -
                    );
-            -
                    $qAddress->setBaseTaxAmount($this->getData('root/order-adjustment/total-tax/VALUE'));
-            -
-            -
                    $method = null;
-            -
                    $prefix = 'root/order-adjustment/shipping/';
-            -
                    if (null !== ($shipping = $this->getData($prefix . 'carrier-calculated-shipping-adjustment'))) {
-            -
                        $method = 'googlecheckout_carrier';
-            -
                    } else if (null !== ($shipping = $this->getData($prefix . 'merchant-calculated-shipping-adjustment'))) {
-            -
                        $method = 'googlecheckout_merchant';
-            -
                    } else if (null !== ($shipping = $this->getData($prefix . 'flat-rate-shipping-adjustment'))) {
-            -
                        $method = 'googlecheckout_flatrate';
-            -
                    } else if (null !== ($shipping = $this->getData($prefix . 'pickup-shipping-adjustment'))) {
-            -
                        $method = 'googlecheckout_pickup';
-            -
                    }
-            -
-            -
                    if ($method) {
-            -
                        Mage::getSingleton('tax/config')->setShippingPriceIncludeTax(false);
-            -
                        $rate = $this->_createShippingRate($method)
-            -
                            ->setMethodTitle($shipping['shipping-name']['VALUE'])
-            -
                            ->setPrice($shipping['shipping-cost']['VALUE']);
-            -
                        $qAddress->addShippingRate($rate)
-            -
                            ->setShippingMethod($method)
-            -
                            ->setShippingDescription($shipping['shipping-name']['VALUE']);
-            -
                        // We get from Google price with discounts applied via merchant calculations
-            -
                        $qAddress->setShippingAmountForDiscount(0);
-            -
-            -
                        /*if (!Mage::helper('tax')->shippingPriceIncludesTax($quote->getStore())) {
-            -
                            $includingTax = Mage::helper('tax')->getShippingPrice(
-            -
                                $excludingTax, true, $qAddress, $quote->getCustomerTaxClassId()
-            -
                            );
-            -
                            $shippingTax = $includingTax - $excludingTax;
-            -
                            $qAddress->setShippingTaxAmount($this->_reCalculateToStoreCurrency($shippingTax, $quote))
-            -
                                ->setBaseShippingTaxAmount($shippingTax)
-            -
                                ->setShippingInclTax($includingTax)
-            -
                                ->setBaseShippingInclTax($this->_reCalculateToStoreCurrency($includingTax, $quote));
-            -
                        } else {
-            -
                            if ($method == 'googlecheckout_carrier') {
-            -
                                $qAddress->setShippingTaxAmount(0)
-            -
                                    ->setBaseShippingTaxAmount(0);
-            -
                            }
-            -
                        }*/
-            -
                    } else {
-            -
                        $qAddress->setShippingMethod(null);
-            -
                    }
-            -
-            -
-            -
                    $qAddress->setGrandTotal(
-            -
                        $this->_reCalculateToStoreCurrency($this->getData('root/order-total/VALUE'), $quote)
-            -
                    );
-            -
                    $qAddress->setBaseGrandTotal($this->getData('root/order-total/VALUE'));
-            -
                }
-            -
-            -
                /**
-            -
                 * Order getter
-            -
                 *
-            -
                 * @return Mage_Sales_Model_Order
-            -
                 */
-            -
                public function getOrder()
-            -
                {
-            -
                    if (!$this->hasData('order')) {
-            -
                        $order = Mage::getModel('sales/order')
-            -
                            ->loadByAttribute('ext_order_id', $this->getGoogleOrderNumber());
-            -
                        if (!$order->getId()) {
-            -
                            Mage::throwException('Invalid Order: ' . $this->getGoogleOrderNumber());
-            -
                        }
-            -
                        $this->setData('order', $order);
-            -
                    }
-            -
                    return $this->getData('order');
-            -
                }
-            -
-            -
                protected function _responseRiskInformationNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $order = $this->getOrder();
-            -
                    $payment = $order->getPayment();
-            -
-            -
                    $order
-            -
                        ->setRemoteIp($this->getData('root/risk-information/ip-address/VALUE'));
-            -
-            -
                    $payment
-            -
                        ->setCcLast4($this->getData('root/risk-information/partial-cc-number/VALUE'))
-            -
                        ->setCcAvsStatus($this->getData('root/risk-information/avs-response/VALUE'))
-            -
                        ->setCcCidStatus($this->getData('root/risk-information/cvn-response/VALUE'));
-            -
-            -
                    $msg = $this->__('Google Risk Information:');
-            -
                    $msg .= '<br />' . $this->__('IP Address: %s', '<strong>' . $order->getRemoteIp() . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('CC Partial: xxxx-%s', '<strong>' . $payment->getCcLast4() . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('AVS Status: %s', '<strong>' . $payment->getCcAvsStatus() . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('CID Status: %s', '<strong>' . $payment->getCcCidStatus() . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Eligible for Protection: %s', '<strong>' . ($this->getData('root/risk-information/eligible-for-protection/VALUE')=='true' ? 'Yes' : 'No') . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Buyer Account Age: %s days', '<strong>' . $this->getData('root/risk-information/buyer-account-age/VALUE') . '</strong>');
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $msg);
-            -
                    $order->save();
-            -
                }
-            -
-            -
                /**
-            -
                 * Process authorization notification
-            -
                 */
-            -
                protected function _responseAuthorizationAmountNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $order = $this->getOrder();
-            -
                    $payment = $order->getPayment();
-            -
-            -
                    $payment->setAmountAuthorized($this->getData('root/authorization-amount/VALUE'));
-            -
-            -
                    $expDate = $this->getData('root/authorization-expiration-date/VALUE');
-            -
                    $expDate = new Zend_Date($expDate);
-            -
                    $msg = $this->__('Google Authorization:');
-            -
                    $msg .= '<br />' . $this->__('Amount: %s', '<strong>' . $this->_formatAmount($payment->getAmountAuthorized()) . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Expiration: %s', '<strong>' . $expDate->toString() . '</strong>');
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $msg);
-            -
-            -
                    $order->setPaymentAuthorizationAmount($payment->getAmountAuthorized());
-            -
                    $timestamp = Mage::getModel('core/date')->gmtTimestamp(
-            -
                        $this->getData('root/authorization-expiration-date/VALUE')
-            -
                    );
-            -
                    $order->setPaymentAuthorizationExpiration(
-            -
                        $timestamp ? $timestamp : Mage::getModel('core/date')->gmtTimestamp()
-            -
                    );
-            -
-            -
                    $order->save();
-            -
                }
-            -
-            -
                /**
-            -
                 * Process charge notification
-            -
                 *
-            -
                 */
-            -
                protected function _responseChargeAmountNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $order = $this->getOrder();
-            -
                    $payment = $order->getPayment();
-            -
                    if ($payment->getMethod() !== 'googlecheckout') {
-            -
                        return;
-            -
                    }
-            -
-            -
                    $latestCharged = $this->getData('root/latest-charge-amount/VALUE');
-            -
                    $totalCharged = $this->getData('root/total-charge-amount/VALUE');
-            -
                    $payment->setAmountCharged($totalCharged);
-            -
                    $order->setIsInProcess(true);
-            -
-            -
                    $msg = $this->__('Google Charge:');
-            -
                    $msg .= '<br />' . $this->__('Latest Charge: %s', '<strong>' . $this->_formatAmount($latestCharged) . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Total Charged: %s', '<strong>' . $this->_formatAmount($totalCharged) . '</strong>');
-            -
-            -
                    if (!$order->hasInvoices() && abs($order->getBaseGrandTotal() - $latestCharged) < .0001) {
-            -
                        $invoice = $this->_createInvoice();
-            -
                        $msg .= '<br />' . $this->__('Invoice Auto-Created: %s', '<strong>' . $invoice->getIncrementId() . '</strong>');
-            -
                    }
-            -
-            -
                    $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
-            -
-            -
                    $open = Mage_Sales_Model_Order_Invoice::STATE_OPEN;
-            -
                    foreach ($order->getInvoiceCollection() as $orderInvoice) {
-            -
                        if ($orderInvoice->getState() == $open && $orderInvoice->getBaseGrandTotal() == $latestCharged) {
-            -
                            $orderInvoice->setState(Mage_Sales_Model_Order_Invoice::STATE_PAID)
-            -
                                ->setTransactionId($this->getGoogleOrderNumber())
-            -
                                ->save();
-            -
                            break;
-            -
                        }
-            -
                    }
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $msg);
-            -
                    $order->save();
-            -
                }
-            -
-            -
                protected function _createInvoice()
-            -
                {
-            -
                    $order = $this->getOrder();
-            -
-            -
                    $invoice = $order->prepareInvoice()
-            -
                        ->setTransactionId($this->getGoogleOrderNumber())
-            -
                        ->addComment(Mage::helper('googlecheckout')->__('Auto-generated from GoogleCheckout Charge'))
-            -
                        ->register()
-            -
                        ->pay();
-            -
-            -
                    $transactionSave = Mage::getModel('core/resource_transaction')
-            -
                        ->addObject($invoice)
-            -
                        ->addObject($invoice->getOrder());
-            -
-            -
                    $transactionSave->save();
-            -
-            -
                    return $invoice;
-            -
                }
-            -
-            -
                protected function _createShipment()
-            -
                {
-            -
                    $order = $this->getOrder();
-            -
                    $shipment = $order->prepareShipment();
-            -
                    if ($shipment) {
-            -
                        $shipment->register();
-            -
-            -
                        $order->setIsInProcess(true);
-            -
-            -
                        $transactionSave = Mage::getModel('core/resource_transaction')
-            -
                            ->addObject($shipment)
-            -
                            ->addObject($shipment->getOrder())
-            -
                            ->save();
-            -
                    }
-            -
-            -
                    return $shipment;
-            -
                }
-            -
-            -
                /**
-            -
                 * Process chargeback notification
-            -
                 */
-            -
                protected function _responseChargebackAmountNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $latestChargeback = $this->getData('root/latest-chargeback-amount/VALUE');
-            -
                    $totalChargeback = $this->getData('root/total-chargeback-amount/VALUE');
-            -
-            -
                    $order = $this->getOrder();
-            -
                    if ($order->getBaseGrandTotal() == $totalChargeback) {
-            -
                        $creditmemo = Mage::getModel('sales/service_order', $order)
-            -
                            ->prepareCreditmemo()
-            -
                            ->setPaymentRefundDisallowed(true)
-            -
                            ->setAutomaticallyCreated(true)
-            -
                            ->register();
-            -
-            -
                        $creditmemo->addComment($this->__('Credit memo has been created automatically'));
-            -
                        $creditmemo->save();
-            -
                    }
-            -
                    $msg = $this->__('Google Chargeback:');
-            -
                    $msg .= '<br />' . $this->__('Latest Chargeback: %s', '<strong>' . $this->_formatAmount($latestChargeback) . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Total Chargeback: %s', '<strong>' . $this->_formatAmount($totalChargeback) . '</strong>');
-            -
-            -
                    $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
-            -
                        Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $msg);
-            -
                    $order->save();
-            -
                }
-            -
-            -
                /**
-            -
                 * Process refund notification
-            -
                 */
-            -
                protected function _responseRefundAmountNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $latestRefunded = $this->getData('root/latest-refund-amount/VALUE');
-            -
                    $totalRefunded = $this->getData('root/total-refund-amount/VALUE');
-            -
-            -
                    $order = $this->getOrder();
-            -
                    $amountRefundLeft = $order->getBaseGrandTotal() - $order->getBaseTotalRefunded()
-            -
                        - $order->getBaseAdjustmentNegative();
-            -
                    if (abs($amountRefundLeft) < .0001) {
-            -
                        return;
-            -
                    }
-            -
                    if ($amountRefundLeft < $latestRefunded) {
-            -
                        $latestRefunded = $amountRefundLeft;
-            -
                        $totalRefunded  = $order->getBaseGrandTotal();
-            -
                    }
-            -
-            -
                    if ($order->getBaseTotalRefunded() > 0) {
-            -
                        $adjustment = array('adjustment_positive' => $latestRefunded);
-            -
                    } else {
-            -
                        $adjustment = array('adjustment_negative' => $order->getBaseGrandTotal() - $latestRefunded);
-            -
                    }
-            -
-            -
                    $creditmemo = Mage::getModel('sales/service_order', $order)
-            -
                        ->prepareCreditmemo($adjustment)
-            -
                        ->setPaymentRefundDisallowed(true)
-            -
                        ->setAutomaticallyCreated(true)
-            -
                        ->register()
-            -
                        ->addComment($this->__('Credit memo has been created automatically'))
-            -
                        ->save();
-            -
-            -
                    $msg = $this->__('Google Refund:');
-            -
                    $msg .= '<br />' . $this->__('Latest Refund: %s', '<strong>' . $this->_formatAmount($latestRefunded) . '</strong>');
-            -
                    $msg .= '<br />' . $this->__('Total Refunded: %s', '<strong>' . $this->_formatAmount($totalRefunded) . '</strong>');
-            -
-            -
                    $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
-            -
                        Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
-            -
-            -
                    $order->addStatusToHistory($order->getStatus(), $msg);
-            -
                    $order->save();
-            -
                }
-            -
-            -
                protected function _responseOrderStateChangeNotification()
-            -
                {
-            -
                    $this->getGResponse()->SendAck();
-            -
-            -
                    $prevFinancial = $this->getData('root/previous-financial-order-state/VALUE');
-            -
                    $newFinancial = $this->getData('root/new-financial-order-state/VALUE');
-            -
                    $prevFulfillment = $this->getData('root/previous-fulfillment-order-state/VALUE');
-            -
                    $newFulfillment = $this->getData('root/new-fulfillment-order-state/VALUE');
-            -
-            -
                    $msg = $this->__('Google Order Status Change:');
-            -
                    if ($prevFinancial!=$newFinancial) {
-            -
                        $msg .= "<br />" . $this->__('Financial: %s -> %s', '<strong>' . $prevFinancial . '</strong>', '<strong>' . $newFinancial . '</strong>');
-            -
                    }
-            -
                    if ($prevFulfillment!=$newFulfillment) {
-            -
                        $msg .= "<br />" . $this->__('Fulfillment: %s -> %s', '<strong>' . $prevFulfillment . '</strong>', '<strong>' . $newFulfillment . '</strong>');
-            -
                    }
-            -
                    $this->getOrder()
-            -
                        ->addStatusToHistory($this->getOrder()->getStatus(), $msg)
-            -
                        ->save();
-            -
-            -
                    $method = '_orderStateChangeFinancial' . uc_words(strtolower($newFinancial), '', '_');
-            -
                    if (method_exists($this, $method)) {
-            -
                        $this->$method();
-            -
                    }
-            -
-            -
                    $method = '_orderStateChangeFulfillment' . uc_words(strtolower($newFulfillment), '', '_');
-            -
                    if (method_exists($this, $method)) {
-            -
                        $this->$method();
-            -
                    }
-            -
                }
-            -
-            -
                /**
-            -
                 * Add transaction to payment with defined type
-            -
                 *
-            -
                 * @param   string $typeTarget
-            -
                 * @param   string $typeParent
-            -
                 * @return  Mage_GoogleCheckout_Model_Api_Xml_Callback
-            -
                 */
-            -
                protected function _addChildTransaction(
-            -
                    $typeTarget,
-            -
                    $typeParent = Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH)
-            -
                {
-            -
                    $payment                = $this->getOrder()->getPayment();
-            -
                    $googleOrderId          = $this->getGoogleOrderNumber();
-            -
                    $parentTransactionId    = $googleOrderId;
-            -
-            -
                    if ($typeParent != Mage_Sales_Model_Order_Payment_Transaction::TYPE_AUTH) {
-            -
                        $parentTransactionId .= '-' . $typeParent;
-            -
                    } else {
-            -
                        $payment->setIsTransactionClosed(false);
-            -
                    }
-            -
-            -
                    $parentTransaction = $payment->getTransaction($parentTransactionId);
-            -
-            -
                    if ($parentTransaction) {
-            -
                        $payment->setParentTransactionId($parentTransactionId)
-            -
                            ->setTransactionId($googleOrderId . '-' . $typeTarget)
-            -
                            ->addTransaction($typeTarget);
-            -
-            -
                        if ($this->getOrder()->getTotalDue() < .0001) {
-            -
                            $parentTransaction->setIsClosed(true)
-            -
                                ->save();
-            -
                        }
-            -
                    }
-            -
-            -
                    return $this;
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialReviewing()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialChargeable()
-            -
                {
-            -
                    #$this->getGRequest()->SendProcessOrder($this->getGoogleOrderNumber());
-            -
                    #$this->getGRequest()->SendChargeOrder($this->getGoogleOrderNumber(), '');
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialCharging()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialCharged()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialPaymentDeclined()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialCancelled()
-            -
                {
-            -
                    $this->getOrder()->setBeingCanceledFromGoogleApi(true)->cancel()->save();
-            -
                }
-            -
-            -
                protected function _orderStateChangeFinancialCancelledByGoogle()
-            -
                {
-            -
                    $this
-            -
                        ->getOrder()
-            -
                        ->setBeingCanceledFromGoogleApi(true)
-            -
                        ->cancel()
-            -
                        ->save();
-            -
-            -
                    $this
-            -
                        ->getGRequest()
-            -
                        ->SendBuyerMessage($this->getGoogleOrderNumber(), "Sorry, your order is cancelled by Google", true);
-            -
                }
-            -
-            -
                protected function _orderStateChangeFulfillmentNew()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFulfillmentProcessing()
-            -
                {
-            -
-            -
                }
-            -
-            -
                protected function _orderStateChangeFulfillmentDelivered()
-            -
                {
-            -
                    $shipment = $this->_createShipment();
-            -
                    if (!is_null($shipment))
-            -
                        $shipment->save();
-            -
                }
-            -
-            -
                protected function _orderStateChangeFulfillmentWillNotDeliver()
-            -
                {
-            -
-            -
                }
-            -
-            -
                /**
-            -
                 * Format amount to be displayed
-            -
                 *
-            -
                 * @param mixed $amount
-            -
                 * @return string
-            -
                 */
-            -
                protected function _formatAmount($amount)
-            -
                {
-            -
                    // format currency in currency format, but don't enclose it into <span>
-            -
                    return Mage::helper('core')->currency($amount, true, false);
-            -
                }
-            -
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Checkout.php DELETED Viewed

@@ -1,1143 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            /**
-            -
             * Google Checkout XML API processing model
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Api_Xml_Checkout extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
-            -
            {
-            -
                /**
-            -
                 * Representation value of item weight unit
-            -
                 */
-            -
                const ITEM_WEIGHT_UNIT = 'LB';
-            -
-            -
                /**
-            -
                 * Representation value of item size unit
-            -
                 */
-            -
                const ITEM_SIZE_UNIT = 'IN';
-            -
-            -
                /**
-            -
                 * Google checkout namespace URI
-            -
                 */
-            -
                const CHECKOUT_SHOPPING_CART_XMLNS = 'http://checkout.google.com/schema/2';
-            -
-            -
                /**
-            -
                 * @deprecated after 0.8.16100
-            -
                 *
-            -
                 * @var string
-            -
                 */
-            -
                protected $_currency;
-            -
-            -
                /**
-            -
                 * Define if shipping rates already calculated
-            -
                 *
-            -
                 * @var boolean
-            -
                 */
-            -
                protected $_shippingCalculated = false;
-            -
-            -
                /**
-            -
                 * API URL getter
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getApiUrl()
-            -
                {
-            -
                    $url = $this->_getBaseApiUrl();
-            -
                    $url .= 'merchantCheckout/Merchant/' . $this->getMerchantId();
-            -
                    return $url;
-            -
                }
-            -
-            -
                /**
-            -
                 * Send checkout data to google
-            -
                 *
-            -
                 * @return Mage_GoogleCheckout_Model_Api_Xml_Checkout
-            -
                 */
-            -
                public function checkout()
-            -
                {
-            -
                    $quote = $this->getQuote();
-            -
                    if (!($quote instanceof Mage_Sales_Model_Quote)) {
-            -
                        Mage::throwException('Invalid quote');
-            -
                    }
-            -
-            -
                    $xmlns = self::CHECKOUT_SHOPPING_CART_XMLNS;
-            -
                    $xml = <<<EOT
-            -
            <checkout-shopping-cart xmlns="{$xmlns}">
-            -
                <shopping-cart>
-            -
            {$this->_getItemsXml()}
-            -
            {$this->_getMerchantPrivateDataXml()}
-            -
            {$this->_getCartExpirationXml()}
-            -
                </shopping-cart>
-            -
                <checkout-flow-support>
-            -
            {$this->_getMerchantCheckoutFlowSupportXml()}
-            -
                </checkout-flow-support>
-            -
                <order-processing-support>
-            -
            {$this->_getRequestInitialAuthDetailsXml()}
-            -
                </order-processing-support>
-            -
            </checkout-shopping-cart>
-            -
            EOT;
-            -
-            -
                    $result = $this->_call($xml);
-            -
                    $this->setRedirectUrl($result->{'redirect-url'});
-            -
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve quote items in XML format
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getItemsXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                    <items>
-            -
-            -
            EOT;
-            -
-            -
                    foreach ($this->getQuote()->getAllItems() as $item) {
-            -
                        if ($item->getParentItem()) {
-            -
                            continue;
-            -
                        }
-            -
                        $taxClass   = ($item->getTaxClassId() == 0) ? 'none' : $item->getTaxClassId();
-            -
                        $weight     = (float) $item->getWeight();
-            -
                        $weightUnit = self::ITEM_WEIGHT_UNIT;
-            -
-            -
                        $unitPrice = $item->getBaseCalculationPrice();
-            -
                        if (Mage::helper('weee')->includeInSubtotal()) {
-            -
                            $unitPrice += $item->getBaseWeeeTaxAppliedAmount();
-            -
                        }
-            -
-            -
                        $xml .= <<<EOT
-            -
                        <item>
-            -
                            <merchant-item-id><![CDATA[{$item->getSku()}]]></merchant-item-id>
-            -
                            <item-name><![CDATA[{$item->getName()}]]></item-name>
-            -
                            <item-description><![CDATA[{$item->getDescription()}]]></item-description>
-            -
                            <unit-price currency="{$this->getCurrency()}">{$unitPrice}</unit-price>
-            -
                            <quantity>{$item->getQty()}</quantity>
-            -
                            <item-weight unit="{$weightUnit}" value="{$weight}" />
-            -
                            <tax-table-selector>{$taxClass}</tax-table-selector>
-            -
                            {$this->_getDigitalContentXml($item->getIsVirtual())}
-            -
                            {$this->_getMerchantPrivateItemDataXml($item)}
-            -
                        </item>
-            -
-            -
            EOT;
-            -
                    }
-            -
-            -
                    $billingAddress = $this->getQuote()->getBillingAddress();
-            -
                    $shippingAddress = $this->getQuote()->getShippingAddress();
-            -
-            -
                    $shippingDiscount = (float)$shippingAddress->getBaseDiscountAmount();
-            -
                    $billingDiscount = (float)$billingAddress->getBaseDiscountAmount();
-            -
                    $discount = $billingDiscount + $shippingDiscount;
-            -
-            -
                    // Exclude shipping discount
-            -
                    // Discount is negative value
-            -
                    $discount += $shippingAddress->getBaseShippingDiscountAmount();
-            -
-            -
                    $discountItem = new Varien_Object(array(
-            -
                        'price' => $discount,
-            -
                        'name'  => $this->__('Cart Discount'),
-            -
                        'description' => $this->__('A virtual item to reflect the discount total')
-            -
                    ));
-            -
-            -
                    Mage::dispatchEvent('google_checkout_discount_item_price', array(
-            -
                        'quote'         => $this->getQuote(),
-            -
                        'discount_item' => $discountItem
-            -
                    ));
-            -
-            -
                    $discount = $discountItem->getPrice();
-            -
                    if ($discount) {
-            -
                        $xml .= <<<EOT
-            -
                        <item>
-            -
                            <merchant-item-id>_INTERNAL_DISCOUNT_</merchant-item-id>
-            -
                            <item-name>{$discountItem->getName()}</item-name>
-            -
                            <item-description>{$discountItem->getDescription()}</item-description>
-            -
                            <unit-price currency="{$this->getCurrency()}">{$discount}</unit-price>
-            -
                            <quantity>1</quantity>
-            -
                            <item-weight unit="{$weightUnit}" value="0.00" />
-            -
                            <tax-table-selector>none</tax-table-selector>
-            -
                            {$this->_getDigitalContentXml($this->getQuote()->isVirtual())}
-            -
                        </item>
-            -
-            -
            EOT;
-            -
                    }
-            -
-            -
                    $hiddenTax = $shippingAddress->getBaseHiddenTaxAmount() + $billingAddress->getBaseHiddenTaxAmount();
-            -
                    if ($hiddenTax) {
-            -
                        $xml .= <<<EOT
-            -
                        <item>
-            -
                            <merchant-item-id>_INTERNAL_TAX_</merchant-item-id>
-            -
                            <item-name>{$this->__('Discount Tax')}</item-name>
-            -
                            <item-description>{$this->__('A virtual item to reflect the tax total')}</item-description>
-            -
                            <unit-price currency="{$this->getCurrency()}">{$hiddenTax}</unit-price>
-            -
                            <quantity>1</quantity>
-            -
                            <item-weight unit="{$weightUnit}" value="0.00" />
-            -
                            <tax-table-selector>none</tax-table-selector>
-            -
                            {$this->_getDigitalContentXml($this->getQuote()->isVirtual())}
-            -
                        </item>
-            -
            EOT;
-            -
                    }
-            -
                    $xml .= <<<EOT
-            -
                    </items>
-            -
            EOT;
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve digital content XML
-            -
                 *
-            -
                 * @param boolean $isVirtual
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getDigitalContentXml($isVirtual)
-            -
                {
-            -
                    if (!$isVirtual) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $storeId = $this->getQuote()->getStoreId();
-            -
                    $active = Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_ACTIVE, $storeId);
-            -
                    if (!$active) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $schedule = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_SCHEDULE, $storeId);
-            -
                    $method   = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_VIRTUAL_METHOD, $storeId);
-            -
-            -
                    $xml = "<display-disposition>{$schedule}</display-disposition>";
-            -
-            -
                    if ($method == 'email') {
-            -
                        $xml .= '<email-delivery>true</email-delivery>';
-            -
                    } elseif ($method == 'key_url') {
-            -
                    } elseif ($method == 'description_based') {
-            -
                    }
-            -
-            -
                    $xml = "<digital-content>{$xml}</digital-content>";
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Convert quote item to private item XML
-            -
                 *
-            -
                 * @param Mage_Sales_Model_Quote_Item $item
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getMerchantPrivateItemDataXml($item)
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                        <merchant-private-item-data>
-            -
                            <quote-item-id>{$item->getId()}</quote-item-id>
-            -
                        </merchant-private-item-data>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve merchant private data XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getMerchantPrivateDataXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                        <merchant-private-data>
-            -
                            <quote-id><![CDATA[{$this->getQuote()->getId()}]]></quote-id>
-            -
                            <store-id><![CDATA[{$this->getQuote()->getStoreId()}]]></store-id>
-            -
                        </merchant-private-data>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve quote expiration XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getCartExpirationXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve merchant checkout flow support XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getMerchantCheckoutFlowSupportXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                    <merchant-checkout-flow-support>
-            -
                        <edit-cart-url><![CDATA[{$this->_getEditCartUrl()}]]></edit-cart-url>
-            -
                        <continue-shopping-url><![CDATA[{$this->_getContinueShoppingUrl()}]]></continue-shopping-url>
-            -
                        {$this->_getRequestBuyerPhoneNumberXml()}
-            -
                        {$this->_getMerchantCalculationsXml()}
-            -
                        {$this->_getShippingMethodsXml()}
-            -
                        {$this->_getAllTaxTablesXml()}
-            -
                        {$this->_getParameterizedUrlsXml()}
-            -
                        {$this->_getPlatformIdXml()}
-            -
                        {$this->_getAnalyticsDataXml()}
-            -
                    </merchant-checkout-flow-support>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve request buyer phone number XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getRequestBuyerPhoneNumberXml()
-            -
                {
-            -
                    $requestPhone = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_REQUEST_PHONE,
-            -
                        $this->getQuote()->getStoreId()
-            -
                    );
-            -
                    $requestPhone = $requestPhone ? 'true' : 'false';
-            -
                    $xml = <<<EOT
-            -
                        <request-buyer-phone-number>{$requestPhone}</request-buyer-phone-number>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve merchant calculations XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getMerchantCalculationsXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                        <merchant-calculations>
-            -
                            <merchant-calculations-url><![CDATA[{$this->_getCalculationsUrl()}]]></merchant-calculations-url>
-            -
                        </merchant-calculations>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve free shipping rate XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getVirtualOrderShippingXml()
-            -
                {
-            -
                    $title = Mage::helper('googlecheckout')->__('Free Shipping');
-            -
-            -
                    $xml = <<<EOT
-            -
                        <shipping-methods>
-            -
                            <flat-rate-shipping name="{$title}">
-            -
                                <shipping-restrictions><allowed-areas><world-area /></allowed-areas></shipping-restrictions>
-            -
                                <price currency="{$this->getCurrency()}">0</price>
-            -
                            </flat-rate-shipping>
-            -
                        </shipping-methods>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve shipping methods XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getShippingMethodsXml()
-            -
                {
-            -
                    if ($this->_isOrderVirtual()) {
-            -
                        return $this->_getVirtualOrderShippingXml();
-            -
                    }
-            -
-            -
                    $xml = <<<EOT
-            -
                        <shipping-methods>
-            -
                            {$this->_getCarrierCalculatedShippingXml()}
-            -
                            {$this->_getFlatRateShippingXml()}
-            -
                            {$this->_getMerchantCalculatedShippingXml()}
-            -
                            {$this->_getPickupXml()}
-            -
                        </shipping-methods>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate XML of calculated shipping carriers rates
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getCarrierCalculatedShippingXml()
-            -
                {
-            -
                    /*
-            -
                     * Prevent sending more then one shipping option to Google
-            -
                     */
-            -
                    if ($this->_shippingCalculated) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $storeId = $this->getQuote()->getStoreId();
-            -
                    $active = Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_ACTIVE, $storeId);
-            -
                    $methods = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_METHODS, $storeId);
-            -
-            -
                    if (!$active || !$methods) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $country  = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_COUNTRY_ID, $storeId);
-            -
                    $region   = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_REGION_ID, $storeId);
-            -
                    $postcode = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_POSTCODE, $storeId);
-            -
                    $city     = Mage::getStoreConfig(Mage_Shipping_Model_Config::XML_PATH_ORIGIN_CITY, $storeId);
-            -
-            -
                    $defPrice = (float)Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_PRICE,
-            -
                        $storeId
-            -
                    );
-            -
                    $width = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_WIDTH,
-            -
                        $storeId
-            -
                    );
-            -
                    $height = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_HEIGHT,
-            -
                        $storeId
-            -
                    );
-            -
                    $length = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_DEFAULT_LENGTH,
-            -
                        $storeId
-            -
                    );
-            -
                    $sizeUnit = self::ITEM_SIZE_UNIT;
-            -
-            -
                    $addressCategory = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_CARRIER_ADDRESS_CATEGORY,
-            -
                        $storeId
-            -
                    );
-            -
                    $defPrice = (float) Mage::helper('tax')->getShippingPrice($defPrice, false, false);
-            -
-            -
                    $this->getQuote()->getShippingAddress()
-            -
                        ->setCountryId($country)
-            -
                        ->setCity($city)
-            -
                        ->setPostcode($postcode)
-            -
                        ->setRegionId($region)
-            -
                        ->setCollectShippingRates(true);
-            -
-            -
                    $address = $this->getQuote()->getShippingAddress();
-            -
                    $address->collectShippingRates();
-            -
                    $shipments = $address->getGroupedAllShippingRates();
-            -
-            -
                    $shippingMethodsList = array();
-            -
                    foreach (explode(',', $methods) as $method) {
-            -
                        list($company, $type) = explode('/', $method);
-            -
                        $shippingMethodsList[$method] = array('company' => $company, 'type' => $type);
-            -
                    }
-            -
-            -
                    $freeMethodsList = array();
-            -
                    foreach ($this->_getGoogleCarriersMap() as $mageCode => $map) {
-            -
                        if (!isset($shipments[$mageCode])) {
-            -
                            continue;
-            -
                        }
-            -
                        $freeMethod = Mage::getStoreConfig('carriers/' . $mageCode . '/free_method', $storeId);
-            -
-            -
                        foreach ($shipments[$mageCode] as $rate) {
-            -
                            $mageRateCode = $rate->getMethod();
-            -
                            if ($mageRateCode != $freeMethod) {
-            -
                                continue;
-            -
                            }
-            -
-            -
                            $googleRateCode = isset($map['methods'][$mageRateCode]) ? $map['methods'][$mageRateCode] : false;
-            -
                            if (false == $googleRateCode || $rate->getPrice() != 0) {
-            -
                                continue;
-            -
                            }
-            -
-            -
                            $methodName = $map['googleCarrierCompany'] . '/'.  $googleRateCode;
-            -
                            if (empty($shippingMethodsList[$methodName])) {
-            -
                                continue;
-            -
                            }
-            -
                            $freeMethodsList[$methodName] = array(
-            -
                                'company' => $map['googleCarrierCompany'],
-            -
                                'type' => $googleRateCode
-            -
                            );
-            -
                            unset($shippingMethodsList[$methodName]);
-            -
                        }
-            -
                    }
-            -
-            -
                    $xml = '';
-            -
                    $sendShipMethods = (bool)count($shippingMethodsList) > 0;
-            -
                    if ($sendShipMethods) {
-            -
                        $xml .= <<<EOT
-            -
                            <carrier-calculated-shipping>
-            -
                                <shipping-packages>
-            -
                                    <shipping-package>
-            -
                                        <ship-from id="Origin">
-            -
                                            <city>{$city}</city>
-            -
                                            <region>{$region}</region>
-            -
                                            <postal-code>{$postcode}</postal-code>
-            -
                                            <country-code>{$country}</country-code>
-            -
                                        </ship-from>
-            -
                                        <width unit="{$sizeUnit}" value="{$width}"/>
-            -
                                        <height unit="{$sizeUnit}" value="{$height}"/>
-            -
                                        <length unit="{$sizeUnit}" value="{$length}"/>
-            -
                                        <delivery-address-category>{$addressCategory}</delivery-address-category>
-            -
                                    </shipping-package>
-            -
                                </shipping-packages>
-            -
            EOT;
-            -
                        $xml .= '<carrier-calculated-shipping-options>';
-            -
-            -
                        foreach ($shippingMethodsList as $method) {
-            -
                            $xml .= <<<EOT
-            -
                                    <carrier-calculated-shipping-option>
-            -
                                        <shipping-company>{$method['company']}</shipping-company>
-            -
                                        <shipping-type>{$method['type']}</shipping-type>
-            -
                                        <price currency="{$this->getCurrency()}">{$defPrice}</price>
-            -
                                    </carrier-calculated-shipping-option>
-            -
            EOT;
-            -
                        }
-            -
                        $xml .= '</carrier-calculated-shipping-options>';
-            -
                        $xml .= '</carrier-calculated-shipping>';
-            -
                    }
-            -
-            -
                    foreach ($freeMethodsList as $method) {
-            -
                        $xml .= <<<EOT
-            -
                                <flat-rate-shipping name="{$method['company']} {$method['type']}">
-            -
                                <price currency="{$this->getCurrency()}">0.00</price></flat-rate-shipping>
-            -
            EOT;
-            -
                    }
-            -
-            -
                    $this->_shippingCalculated = true;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate flat rate shipping XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getFlatRateShippingXml()
-            -
                {
-            -
                    /*
-            -
                     * Prevent sending more then one shipping option to Google
-            -
                     */
-            -
                    if ($this->_shippingCalculated) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $storeId = $this->getQuote()->getStoreId();
-            -
                    if (!Mage::getStoreConfigFlag(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_FLATRATE_ACTIVE, $storeId)) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    // If is set Tax Class for Shipping - create ability to manage shipping rates in MerchantCalculationCallback
-            -
                    $nodeName = 'merchant-calculated-shipping';
-            -
                    if (!$this->_getTaxClassForShipping($this->getQuote())) {
-            -
                        $nodeName = 'flat-rate-shipping';
-            -
                    }
-            -
-            -
                    $xml = '';
-            -
                    for ($i = 1; $i <= 3; $i++) {
-            -
                        $title         = Mage::getStoreConfig('google/checkout_shipping_flatrate/title_' . $i, $storeId);
-            -
                        $price         = (float)Mage::getStoreConfig('google/checkout_shipping_flatrate/price_' . $i, $storeId);
-            -
                        $price         = number_format($price, 2, '.', '');
-            -
                        $price         = (float)Mage::helper('tax')->getShippingPrice($price, false, false);
-            -
                        $allowSpecific = Mage::getStoreConfigFlag(
-            -
                            'google/checkout_shipping_flatrate/sallowspecific_' . $i,
-            -
                            $storeId
-            -
                        );
-            -
                        $specificCountries = Mage::getStoreConfig(
-            -
                            'google/checkout_shipping_flatrate/specificcountry_' . $i,
-            -
                            $storeId
-            -
                        );
-            -
                        $allowedAreasXml = $this->_getAllowedCountries($allowSpecific, $specificCountries);
-            -
-            -
                        if (empty($title) || $price <= 0) {
-            -
                            continue;
-            -
                        }
-            -
-            -
                        $xml .= <<<EOT
-            -
                            <{$nodeName} name="{$title}">
-            -
                                <shipping-restrictions>
-            -
                                    <allowed-areas>
-            -
                                    {$allowedAreasXml}
-            -
                                    </allowed-areas>
-            -
                                </shipping-restrictions>
-            -
                                <price currency="{$this->getCurrency()}">{$price}</price>
-            -
                            </{$nodeName}>
-            -
            EOT;
-            -
                    }
-            -
-            -
                    $this->_shippingCalculated = true;
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate shipping allowed countries XML
-            -
                 *
-            -
                 * @param boolean $allowSpecific
-            -
                 * @param string $specific
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getAllowedCountries($allowSpecific, $specific)
-            -
                {
-            -
                    $xml = '';
-            -
                    if ($allowSpecific == 1) {
-            -
                        if ($specific) {
-            -
                            foreach (explode(',', $specific) as $country) {
-            -
                                $xml .= "<postal-area><country-code>{$country}</country-code></postal-area>\n";
-            -
                            }
-            -
                        }
-            -
                    }
-            -
                    if ($xml) {
-            -
                        return $xml;
-            -
                    }
-            -
-            -
                    return '<world-area />';
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve merchant calculated shipping carriers rates XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getMerchantCalculatedShippingXml()
-            -
                {
-            -
                    /*
-            -
                     * Prevent sending more then one shipping option to Google
-            -
                     */
-            -
                    if ($this->_shippingCalculated) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $storeId = $this->getQuote()->getStoreId();
-            -
                    $active = Mage::getStoreConfigFlag(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_MERCHANT_ACTIVE,
-            -
                        $storeId
-            -
                    );
-            -
                    $methods = Mage::getStoreConfig(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_MERCHANT_ALLOWED_METHODS,
-            -
                        $storeId
-            -
                    );
-            -
-            -
                    if (!$active || !$methods) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $xml           = '';
-            -
                    $methods       = unserialize($methods);
-            -
                    $taxHelper     = Mage::helper('tax');
-            -
                    $shippingModel = Mage::getModel('shipping/shipping');
-            -
-            -
                    foreach ($methods['method'] as $i => $method) {
-            -
                        if (!$i || !$method) {
-            -
                            continue;
-            -
                        }
-            -
                        list($carrierCode, $methodCode) = explode('/', $method);
-            -
                        if ($carrierCode) {
-            -
                            $carrier = $shippingModel->getCarrierByCode($carrierCode);
-            -
                            if ($carrier) {
-            -
                                $allowedMethods = $carrier->getAllowedMethods();
-            -
-            -
                                if (isset($allowedMethods[$methodCode])) {
-            -
                                    $method = Mage::getStoreConfig('carriers/' . $carrierCode . '/title', $storeId);
-            -
                                    $method .= ' - '.$allowedMethods[$methodCode];
-            -
                                }
-            -
-            -
                                $defaultPrice = (float) $methods['price'][$i];
-            -
                                $defaultPrice = $taxHelper->getShippingPrice($defaultPrice, false, false);
-            -
-            -
                                $allowedAreasXml = $this->_getAllowedCountries(
-            -
                                    $carrier->getConfigData('sallowspecific'),
-            -
                                    $carrier->getConfigData('specificcountry')
-            -
                                );
-            -
-            -
                                $xml .= <<<EOT
-            -
                                    <merchant-calculated-shipping name="{$method}">
-            -
                                        <address-filters>
-            -
                                            <allowed-areas>
-            -
                                                {$allowedAreasXml}
-            -
                                            </allowed-areas>
-            -
                                        </address-filters>
-            -
                                        <price currency="{$this->getCurrency()}">{$defaultPrice}</price>
-            -
                                    </merchant-calculated-shipping>
-            -
            EOT;
-            -
                            }
-            -
                        }
-            -
                    }
-            -
                    $this->_shippingCalculated = true;
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve pickup XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getPickupXml()
-            -
                {
-            -
                    $storeId = $this->getQuote()->getStoreId();
-            -
                    if (!Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_ACTIVE, $storeId)) {
-            -
                        return '';
-            -
                    }
-            -
-            -
                    $title = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_TITLE, $storeId);
-            -
                    $price = Mage::getStoreConfig(Mage_GoogleCheckout_Helper_Data::XML_PATH_SHIPPING_PICKUP_PRICE, $storeId);
-            -
                    $price = (float) Mage::helper('tax')->getShippingPrice($price, false, false);
-            -
-            -
                    $xml = <<<EOT
-            -
                            <pickup name="{$title}">
-            -
                                <price currency="{$this->getCurrency()}">{$price}</price>
-            -
                            </pickup>
-            -
            EOT;
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve specific tax table XML
-            -
                 *
-            -
                 * @param array|float $rules
-            -
                 * @param string $type
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getTaxTableXml($rules, $type)
-            -
                {
-            -
                    $xml = '';
-            -
                    if (is_array($rules)) {
-            -
                        foreach ($rules as $group => $taxRates) {
-            -
                            if ($type != 'default') {
-            -
                                $nameAttribute       = "name=\"{$group}\"";
-            -
                                $standaloneAttribute = "standalone=\"true\"";
-            -
                                $rulesTag            = "{$type}-tax-rules";
-            -
                                $shippingTaxed       = false;
-            -
                            } else {
-            -
                                $nameAttribute       = '';
-            -
                                $standaloneAttribute = '';
-            -
                                $rulesTag            = 'tax-rules';
-            -
                                $shippingTaxed       = true;
-            -
                            }
-            -
-            -
                            $xml .= <<<EOT
-            -
                                    <{$type}-tax-table {$nameAttribute} {$standaloneAttribute}>
-            -
                                        <{$rulesTag}>
-            -
            EOT;
-            -
                            if (is_array($taxRates)) {
-            -
                                foreach ($taxRates as $rate) {
-            -
                                    $xml .= <<<EOT
-            -
                                                <{$type}-tax-rule>
-            -
                                                    <tax-areas>
-            -
-            -
            EOT;
-            -
                                    if ($rate['country'] === Mage_Usa_Model_Shipping_Carrier_Abstract::USA_COUNTRY_ID) {
-            -
                                        if (!empty($rate['postcode']) && $rate['postcode'] !== '*') {
-            -
                                            $rate['postcode'] = Mage::helper('googlecheckout')
-            -
                                                ->zipRangeToZipPattern($rate['postcode']);
-            -
                                            foreach ($rate['postcode'] as $postcode) {
-            -
                                                $xml .= <<<EOT
-            -
                                                            <us-zip-area>
-            -
                                                                <zip-pattern>$postcode</zip-pattern>
-            -
                                                            </us-zip-area>
-            -
-            -
            EOT;
-            -
                                            }
-            -
                                        } else if (!empty($rate['state'])) {
-            -
                                            $xml .= <<<EOT
-            -
                                                        <us-state-area>
-            -
                                                            <state>{$rate['state']}</state>
-            -
                                                        </us-state-area>
-            -
-            -
            EOT;
-            -
                                        } else {
-            -
                                            $xml .= <<<EOT
-            -
                                                        <us-zip-area>
-            -
                                                            <zip-pattern>*</zip-pattern>
-            -
                                                        </us-zip-area>
-            -
-            -
            EOT;
-            -
                                        }
-            -
                                    } else {
-            -
                                        if (!empty($rate['country'])) {
-            -
                                            $xml .= <<<EOT
-            -
                                                        <postal-area>
-            -
                                                            <country-code>{$rate['country']}</country-code>
-            -
            EOT;
-            -
                                            if (!empty($rate['postcode']) && $rate['postcode'] !== '*') {
-            -
                                                $xml .= <<<EOT
-            -
                                                            <postal-code-pattern>{$rate['postcode']}</postal-code-pattern>
-            -
-            -
            EOT;
-            -
                                            }
-            -
                                            $xml .= <<<EOT
-            -
                                                        </postal-area>
-            -
-            -
            EOT;
-            -
                                        }
-            -
                                    }
-            -
                                    $xml .= <<<EOT
-            -
                                                    </tax-areas>
-            -
                                                    <rate>{$rate['value']}</rate>
-            -
            EOT;
-            -
                                    if ($shippingTaxed) {
-            -
                                        $xml .= '<shipping-taxed>true</shipping-taxed>';
-            -
                                    }
-            -
                                    $xml .= "</{$type}-tax-rule>";
-            -
                                }
-            -
-            -
                            } else {
-            -
                                $taxRate = $taxRates/100;
-            -
                                $xml .= <<<EOT
-            -
                                            <{$type}-tax-rule>
-            -
                                                <tax-area>
-            -
                                                    <world-area/>
-            -
                                                </tax-area>
-            -
                                                <rate>{$taxRate}</rate>
-            -
            EOT;
-            -
                                if ($shippingTaxed) {
-            -
                                    $xml .= '<shipping-taxed>true</shipping-taxed>';
-            -
                                }
-            -
                                $xml .= "</{$type}-tax-rule>";
-            -
                            }
-            -
-            -
                            $xml .= <<<EOT
-            -
                                        </$rulesTag>
-            -
                                    </{$type}-tax-table>
-            -
            EOT;
-            -
                        }
-            -
                    } else {
-            -
                        if (is_numeric($rules)) {
-            -
                            $taxRate = $rules / 100;
-            -
                            $xml .= <<<EOT
-            -
                                    <{$type}-tax-table>
-            -
                                        <tax-rules>
-            -
                                            <{$type}-tax-rule>
-            -
                                                <tax-area>
-            -
                                                    <world-area/>
-            -
                                                </tax-area>
-            -
                                                <rate>{$taxRate}</rate>
-            -
                                                <shipping-taxed>true</shipping-taxed>
-            -
                                            </{$type}-tax-rule>
-            -
                                        </tax-rules>
-            -
                                    </{$type}-tax-table>
-            -
            EOT;
-            -
                        }
-            -
                    }
-            -
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Generate all tax tables XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getAllTaxTablesXml()
-            -
                {
-            -
                    $isDefaultTaxTablesDisabled = Mage::getStoreConfigFlag(
-            -
                        Mage_GoogleCheckout_Helper_Data::XML_PATH_DISABLE_DEFAULT_TAX_TABLES,
-            -
                        $this->getQuote()->getStoreId()
-            -
                    );
-            -
                    if ($isDefaultTaxTablesDisabled) {
-            -
                        return '<tax-tables merchant-calculated="true" />';
-            -
                    }
-            -
-            -
                    $xml = <<<EOT
-            -
                        <tax-tables merchant-calculated="true">
-            -
                            {$this->_getTaxTableXml($this->_getShippingTaxRules(), 'default')}
-            -
-            -
                            <!-- default-tax-table>
-            -
                                <tax-rules>
-            -
                                    <default-tax-rule>
-            -
                                    </default-tax-rule>
-            -
                                </tax-rules>
-            -
                            </default-tax-table -->
-            -
-            -
                            <alternate-tax-tables>
-            -
                                <alternate-tax-table name="none" standalone="true">
-            -
                                    <alternate-tax-rules>
-            -
                                        <alternate-tax-rule>
-            -
                                            <tax-area>
-            -
                                                <world-area/>
-            -
                                            </tax-area>
-            -
                                            <rate>0</rate>
-            -
                                        </alternate-tax-rule>
-            -
                                    </alternate-tax-rules>
-            -
                                </alternate-tax-table>
-            -
                                {$this->_getTaxTableXml($this->_getTaxRules(), 'alternate')}
-            -
                            </alternate-tax-tables>
-            -
                        </tax-tables>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve customer tax class id
-            -
                 *
-            -
                 * @return int
-            -
                 */
-            -
                protected function _getCustomerTaxClass()
-            -
                {
-            -
                    $customerGroup = $this->getQuote()->getCustomerGroupId();
-            -
                    if (!$customerGroup) {
-            -
                        $customerGroup = Mage::helper('customer')->getDefaultCustomerGroupId($this->getQuote()->getStoreId());
-            -
                    }
-            -
                    return Mage::getModel('customer/group')->load($customerGroup)->getTaxClassId();
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve shipping tax rules
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                protected function _getShippingTaxRules()
-            -
                {
-            -
                    $customerTaxClass = $this->_getCustomerTaxClass();
-            -
                    $shippingTaxClass = Mage::getStoreConfig(
-            -
                        Mage_Tax_Model_Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
-            -
                        $this->getQuote()->getStoreId()
-            -
                    );
-            -
                    $taxCalculationModel = Mage::getSingleton('tax/calculation');
-            -
-            -
                    if ($shippingTaxClass) {
-            -
                        if (Mage::helper('tax')->getTaxBasedOn() == 'origin') {
-            -
                            $request = $taxCalculationModel->getRateRequest();
-            -
                            $request
-            -
                                ->setCustomerClassId($customerTaxClass)
-            -
                                ->setProductClassId($shippingTaxClass);
-            -
-            -
                            return $taxCalculationModel->getRate($request);
-            -
                        }
-            -
                        $customerRules = $taxCalculationModel->getRatesByCustomerAndProductTaxClasses(
-            -
                            $customerTaxClass,
-            -
                            $shippingTaxClass
-            -
                        );
-            -
                        $rules = array();
-            -
                        foreach ($customerRules as $rule) {
-            -
                            $rules[$rule['product_class']][] = $rule;
-            -
                        }
-            -
-            -
                        return $rules;
-            -
                    }
-            -
-            -
                    return array();
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve tax rules
-            -
                 *
-            -
                 * @return array
-            -
                 */
-            -
                protected function _getTaxRules()
-            -
                {
-            -
                    $customerTaxClass    = $this->_getCustomerTaxClass();
-            -
                    $taxCalculationModel = Mage::getSingleton('tax/calculation');
-            -
-            -
                    if (Mage::helper('tax')->getTaxBasedOn() == 'origin') {
-            -
                        $request = $taxCalculationModel->getRateRequest()->setCustomerClassId($customerTaxClass);
-            -
                        return $taxCalculationModel->getRatesForAllProductTaxClasses($request);
-            -
                    }
-            -
-            -
                    $customerRules = $taxCalculationModel->getRatesByCustomerTaxClass($customerTaxClass);
-            -
                    $rules = array();
-            -
                    foreach ($customerRules as $rule) {
-            -
                        $rules[$rule['product_class']][] = $rule;
-            -
                    }
-            -
-            -
                    return $rules;
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for request initial auth details flag XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getRequestInitialAuthDetailsXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                    <request-initial-auth-details>true</request-initial-auth-details>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for parametrized url XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getParameterizedUrlsXml()
-            -
                {
-            -
                    return '';
-            -
                    $xml = <<<EOT
-            -
                        <parameterized-urls>
-            -
                            <parameterized-url url="{$this->_getParameterizedUrl()}" />
-            -
                        </parameterized-urls>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for platform Id XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getPlatformIdXml()
-            -
                {
-            -
                    $xml = <<<EOT
-            -
                        <platform-id>473325629220583</platform-id>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Retrieve analytics data XML
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getAnalyticsDataXml()
-            -
                {
-            -
                    if (!($analytics = $this->getApi()->getAnalyticsData())) {
-            -
                        return '';
-            -
                    }
-            -
                    $xml = <<<EOT
-            -
                        <analytics-data><![CDATA[{$analytics}]]></analytics-data>
-            -
            EOT;
-            -
                    return $xml;
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for cart edit url
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getEditCartUrl()
-            -
                {
-            -
                    return Mage::getUrl('googlecheckout/redirect/cart');
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for continue shopping url
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getContinueShoppingUrl()
-            -
                {
-            -
                    return Mage::getUrl('googlecheckout/redirect/continue');
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for notifications url
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getNotificationsUrl()
-            -
                {
-            -
                    return $this->_getCallbackUrl();
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for calculations url
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getCalculationsUrl()
-            -
                {
-            -
                    return $this->_getCallbackUrl();
-            -
                }
-            -
-            -
                /**
-            -
                 * Getter for parametrized url
-            -
                 *
-            -
                 * @return string
-            -
                 */
-            -
                protected function _getParameterizedUrl()
-            -
                {
-            -
                    return Mage::getUrl('googlecheckout/api/beacon');
-            -
                }
-            -
-            -
                /**
-            -
                 * Define if current quote is virtual
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                protected function _isOrderVirtual()
-            -
                {
-            -
                    foreach ($this->getQuote()->getAllItems() as $item) {
-            -
                        if (!$item->getIsVirtual()) {
-            -
                            return false;
-            -
                        }
-            -
                    }
-            -
                    return true;
-            -
                }
-            -
-            -
               /**
-            -
                * Retrieve native carriers to Google carriers map
-            -
                *
-            -
                * @return array
-            -
                */
-            -
                protected function _getGoogleCarriersMap() {
-            -
                    return array(
-            -
                        'ups' => array(
-            -
                            'googleCarrierCompany' => 'UPS',
-            -
                            'methods' => array(
-            -
                                'GND' => Mage::helper('usa')->__('Ground'),
-            -
                                '1DA' => Mage::helper('usa')->__('Next Day Air'),
-            -
                                '1DM' => Mage::helper('usa')->__('Next Day Air Early AM'),
-            -
                                '1DP' => Mage::helper('usa')->__('Next Day Air Saver'),
-            -
                                '2DA' => Mage::helper('usa')->__('2nd Day Air'),
-            -
                                '2DM' => Mage::helper('usa')->__('2nd Day Air AM'),
-            -
                                '3DS' => Mage::helper('usa')->__('3 Day Select'),
-            -
                                '03'  => Mage::helper('usa')->__('Ground'),
-            -
                                '01'  => Mage::helper('usa')->__('Next Day Air'),
-            -
                                '14'  => Mage::helper('usa')->__('Next Day Air Early AM'),
-            -
                                '13'  => Mage::helper('usa')->__('Next Day Air Saver'),
-            -
                                '02'  => Mage::helper('usa')->__('2nd Day Air'),
-            -
                                '59'  => Mage::helper('usa')->__('2nd Day Air AM'),
-            -
                                '12'  => Mage::helper('usa')->__('3 Day Select')
-            -
                            )
-            -
                        ),
-            -
                        'usps' => array(
-            -
                            'googleCarrierCompany' => 'USPS',
-            -
                            'methods' => array(
-            -
                                'Express Mail'  => Mage::helper('usa')->__('Express Mail'),
-            -
                                'Priority Mail' => Mage::helper('usa')->__('Priority Mail'),
-            -
                                'Parcel Post'   => Mage::helper('usa')->__('Parcel Post'),
-            -
                                'Media Mail'    => Mage::helper('usa')->__('Media Mail')
-            -
                            )
-            -
                        ),
-            -
                        'fedex' => array(
-            -
                            'googleCarrierCompany' => 'FedEx',
-            -
                            'methods' => array(
-            -
                                'FEDEX_GROUND'        => Mage::helper('usa')->__('Ground'),
-            -
                                'GROUND_HOME_DELIVERY' => Mage::helper('usa')->__('Home Delivery'),
-            -
                                'FEDEX_EXPRESS_SAVER'  => Mage::helper('usa')->__('Express Saver'),
-            -
                                'FIRST_OVERNIGHT'     => Mage::helper('usa')->__('First Overnight'),
-            -
                                'PRIORITY_OVERNIGHT'  => Mage::helper('usa')->__('Priority Overnight'),
-            -
                                'STANDARD_OVERNIGHT'  => Mage::helper('usa')->__('Standard Overnight'),
-            -
                                'FEDEX_2_DAY'          => Mage::helper('usa')->__('2Day')
-            -
                            )
-            -
                        )
-            -
                    );
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Api/Xml/Order.php DELETED Viewed

@@ -1,181 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            class Mage_GoogleCheckout_Model_Api_Xml_Order extends Mage_GoogleCheckout_Model_Api_Xml_Abstract
-            -
            {
-            -
                protected function _getApiUrl()
-            -
                {
-            -
                    $url = $this->_getBaseApiUrl();
-            -
                    $url .= 'request/Merchant/'.Mage::getStoreConfig('google/checkout/merchant_id', $this->getStoreId());
-            -
                    return $url;
-            -
                }
-            -
-            -
                protected function _processGResponse($response)
-            -
                {
-            -
                    if ($response[0]===200) {
-            -
                        return true;
-            -
                    } else {
-            -
                        $xml = simplexml_load_string(html_entity_decode($response[1]));
-            -
                        if (!$xml || !$xml->{'error-message'}) {
-            -
                            return false;
-            -
                        }
-            -
                        Mage::throwException($this->__('Google Checkout: %s', (string)$xml->{'error-message'}));
-            -
                    }
-            -
                }
-            -
-            -
            // FINANCIAL
-            -
-            -
                public function authorize()
-            -
                {
-            -
                    $GRequest = $this->getGRequest();
-            -
-            -
                    $postargs = '<?xml version="1.0" encoding="UTF-8"?>
-            -
                        <authorize-order xmlns="'
-            -
                        . $GRequest->schema_url
-            -
                        . '" google-order-number="'
-            -
                        . $this->getGoogleOrderNumber()
-            -
                        . '"/>';
-            -
-            -
                    $response = $GRequest->SendReq($GRequest->request_url,
-            -
                               $GRequest->GetAuthenticationHeaders(), $postargs);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function charge($amount)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendChargeOrder($this->getGoogleOrderNumber(), $amount);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function refund($amount, $reason, $comment = '')
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendRefundOrder($this->getGoogleOrderNumber(), $amount, $reason, $comment);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function cancel($reason, $comment = '')
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendCancelOrder($this->getGoogleOrderNumber(), $reason, $comment);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
            // FULFILLMENT
-            -
-            -
                public function process()
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendProcessOrder($this->getGoogleOrderNumber());
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function deliver($carrier, $trackingNo, $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendDeliverOrder($this->getGoogleOrderNumber(), $carrier, $trackingNo, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function addTrackingData($carrier, $trackingNo)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendTrackingData($this->getGoogleOrderNumber(), $carrier, $trackingNo);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function shipItems($items, $sendMail = true)
-            -
                {
-            -
                    $googleShipItems = array();
-            -
                    foreach ($items as $item) {
-            -
                        $googleShipItems[] = new GoogleShipItem($item);
-            -
                    }
-            -
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendShipItems($this->getGoogleOrderNumber(), $googleShipItems, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function backorderItems($items, $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendBackorderItems($this->getGoogleOrderNumber(), $items, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function cancelItems($items, $reason, $comment = '', $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendCancelItems($this->getGoogleOrderNumber(), $items, $reason, $comment, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function returnItems($items, $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendReturnItems($this->getGoogleOrderNumber(), $items, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function resetItems($items, $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendRResetItemsShippingInformation($this->getGoogleOrderNumber(), $items, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
            // MISC
-            -
-            -
                public function archive()
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendArchiveOrder($this->getGoogleOrderNumber());
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function unarchive()
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendUnarchiveOrder($this->getGoogleOrderNumber());
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
                public function addOrderNumber($merchantOrder)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendMerchantOrderNumber($this->getGoogleOrderNumber(), $merchantOrder);
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
-            -
-            -
                public function addBuyerMessage($message, $sendMail = true)
-            -
                {
-            -
                    $response = $this->getGRequest()
-            -
                        ->SendBuyerMessage($this->getGoogleOrderNumber(), $message, $sendMail ? 'true' : 'false');
-            -
                    return $this->_processGResponse($response);
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug.php DELETED Viewed

@@ -1,37 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Enter description here ...
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Mysql4_Api_Debug extends Mage_GoogleCheckout_Model_Resource_Api_Debug
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Mysql4/Api/Debug/Collection.php DELETED Viewed

@@ -1,38 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Enter description here ...
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Mysql4_Api_Debug_Collection
-            -
                extends Mage_GoogleCheckout_Model_Resource_Api_Debug_Collection
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Mysql4/Notification.php DELETED Viewed

@@ -1,37 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Google Checkout resource notification model
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Mysql4_Notification extends Mage_GoogleCheckout_Model_Resource_Notification
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Mysql4/Setup.php DELETED Viewed

@@ -1,37 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Enter description here ...
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Mysql4_Setup extends Mage_GoogleCheckout_Model_Resource_Setup
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Mysql4/Tax.php DELETED Viewed

@@ -1,37 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Enter description here ...
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Mysql4_Tax extends Mage_GoogleCheckout_Model_Resource_Tax
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Notification.php DELETED Viewed

@@ -1,129 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
            /**
-            -
             * Google Checkout notification model
-            -
             *
-            -
             * @method Mage_GoogleCheckout_Model_Resource_Notification _getResource()
-            -
             * @method Mage_GoogleCheckout_Model_Resource_Notification getResource()
-            -
             * @method string getSerialNumber()
-            -
             * @method Mage_GoogleCheckout_Model_Notification setSerialNumber(string $value)
-            -
             * @method string getStartedAt()
-            -
             * @method Mage_GoogleCheckout_Model_Notification setStartedAt(string $value)
-            -
             * @method int getStatus()
-            -
             * @method Mage_GoogleCheckout_Model_Notification setStatus(int $value)
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Notification extends Mage_Core_Model_Abstract
-            -
            {
-            -
                const TIMEOUT_LIMIT = 3600;
-            -
                const STATUS_INPROCESS = 0;
-            -
                const STATUS_PROCESSED = 1;
-            -
-            -
                /**
-            -
                 * Intialize model
-            -
                 */
-            -
                function _construct()
-            -
                {
-            -
                    $this->_init('googlecheckout/notification');
-            -
                }
-            -
-            -
                /**
-            -
                 * Assign previously saved notification data to model
-            -
                 *
-            -
                 * @return Mage_GoogleCheckout_Model_Notification
-            -
                 */
-            -
                public function loadNotificationData()
-            -
                {
-            -
                    $data = $this->getResource()->getNotificationData($this->getSerialNumber());
-            -
                    if (is_array($data)) {
-            -
                        $this->addData($data);
-            -
                    }
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Check if current notification is already processed
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                public function isProcessed()
-            -
                {
-            -
                    return $this->getStatus() == self::STATUS_PROCESSED;
-            -
                }
-            -
-            -
                /**
-            -
                 * Check if current notification is time out
-            -
                 *
-            -
                 * @return bool
-            -
                 */
-            -
                public function isTimeout()
-            -
                {
-            -
                    $startedTime = strtotime($this->getStartedAt());
-            -
                    $currentTime = time();
-            -
-            -
                    if ($currentTime - $startedTime > self::TIMEOUT_LIMIT) {
-            -
                        return true;
-            -
                    }
-            -
                    return false;
-            -
                }
-            -
-            -
                /**
-            -
                 * Start process of current notification
-            -
                 *
-            -
                 * @return Mage_GoogleCheckout_Model_Notification
-            -
                 */
-            -
                public function startProcess()
-            -
                {
-            -
                    $this->getResource()->startProcess($this->getSerialNumber());
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Update process of current notification
-            -
                 *
-            -
                 * @return Mage_GoogleCheckout_Model_Notification
-            -
                 */
-            -
                public function updateProcess()
-            -
                {
-            -
                    $this->getResource()->updateProcess($this->getSerialNumber());
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Stop process of current notification
-            -
                 *
-            -
                 * @return Mage_GoogleCheckout_Model_Notification
-            -
                 */
-            -
                public function stopProcess()
-            -
                {
-            -
                    $this->getResource()->stopProcess($this->getSerialNumber());
-            -
                    return $this;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Observer.php DELETED Viewed

@@ -1,105 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Google Checkout Event Observer
-            -
             *
-            -
             * @category   Mage
-            -
             * @package    Mage_GoogleCheckout
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Observer
-            -
            {
-            -
                public function salesOrderShipmentTrackSaveAfter(Varien_Event_Observer $observer)
-            -
                {
-            -
                    $track = $observer->getEvent()->getTrack();
-            -
-            -
                    $order = $track->getShipment()->getOrder();
-            -
                    $shippingMethod = $order->getShippingMethod(); // String in format of 'carrier_method'
-            -
                    if (!$shippingMethod) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // Process only Google Checkout internal methods
-            -
                    /* @var $gcCarrier Mage_GoogleCheckout_Model_Shipping */
-            -
                    $gcCarrier = Mage::getModel('googlecheckout/shipping');
-            -
                    list($carrierCode, $methodCode) = explode('_', $shippingMethod);
-            -
                    if ($gcCarrier->getCarrierCode() != $carrierCode) {
-            -
                        return;
-            -
                    }
-            -
                    $internalMethods = $gcCarrier->getInternallyAllowedMethods();
-            -
                    if (!isset($internalMethods[$methodCode])) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    Mage::getModel('googlecheckout/api')
-            -
                        ->setStoreId($order->getStoreId())
-            -
                        ->deliver($order->getExtOrderId(), $track->getCarrierCode(), $track->getNumber());
-            -
                }
-            -
-            -
                /*
-            -
                 * Performs specifical actions on Google Checkout internal shipments saving
-            -
                 *
-            -
                 * @param Varien_Event_Observer $observer
-            -
                 * @return void
-            -
                 */
-            -
                public function salesOrderShipmentSaveAfter(Varien_Event_Observer $observer)
-            -
                {
-            -
                    $shipment = $observer->getEvent()->getShipment();
-            -
                    $order = $shipment->getOrder();
-            -
                    $shippingMethod = $order->getShippingMethod(); // String in format of 'carrier_method'
-            -
                    if (!$shippingMethod) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // Process only Google Checkout internal methods
-            -
                    /* @var $gcCarrier Mage_GoogleCheckout_Model_Shipping */
-            -
                    $gcCarrier = Mage::getModel('googlecheckout/shipping');
-            -
                    list($carrierCode, $methodCode) = explode('_', $shippingMethod);
-            -
                    if ($gcCarrier->getCarrierCode() != $carrierCode) {
-            -
                        return;
-            -
                    }
-            -
                    $internalMethods = $gcCarrier->getInternallyAllowedMethods();
-            -
                    if (!isset($internalMethods[$methodCode])) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    // Process this saving
-            -
                    $items = array();
-            -
                    foreach ($shipment->getAllItems() as $item) {
-            -
                        if ($item->getOrderItem()->getParentItemId()) {
-            -
                            continue;
-            -
                        }
-            -
                        $items[] = $item->getSku();
-            -
                    }
-            -
-            -
                    if ($items) {
-            -
                        Mage::getModel('googlecheckout/api')
-            -
                            ->setStoreId($order->getStoreId())
-            -
                            ->shipItems($order->getExtOrderId(), $items);
-            -
                    }
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Payment.php CHANGED Viewed

	@@ -24,27 +24,15 @@
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26



27	class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstract
28	{
29	- const ACTION_AUTHORIZE = 0;
30	- const ACTION_AUTHORIZE_CAPTURE = 1;
31	-
32	- protected $_code = 'googlecheckout';
33	- protected $_formBlockType = 'googlecheckout/form';
34	-
35	/**
36	- * ~~Availability~~ ~~options~~
37	*/
38	- protected $~~_isGateway~~ = ~~false~~;
39	- protected $_canAuthorize = true;
40	- protected $_canCapture = true;
41	- protected $_canCapturePartial = true;
42	- protected $_canRefund = true;
43	- protected $_canRefundInvoicePartial = true;
44	- protected $_canVoid = true;
45	- protected $_canUseInternal = false;
46	- protected $_canUseCheckout = false;
47	- protected $_canUseForMultishipping = false;
48
49	/**
50	* Can be edit order (renew order)
	@@ -59,56 +47,36 @@ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstra
59	/**
60	* Return Order Place Redirect URL
61	*
62	- * @return string ~~Order Redirect URL~~
63	*/
64	public function getOrderPlaceRedirectUrl()
65	{
66	- return ~~Mage::getUrl(~~'~~googlecheckout/redirect/redirect~~');
67	}
68
69	/**
70	* Authorize
71	*
72	- * @param Varien_Object $~~orderPayment~~
73	- * @~~return Mage_GoogleCheckout_Model_Payment~~

74	*/
75	public function authorize(Varien_Object $payment, $amount)
76	{
77	- ~~$api =~~ Mage::~~getModel~~('~~googlecheckout/api~~')->~~setStoreId~~(~~$payment->getOrder(~~)~~->getStoreId(~~));
78	- $api->authorize($payment->getOrder()->getExtOrderId());
79	-
80	- return $this;
81	}
82
83	/**
84	* Capture payment
85	*
86	- * @param Varien_Object $~~orderPayment~~
87	- * @~~return Mage_GoogleCheckout_Model_Payment~~


88	*/
89	public function capture(Varien_Object $payment, $amount)
90	{
91	- /*
92	- try {
93	- $this->authorize($payment, $amount);
94	- } catch (Exception $e) {
95	- // authorization is not expired yet
96	- }
97	- */
98	-
99	- if ($payment->getOrder()->getPaymentAuthorizationExpiration() < Mage::getModel('core/date')->gmtTimestamp()) {
100	- try {
101	- $this->authorize($payment, $amount);
102	- } catch (Exception $e) {
103	- // authorization is not expired yet
104	- }
105	- }
106	-
107	- $api = Mage::getModel('googlecheckout/api')->setStoreId($payment->getOrder()->getStoreId());
108	- $api->charge($payment->getOrder()->getExtOrderId(), $amount);
109	- $payment->setForcedState(Mage_Sales_Model_Order_Invoice::STATE_OPEN);
110	-
111	- return $this;
112	}
113
114	/**
	@@ -116,45 +84,34 @@ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstra
116	*
117	* @param Varien_Object $payment
118	* @param float $amount
119	- *
120	- * @return ~~Mage_GoogleCheckout_Model_Payment~~
121	*/
122	public function refund(Varien_Object $payment, $amount)
123	{
124	- ~~$reason = $this->getReason~~(~~) ? $this->getReason() :~~ Mage::helper('~~googlecheckout~~')->__('No ~~Reason~~');
125	- $comment = $this->getComment() ? $this->getComment() : Mage::helper('googlecheckout')->__('No Comment');
126	-
127	- $api = Mage::getModel('googlecheckout/api')->setStoreId($payment->getOrder()->getStoreId());
128	- $api->refund($payment->getOrder()->getExtOrderId(), $amount, $reason, $comment);
129	-
130	- return $this;
131	}
132





133	public function void(Varien_Object $payment)
134	{
135	- ~~$this->cancel~~($payment);
136	-
137	- return $this;
138	}
139
140	/**
141	* Void payment
142	*
143	* @param Varien_Object $payment
144	- *
145	- * @return ~~Mage_GoogleCheckout_Model_Payment~~
146	*/
147	public function cancel(Varien_Object $payment)
148	{
149	- if (!$payment~~->getOrder(~~)->~~getBeingCanceledFromGoogleApi~~()) {
150	- $reason = $this->getReason() ? $this->getReason() : Mage::helper('googlecheckout')->__('Unknown Reason');
151	- $comment = $this->getComment() ? $this->getComment() : Mage::helper('googlecheckout')->__('No Comment');
152	-
153	- $api = Mage::getModel('googlecheckout/api')->setStoreId($payment->getOrder()->getStoreId());
154	- $api->cancel($payment->getOrder()->getExtOrderId(), $reason, $comment);
155	- }
156	-
157	- return $this;
158	}
159
160	/**
	@@ -163,16 +120,11 @@ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstra
163	* @param string $field
164	* @param int\|string\|null\|Mage_Core_Model_Store $storeId
165	*
166	- * @return ~~mixed~~
167	*/
168	public function getConfigData($field, $storeId = null)
169	{
170	- if (null ~~=== $storeId) {~~
171	- $storeId = $this->getStore();
172	- }
173	- $path = 'google/checkout/' . $field;
174	-
175	- return Mage::getStoreConfig($path, $storeId);
176	}
177
178	/**
	@@ -183,12 +135,6 @@ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstra
183	*/
184	public function canVoid(Varien_Object $payment)
185	{
186	- if ~~($payment instanceof Mage_Sales_Model_Order_Invoice~~
187	- \|\| $payment instanceof Mage_Sales_Model_Order_Creditmemo
188	- ) {
189	- return false;
190	- }
191	-
192	- return $this->_canVoid;
193	}
194	}


24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	+ /**
28	+ * @deprecated after 1.13.1.0
29	+ */
30	class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstract
31	{






32	/**
33	+ * @var string
34	*/
35	+ protected $_code = 'googlecheckout';









36
37	/**
38	* Can be edit order (renew order)

47	/**
48	* Return Order Place Redirect URL
49	*
50	+ * @return string
51	*/
52	public function getOrderPlaceRedirectUrl()
53	{
54	+ return '';
55	}
56
57	/**
58	* Authorize
59	*
60	+ * @param Varien_Object $payment
61	+ * @param float $amount
62	+ * @return Mage_GoogleCheckout_Model_Payment
63	*/
64	public function authorize(Varien_Object $payment, $amount)
65	{
66	+ Mage::throwException(Mage::helper('payment')->__('Google Checkout has been deprecated.'));



67	}
68
69	/**
70	* Capture payment
71	*
72	+ * @param Varien_Object $payment
73	+ * @param float $amount
74	+ * @throws Exception
75	+ * @return void
76	*/
77	public function capture(Varien_Object $payment, $amount)
78	{
79	+ Mage::throwException(Mage::helper('payment')->__('Google Checkout has been deprecated.'));




















80	}
81
82	/**

84	*
85	* @param Varien_Object $payment
86	* @param float $amount
87	+ * @throws Exception
88	+ * @return void
89	*/
90	public function refund(Varien_Object $payment, $amount)
91	{
92	+ Mage::throwException(Mage::helper('payment')->__('Google Checkout has been deprecated.'));






93	}
94
95	+ /**
96	+ * @param Varien_Object $payment
97	+ * @throws Exception
98	+ * @return void
99	+ */
100	public function void(Varien_Object $payment)
101	{
102	+ Mage::throwException(Mage::helper('payment')->__('Google Checkout has been deprecated.'));


103	}
104
105	/**
106	* Void payment
107	*
108	* @param Varien_Object $payment
109	+ * @throws Exception
110	+ * @return void
111	*/
112	public function cancel(Varien_Object $payment)
113	{
114	+ Mage::throwException(Mage::helper('payment')->__('Google Checkout has been deprecated.'));








115	}
116
117	/**

120	* @param string $field
121	* @param int\|string\|null\|Mage_Core_Model_Store $storeId
122	*
123	+ * @return null
124	*/
125	public function getConfigData($field, $storeId = null)
126	{
127	+ return null;





128	}
129
130	/**

135	*/
136	public function canVoid(Varien_Object $payment)
137	{
138	+ return false;






139	}
140	}

app/code/core/Mage/GoogleCheckout/Model/Resource/Notification.php DELETED Viewed

@@ -1,109 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Google Checkout resource notification model
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Resource_Notification extends Mage_Core_Model_Resource_Db_Abstract
-            -
            {
-            -
                /**
-            -
                 * Intialize resource model.
-            -
                 * Set main entity table name and primary key field name.
-            -
                 *
-            -
                 */
-            -
                protected function _construct()
-            -
                {
-            -
                    $this->_init('googlecheckout/notification', 'serial_number');
-            -
                }
-            -
-            -
                /**
-            -
                 * Return notification data by serial number
-            -
                 *
-            -
                 * @param string $serialNumber
-            -
                 * @return array
-            -
                 */
-            -
                public function getNotificationData($serialNumber)
-            -
                {
-            -
                    $select = $this->_getReadAdapter()->select()
-            -
                        ->from($this->getMainTable(), array('*'))
-            -
                        ->where('serial_number = ?', $serialNumber);
-            -
-            -
                    return $this->_getReadAdapter()->fetchRow($select);
-            -
                }
-            -
-            -
                /**
-            -
                 * Start notification processing
-            -
                 *
-            -
                 * @param string $serialNumber
-            -
                 * @return Mage_GoogleCheckout_Model_Resource_Notification
-            -
                 */
-            -
                public function startProcess($serialNumber)
-            -
                {
-            -
                    $data = array(
-            -
                        'serial_number' => $serialNumber,
-            -
                        'started_at'    => Varien_Date::now(),
-            -
                        'status'        => Mage_GoogleCheckout_Model_Notification::STATUS_INPROCESS
-            -
                    );
-            -
                    $this->_getWriteAdapter()->insert($this->getMainTable(), $data);
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Stop notification processing
-            -
                 *
-            -
                 * @param string $serialNumber
-            -
                 * @return Mage_GoogleCheckout_Model_Resource_Notification
-            -
                 */
-            -
                public function stopProcess($serialNumber)
-            -
                {
-            -
                    $this->_getWriteAdapter()->update($this->getMainTable(),
-            -
                        array('status' => Mage_GoogleCheckout_Model_Notification::STATUS_PROCESSED),
-            -
                        array('serial_number = ?' => $serialNumber)
-            -
                    );
-            -
                    return $this;
-            -
                }
-            -
-            -
                /**
-            -
                 * Update notification processing
-            -
                 *
-            -
                 * @param string $serialNumber
-            -
                 * @return Mage_GoogleCheckout_Model_Resource_Notification
-            -
                 */
-            -
                public function updateProcess($serialNumber)
-            -
                {
-            -
                    $this->_getWriteAdapter()->update($this->getMainTable(),
-            -
                        array('started_at' => Varien_Date::now()),
-            -
                        array('serial_number = ?' => $serialNumber)
-            -
                    );
-            -
-            -
                    return $this;
-            -
                }
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Resource/Setup.php DELETED Viewed

@@ -1,37 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER
-            -
             *
-            -
             * Do not edit or add to this file if you wish to upgrade Magento to newer
-            -
             * versions in the future. If you wish to customize Magento for your
-            -
             * needs please refer to http://www.magentocommerce.com for more information.
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @copyright   Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
-            -
             * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             */
-            -
-            -
-            -
            /**
-            -
             * Setup resource model
-            -
             *
-            -
             * @category    Mage
-            -
             * @package     Mage_GoogleCheckout
-            -
             * @author      Magento Core Team <core@magentocommerce.com>
-            -
             */
-            -
            class Mage_GoogleCheckout_Model_Resource_Setup extends Mage_Catalog_Model_Resource_Setup
-            -
            {
-            -
            }

app/code/core/Mage/GoogleCheckout/Model/Resource/Tax.php DELETED Viewed

@@ -1,76 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * Magento
-            -
             *
-            -
             * NOTICE OF LICENSE
-            -
             *
-            -
             * This source file is subject to the Open Software License (OSL 3.0)
-            -
             * that is bundled with this package in the file LICENSE.txt.
-            -
             * It is also available through the world-wide-web at this URL:
-            -
             * http://opensource.org/licenses/osl-3.0.php
-            -
             * If you did not receive a copy of the license and are unable to
-            -
             * obtain it through the world-wide-web, please send an email
-            -
             * to license@magentocommerce.com so we can send you a copy immediately.
-            -
             *
-            -
             * DISCLAIMER