From bb29a4925ad364bdbd03fe45b23f3747b0b72d34 Mon Sep 17 00:00:00 2001 From: Erik Dannenberg Date: Wed, 6 Dec 2017 20:57:05 +0100 Subject: [PATCH] Fix 1.9.3.x upstream merges The upstream merges for some 1.9.3.x releases introduced a few inconsistencies: * cms_generate_breadcrumbs event is fired twice * related to the above dd412309 is applied to wrong code block * few locale .csv have now escaped single quote entries along with the entries where those got removed in #46 * #21 got reverted at some point * var/package dir has 5 obsolete xml files * slightly different configuration in Sales, SalesRule and Tax config.xml * Mage_SalesRule_Model_Validator is outdated compared with latest from 1.9.3.7 --- app/code/core/Mage/Cms/Block/Page.php | 16 +- app/code/core/Mage/Sales/etc/config.xml | 2 +- .../core/Mage/SalesRule/Model/Validator.php | 370 +++++++++--------- app/code/core/Mage/SalesRule/etc/config.xml | 4 +- app/code/core/Mage/Tax/etc/config.xml | 4 +- app/locale/en_US/Mage_Adminhtml.csv | 1 - app/locale/en_US/Mage_Paypal.csv | 2 - app/locale/en_US/Mage_Review.csv | 2 - app/locale/en_US/Mage_Rss.csv | 3 +- var/package/Lib_Js_Calendar-1.51.1.8.xml | 18 - var/package/Lib_Js_TinyMCE-3.5.11.7.xml | 18 - var/package/Lib_LinLibertineFont-2.8.14.8.xml | 18 - var/package/Lib_ZF-1.12.10.7.xml | 18 - var/package/Lib_ZF_Locale-1.12.10.7.xml | 19 - 14 files changed, 198 insertions(+), 297 deletions(-) delete mode 100644 var/package/Lib_Js_Calendar-1.51.1.8.xml delete mode 100644 var/package/Lib_Js_TinyMCE-3.5.11.7.xml delete mode 100644 var/package/Lib_LinLibertineFont-2.8.14.8.xml delete mode 100644 var/package/Lib_ZF-1.12.10.7.xml delete mode 100644 var/package/Lib_ZF_Locale-1.12.10.7.xml diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php index 37828e52ad2..fca7a2293f4 100644 --- a/app/code/core/Mage/Cms/Block/Page.php +++ b/app/code/core/Mage/Cms/Block/Page.php @@ -91,8 +91,10 @@ protected function _prepareLayout() Mage::dispatchEvent('cms_generate_breadcrumbs', array('breadcrumbs' => $breadcrumbsObject)); - foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) { - $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']); + if ($breadcrumbs instanceof Mage_Page_Block_Html_Breadcrumbs) { + foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) { + $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']); + } } } @@ -108,16 +110,6 @@ protected function _prepareLayout() $head->setDescription($page->getMetaDescription()); } - $breadcrumbsObject = new Varien_Object(); - $breadcrumbsObject->setCrumbs($breadcrumbsArray); - - Mage::dispatchEvent('cms_generate_breadcrumbs', array('breadcrumbs' => $breadcrumbsObject)); - - if ($breadcrumbs instanceof Mage_Page_Block_Html_Breadcrumbs) { - foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) { - $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']); - } - } return parent::_prepareLayout(); } diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml index 4a1823b38a3..42d291f1896 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -1227,7 +1227,7 @@ sales/quote_address_total_msrp - weee,freeshipping + grand_total diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index 4a5a6c0dad8..7a2f800738a 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -245,26 +245,26 @@ public function processFreeShipping(Mage_Sales_Model_Quote_Item_Abstract $item) $item->setFreeShipping(false); foreach ($this->_getRules() as $rule) { - /* @var $rule Mage_SalesRule_Model_Rule */ - if ( - $rule->getSimpleFreeShipping() - && $this->_canProcessRule($rule, $address) - && $rule->getActions()->validate($item) - ) { - - switch ($rule->getSimpleFreeShipping()) { - case Mage_SalesRule_Model_Rule::FREE_SHIPPING_ITEM: - $item->setFreeShipping($rule->getDiscountQty() ? $rule->getDiscountQty() : true); - break; + if (!$this->_canProcessRule($rule, $address)) { + continue; + } - case Mage_SalesRule_Model_Rule::FREE_SHIPPING_ADDRESS: - $address->setFreeShipping(true); - break; - } - if ($rule->getStopRulesProcessing()) { + if (!$rule->getActions()->validate($item)) { + continue; + } + + switch ($rule->getSimpleFreeShipping()) { + case Mage_SalesRule_Model_Rule::FREE_SHIPPING_ITEM: + $item->setFreeShipping($rule->getDiscountQty() ? $rule->getDiscountQty() : true); + break; + + case Mage_SalesRule_Model_Rule::FREE_SHIPPING_ADDRESS: + $address->setFreeShipping(true); break; - } + } + if ($rule->getStopRulesProcessing()) { + break; } } return $this; @@ -316,198 +316,204 @@ public function process(Mage_Sales_Model_Quote_Item_Abstract $item) foreach ($this->_getRules() as $rule) { /* @var $rule Mage_SalesRule_Model_Rule */ - if ($this->_canProcessRule($rule, $address) && $rule->getActions()->validate($item)) { - - $qty = $this->_getItemQty($item, $rule); - $rulePercent = min(100, $rule->getDiscountAmount()); - - $discountAmount = 0; - $baseDiscountAmount = 0; - //discount for original price - $originalDiscountAmount = 0; - $baseOriginalDiscountAmount = 0; - - switch ($rule->getSimpleAction()) { - case Mage_SalesRule_Model_Rule::TO_PERCENT_ACTION: - $rulePercent = max(0, 100 - $rule->getDiscountAmount()); - //no break; - case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION: - $step = $rule->getDiscountStep(); - if ($step) { - $qty = floor($qty / $step) * $step; - } - $_rulePct = $rulePercent / 100; - $discountAmount = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct; - $baseDiscountAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct; - //get discount for original price - $originalDiscountAmount = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct; - $baseOriginalDiscountAmount = - ($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct; + if (!$this->_canProcessRule($rule, $address)) { + continue; + } - if (!$rule->getDiscountQty() || $rule->getDiscountQty() > $qty) { - $discountPercent = min(100, $item->getDiscountPercent() + $rulePercent); - $item->setDiscountPercent($discountPercent); - } - break; - case Mage_SalesRule_Model_Rule::TO_FIXED_ACTION: - $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount()); - $discountAmount = $qty * ($itemPrice - $quoteAmount); - $baseDiscountAmount = $qty * ($baseItemPrice - $rule->getDiscountAmount()); - //get discount for original price - $originalDiscountAmount = $qty * ($itemOriginalPrice - $quoteAmount); - $baseOriginalDiscountAmount = $qty * ($baseItemOriginalPrice - $rule->getDiscountAmount()); - break; + if (!$rule->getActions()->validate($item)) { + continue; + } - case Mage_SalesRule_Model_Rule::BY_FIXED_ACTION: - $step = $rule->getDiscountStep(); - if ($step) { - $qty = floor($qty / $step) * $step; - } - $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount()); - $discountAmount = $qty * $quoteAmount; - $baseDiscountAmount = $qty * $rule->getDiscountAmount(); - break; + $qty = $this->_getItemQty($item, $rule); + $rulePercent = min(100, $rule->getDiscountAmount()); - case Mage_SalesRule_Model_Rule::CART_FIXED_ACTION: - if (empty($this->_rulesItemTotals[$rule->getId()])) { - Mage::throwException(Mage::helper('salesrule')->__('Item totals are not set for rule.')); - } + $discountAmount = 0; + $baseDiscountAmount = 0; + //discount for original price + $originalDiscountAmount = 0; + $baseOriginalDiscountAmount = 0; - /** - * prevent applying whole cart discount for every shipping order, but only for first order - */ - if ($quote->getIsMultiShipping()) { - $usedForAddressId = $this->getCartFixedRuleUsedForAddress($rule->getId()); - if ($usedForAddressId && $usedForAddressId != $address->getId()) { - break; - } else { - $this->setCartFixedRuleUsedForAddress($rule->getId(), $address->getId()); - } - } - $cartRules = $address->getCartFixedRules(); - if (!isset($cartRules[$rule->getId()])) { - $cartRules[$rule->getId()] = $rule->getDiscountAmount(); - } + switch ($rule->getSimpleAction()) { + case Mage_SalesRule_Model_Rule::TO_PERCENT_ACTION: + $rulePercent = max(0, 100-$rule->getDiscountAmount()); + //no break; + case Mage_SalesRule_Model_Rule::BY_PERCENT_ACTION: + $step = $rule->getDiscountStep(); + if ($step) { + $qty = floor($qty/$step)*$step; + } + $_rulePct = $rulePercent/100; + $discountAmount = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct; + $baseDiscountAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct; + //get discount for original price + $originalDiscountAmount = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct; + $baseOriginalDiscountAmount = + ($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct; + + if (!$rule->getDiscountQty() || $rule->getDiscountQty()>$qty) { + $discountPercent = min(100, $item->getDiscountPercent()+$rulePercent); + $item->setDiscountPercent($discountPercent); + } + break; + case Mage_SalesRule_Model_Rule::TO_FIXED_ACTION: + $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount()); + $discountAmount = $qty * ($itemPrice-$quoteAmount); + $baseDiscountAmount = $qty * ($baseItemPrice-$rule->getDiscountAmount()); + //get discount for original price + $originalDiscountAmount = $qty * ($itemOriginalPrice-$quoteAmount); + $baseOriginalDiscountAmount = $qty * ($baseItemOriginalPrice-$rule->getDiscountAmount()); + break; - if ($cartRules[$rule->getId()] > 0) { - if ($this->_rulesItemTotals[$rule->getId()]['items_count'] <= 1) { - $quoteAmount = $quote->getStore()->convertPrice($cartRules[$rule->getId()]); - $baseDiscountAmount = min($baseItemPrice * $qty, $cartRules[$rule->getId()]); - } else { - $discountRate = $baseItemPrice * $qty / - $this->_rulesItemTotals[$rule->getId()]['base_items_price']; - $maximumItemDiscount = $rule->getDiscountAmount() * $discountRate; - $quoteAmount = $quote->getStore()->convertPrice($maximumItemDiscount); + case Mage_SalesRule_Model_Rule::BY_FIXED_ACTION: + $step = $rule->getDiscountStep(); + if ($step) { + $qty = floor($qty/$step)*$step; + } + $quoteAmount = $quote->getStore()->convertPrice($rule->getDiscountAmount()); + $discountAmount = $qty * $quoteAmount; + $baseDiscountAmount = $qty * $rule->getDiscountAmount(); + break; - $baseDiscountAmount = min($baseItemPrice * $qty, $maximumItemDiscount); - $this->_rulesItemTotals[$rule->getId()]['items_count']--; - } + case Mage_SalesRule_Model_Rule::CART_FIXED_ACTION: + if (empty($this->_rulesItemTotals[$rule->getId()])) { + Mage::throwException(Mage::helper('salesrule')->__('Item totals are not set for rule.')); + } - $discountAmount = min($itemPrice * $qty, $quoteAmount); - $discountAmount = $quote->getStore()->roundPrice($discountAmount); - $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); + /** + * prevent applying whole cart discount for every shipping order, but only for first order + */ + if ($quote->getIsMultiShipping()) { + $usedForAddressId = $this->getCartFixedRuleUsedForAddress($rule->getId()); + if ($usedForAddressId && $usedForAddressId != $address->getId()) { + break; + } else { + $this->setCartFixedRuleUsedForAddress($rule->getId(), $address->getId()); + } + } + $cartRules = $address->getCartFixedRules(); + if (!isset($cartRules[$rule->getId()])) { + $cartRules[$rule->getId()] = $rule->getDiscountAmount(); + } - //get discount for original price - $originalDiscountAmount = min($itemOriginalPrice * $qty, $quoteAmount); - $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($baseItemOriginalPrice); + if ($cartRules[$rule->getId()] > 0) { + if ($this->_rulesItemTotals[$rule->getId()]['items_count'] <= 1) { + $quoteAmount = $quote->getStore()->convertPrice($cartRules[$rule->getId()]); + $baseDiscountAmount = min($baseItemPrice * $qty, $cartRules[$rule->getId()]); + } else { + $discountRate = $baseItemPrice * $qty / + $this->_rulesItemTotals[$rule->getId()]['base_items_price']; + $maximumItemDiscount = $rule->getDiscountAmount() * $discountRate; + $quoteAmount = $quote->getStore()->convertPrice($maximumItemDiscount); - $cartRules[$rule->getId()] -= $baseDiscountAmount; + $baseDiscountAmount = min($baseItemPrice * $qty, $maximumItemDiscount); + $this->_rulesItemTotals[$rule->getId()]['items_count']--; } - $address->setCartFixedRules($cartRules); - break; + $discountAmount = min($itemPrice * $qty, $quoteAmount); + $discountAmount = $quote->getStore()->roundPrice($discountAmount); + $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); - case Mage_SalesRule_Model_Rule::BUY_X_GET_Y_ACTION: - $x = $rule->getDiscountStep(); - $y = $rule->getDiscountAmount(); - if (!$x || $y > $x) { - break; - } - $buyAndDiscountQty = $x + $y; + //get discount for original price + $originalDiscountAmount = min($itemOriginalPrice * $qty, $quoteAmount); + $baseOriginalDiscountAmount = $quote->getStore()->roundPrice($baseItemOriginalPrice); - $fullRuleQtyPeriod = floor($qty / $buyAndDiscountQty); - $freeQty = $qty - $fullRuleQtyPeriod * $buyAndDiscountQty; + $cartRules[$rule->getId()] -= $baseDiscountAmount; + } + $address->setCartFixedRules($cartRules); - $discountQty = $fullRuleQtyPeriod * $y; - if ($freeQty > $x) { - $discountQty += $freeQty - $x; - } + break; - $discountAmount = $discountQty * $itemPrice; - $baseDiscountAmount = $discountQty * $baseItemPrice; - //get discount for original price - $originalDiscountAmount = $discountQty * $itemOriginalPrice; - $baseOriginalDiscountAmount = $discountQty * $baseItemOriginalPrice; + case Mage_SalesRule_Model_Rule::BUY_X_GET_Y_ACTION: + $x = $rule->getDiscountStep(); + $y = $rule->getDiscountAmount(); + if (!$x || $y > $x) { break; - } + } + $buyAndDiscountQty = $x + $y; - $result = new Varien_Object(array( - 'discount_amount' => $discountAmount, - 'base_discount_amount' => $baseDiscountAmount, - )); - Mage::dispatchEvent('salesrule_validator_process', array( - 'rule' => $rule, - 'item' => $item, - 'address' => $address, - 'quote' => $quote, - 'qty' => $qty, - 'result' => $result, - )); - - $discountAmount = $result->getDiscountAmount(); - $baseDiscountAmount = $result->getBaseDiscountAmount(); - - $percentKey = $item->getDiscountPercent(); - /** - * Process "delta" rounding - */ - if ($percentKey) { - $delta = isset($this->_roundingDeltas[$percentKey]) ? $this->_roundingDeltas[$percentKey] : 0; - $baseDelta = isset($this->_baseRoundingDeltas[$percentKey]) - ? $this->_baseRoundingDeltas[$percentKey] - : 0; - $discountAmount += $delta; - $baseDiscountAmount += $baseDelta; - - $this->_roundingDeltas[$percentKey] = $discountAmount - - $quote->getStore()->roundPrice($discountAmount); - $this->_baseRoundingDeltas[$percentKey] = $baseDiscountAmount - - $quote->getStore()->roundPrice($baseDiscountAmount); - $discountAmount = $quote->getStore()->roundPrice($discountAmount); - $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); - } else { - $discountAmount = $quote->getStore()->roundPrice($discountAmount); - $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); - } + $fullRuleQtyPeriod = floor($qty / $buyAndDiscountQty); + $freeQty = $qty - $fullRuleQtyPeriod * $buyAndDiscountQty; + + $discountQty = $fullRuleQtyPeriod * $y; + if ($freeQty > $x) { + $discountQty += $freeQty - $x; + } + + $discountAmount = $discountQty * $itemPrice; + $baseDiscountAmount = $discountQty * $baseItemPrice; + //get discount for original price + $originalDiscountAmount = $discountQty * $itemOriginalPrice; + $baseOriginalDiscountAmount = $discountQty * $baseItemOriginalPrice; + break; + } - /** - * We can't use row total here because row total not include tax - * Discount can be applied on price included tax - */ + $result = new Varien_Object(array( + 'discount_amount' => $discountAmount, + 'base_discount_amount' => $baseDiscountAmount, + )); + Mage::dispatchEvent('salesrule_validator_process', array( + 'rule' => $rule, + 'item' => $item, + 'address' => $address, + 'quote' => $quote, + 'qty' => $qty, + 'result' => $result, + )); + + $discountAmount = $result->getDiscountAmount(); + $baseDiscountAmount = $result->getBaseDiscountAmount(); + + $percentKey = $item->getDiscountPercent(); + /** + * Process "delta" rounding + */ + if ($percentKey) { + $delta = isset($this->_roundingDeltas[$percentKey]) ? $this->_roundingDeltas[$percentKey] : 0; + $baseDelta = isset($this->_baseRoundingDeltas[$percentKey]) + ? $this->_baseRoundingDeltas[$percentKey] + : 0; + $discountAmount += $delta; + $baseDiscountAmount += $baseDelta; + + $this->_roundingDeltas[$percentKey] = $discountAmount - + $quote->getStore()->roundPrice($discountAmount); + $this->_baseRoundingDeltas[$percentKey] = $baseDiscountAmount - + $quote->getStore()->roundPrice($baseDiscountAmount); + $discountAmount = $quote->getStore()->roundPrice($discountAmount); + $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); + } else { + $discountAmount = $quote->getStore()->roundPrice($discountAmount); + $baseDiscountAmount = $quote->getStore()->roundPrice($baseDiscountAmount); + } - $itemDiscountAmount = $item->getDiscountAmount(); - $itemBaseDiscountAmount = $item->getBaseDiscountAmount(); + /** + * We can't use row total here because row total not include tax + * Discount can be applied on price included tax + */ - $discountAmount = min($itemDiscountAmount + $discountAmount, $itemPrice * $qty); - $baseDiscountAmount = min($itemBaseDiscountAmount + $baseDiscountAmount, $baseItemPrice * $qty); + $itemDiscountAmount = $item->getDiscountAmount(); + $itemBaseDiscountAmount = $item->getBaseDiscountAmount(); - $item->setDiscountAmount($discountAmount); - $item->setBaseDiscountAmount($baseDiscountAmount); + $discountAmount = min($itemDiscountAmount + $discountAmount, $itemPrice * $qty); + $baseDiscountAmount = min($itemBaseDiscountAmount + $baseDiscountAmount, $baseItemPrice * $qty); - $item->setOriginalDiscountAmount($originalDiscountAmount); - $item->setBaseOriginalDiscountAmount($baseOriginalDiscountAmount); + $item->setDiscountAmount($discountAmount); + $item->setBaseDiscountAmount($baseDiscountAmount); - $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId(); + $item->setOriginalDiscountAmount($originalDiscountAmount); + $item->setBaseOriginalDiscountAmount($baseOriginalDiscountAmount); - $this->_maintainAddressCouponCode($address, $rule); - $this->_addDiscountDescription($address, $rule); + $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId(); - if ($rule->getStopRulesProcessing()) { - $this->_stopFurtherRules = true; - break; - } + $this->_maintainAddressCouponCode($address, $rule); + $this->_addDiscountDescription($address, $rule); + + if ($rule->getStopRulesProcessing()) { + $this->_stopFurtherRules = true; + break; } } + $item->setAppliedRuleIds(join(',',$appliedRuleIds)); $address->setAppliedRuleIds($this->mergeIds($address->getAppliedRuleIds(), $appliedRuleIds)); $quote->setAppliedRuleIds($this->mergeIds($quote->getAppliedRuleIds(), $appliedRuleIds)); diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index 0e3064b9ae4..f89a1efcebe 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -134,8 +134,8 @@ salesrule/quote_freeshipping - subtotal,tax_subtotal - shipping + subtotal + tax_subtotal,shipping salesrule/quote_discount diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index bf1f05f8c49..1fd6d5eba00 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -162,8 +162,8 @@ tax/sales_total_quote_subtotal - subtotal - tax,discount,msrp + subtotal,nominal,shipping,freeshipping + tax,discount tax/sales_total_quote_shipping diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv index 1db8579e7b6..3a7d00cdbf1 100644 --- a/app/locale/en_US/Mage_Adminhtml.csv +++ b/app/locale/en_US/Mage_Adminhtml.csv @@ -216,7 +216,6 @@ "Cannot send shipment information.","Cannot send shipment information." "Cannot update item quantity.","Cannot update item quantity." "Cannot update the item's quantity.","Cannot update the item's quantity." -"Cannot update the item\'s quantity.","Cannot update the item\'s quantity." "Card Verification Number","Card Verification Number" "Catalog","Catalog" "Catalog Price Rules","Catalog Price Rules" diff --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv index c3788c57ea2..0bd638b5181 100644 --- a/app/locale/en_US/Mage_Paypal.csv +++ b/app/locale/en_US/Mage_Paypal.csv @@ -334,7 +334,6 @@ "Merchant Protection Eligibility","Merchant Protection Eligibility" "Merchant Referral Bonus","Merchant Referral Bonus" "Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview." -"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview." "Merchant account is not verified.","Merchant account is not verified." "Merchant denied this pending payment.","Merchant denied this pending payment." "Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism." @@ -607,7 +606,6 @@ "Virtual Terminal Payment","Virtual Terminal Payment" "Void","Void" "Waiting until Customer's eCheck will be cleared.","Waiting until Customer's eCheck will be cleared." -"Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared." "We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)" "We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)" "Website Payments Plus","Website Payments Plus" diff --git a/app/locale/en_US/Mage_Review.csv b/app/locale/en_US/Mage_Review.csv index 0fce2b229d9..f72c05005b9 100644 --- a/app/locale/en_US/Mage_Review.csv +++ b/app/locale/en_US/Mage_Review.csv @@ -12,8 +12,6 @@ "5 stars","5 stars" "%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" "%2$s (%3$s)","%2$s (%3$s)" -"%2$s %3$s (%4$s)","%2$s %3$s (%4$s)" -"%2$s (%3$s)","%2$s (%3$s)" "Add New Review","Add New Review" "Add Your Review","Add Your Review" "Administrator","Administrator" diff --git a/app/locale/en_US/Mage_Rss.csv b/app/locale/en_US/Mage_Rss.csv index 084d4df6ab9..d9dd8c91c29 100644 --- a/app/locale/en_US/Mage_Rss.csv +++ b/app/locale/en_US/Mage_Rss.csv @@ -2,10 +2,9 @@ "%s - Special Products","%s - Special Products" "%s RSS Feed","%s RSS Feed" "%s has reached a quantity of %s.","%s has reached a quantity of %s." -"%s's Wishlist","%s's Wishlist" -"%s\'s Wishlist","%s\'s Wishlist" "Admin Catalog","Admin Catalog" "Admin Order","Admin Order" +"%s's Wishlist","%s's Wishlist" "Cannot retrieve the wishlist","Cannot retrieve the wishlist" "Catalog","Catalog" "Category Feeds","Category Feeds" diff --git a/var/package/Lib_Js_Calendar-1.51.1.8.xml b/var/package/Lib_Js_Calendar-1.51.1.8.xml deleted file mode 100644 index 945c479356e..00000000000 --- a/var/package/Lib_Js_Calendar-1.51.1.8.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Lib_Js_Calendar - 1.51.1.8 - stable - Mixed - community - - Javascript Calendar for Magento - Javascript Calendar for Magento - 1.51.1.8 - Magento Core Teamcorecore@magentocommerce.com - 2017-02-01 - - - - 5.2.06.0.0 - diff --git a/var/package/Lib_Js_TinyMCE-3.5.11.7.xml b/var/package/Lib_Js_TinyMCE-3.5.11.7.xml deleted file mode 100644 index 471e3b75e81..00000000000 --- a/var/package/Lib_Js_TinyMCE-3.5.11.7.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Lib_Js_TinyMCE - 3.5.11.7 - stable - Mixed - community - - TinyMCE Javascript Libraries for Magento - TinyMCE Javascript Libraries for Magento - 3.5.11.7 - Magento Core Teamcorecore@magentocommerce.com - 2017-02-01 - - - - 5.2.06.0.0 - diff --git a/var/package/Lib_LinLibertineFont-2.8.14.8.xml b/var/package/Lib_LinLibertineFont-2.8.14.8.xml deleted file mode 100644 index a5d46d34414..00000000000 --- a/var/package/Lib_LinLibertineFont-2.8.14.8.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Lib_LinLibertineFont - 2.8.14.8 - stable - GPL - community - - Libertine Open Fonts Project fonts for PDF print-outs - Libertine Open Fonts Project fonts for PDF print-outs - 2.8.14.8 - Magento Core Teamcorecore@magentocommerce.com - 2017-02-01 - - - - 5.2.06.0.0 - diff --git a/var/package/Lib_ZF-1.12.10.7.xml b/var/package/Lib_ZF-1.12.10.7.xml deleted file mode 100644 index 8023a41d11e..00000000000 --- a/var/package/Lib_ZF-1.12.10.7.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Lib_ZF - 1.12.10.7 - stable - New BSD - community - - Zend Framework - Zend Framework - 1.12.10.7 - Magento Core Teamcorecore@magentocommerce.com - 2017-02-01 - - - - 5.2.06.0.0Lib_ZF_Localecommunity1.12.10.71.12.10.7 - diff --git a/var/package/Lib_ZF_Locale-1.12.10.7.xml b/var/package/Lib_ZF_Locale-1.12.10.7.xml deleted file mode 100644 index 8c026b3c3cb..00000000000 --- a/var/package/Lib_ZF_Locale-1.12.10.7.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Lib_ZF_Locale - 1.12.10.7 - stable - New BSD - community - - Zend Framework Locale - Zend Framework Locale -splitted from ZF to avoid memory overruns during installation and upgrades - 1.12.10.7 - Magento Enterprise Teamcorecore@magentocommerce.com - 2017-02-01 - - - - 5.2.06.0.0 -