Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[Magento/Sales] Fixed typos #373

Closed
wants to merge 1 commit into from

3 participants

@pborreli

No description provided.

@verklov

Hi pborreli!
Thank you for your contribution! We have opened an internal ticket and will respond to you once it is fixed and included in the code.

@mage2-team mage2-team referenced this pull request from a commit
@mage2-team mage2-team 2.0.0.0-dev54
* Modularity improvements:
  * Breakdown of the Adminhtml module:
     * Moved Newsletter, Report logic to the respective modules
     * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
  * Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
  * Areas are independent from Store
  * Removed deprecated annotation from the getArea methods
* GitHub requests:
  * [#245](#245) -- Resolve design flaws in core URL helper
  * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
  * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.
  * [#262](#262) -- Update Rule.php
  * [#373](#373) -- [Magento/Sales] Fixed typos
  * [#382](#382) -- [Magento/Core] Fixed typos
  * [#304](#304) -- Removed Erroneous closing "
  * [#323](#323) -- InstanceController.php - made setBody protected
  * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
  * [#265](#265) -- Update Merge.php
  * [#271](#271) -- Check Data should validate gallery information
  * [#305](#305) -- Extra ", tidied up nested quotes
  * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
  * [#224](#224) -- Tax formatting is locale aware and should not
  * [#338](#338) -- Correcting SQL for required_options column
  * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
  * Old frontend (magento_demo) and backend (magento_basic) themes are removed
  * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
  * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix
  * Fixed report Products in Cart
  * Fixed error on attempt to insert image to CMS pages under version control
  * Fixed order status grid so that you can assign state, edit, and view custom order status
  * Fixed Related Products Rule page so that category can be selected on conditions tab
  * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
  * Fixed the bug with international DHL quotes
6e24c0b
@verklov

Hello pborreli,
We have processed your pull request. The code is released in version dev54.

@verklov verklov closed this
@SchumacherFM SchumacherFM referenced this pull request from a commit
@SchumacherFM SchumacherFM Merge remote-tracking branch 'upstream/master'
* upstream/master:
  2.0.0.0-dev54 * Modularity improvements:   * Breakdown of the Adminhtml module:      * Moved Newsletter, Report logic to the respective modules      * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules   * Removed application dependencies from the library * Move Magento\Core common blocks in the library * Application areas rework:   * Areas are independent from Store   * Removed deprecated annotation from the getArea methods * GitHub requests:   * [#245](#245) -- Resolve design flaws in core URL helper   * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage   * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.   * [#262](#262) -- Update Rule.php   * [#373](#373) -- [Magento/Sales] Fixed typos   * [#382](#382) -- [Magento/Core] Fixed typos   * [#304](#304) -- Removed Erroneous closing "   * [#323](#323) -- InstanceController.php - made setBody protected   * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.   * [#265](#265) -- Update Merge.php   * [#271](#271) -- Check Data should validate gallery information   * [#305](#305) -- Extra ", tidied up nested quotes   * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration   * [#224](#224) -- Tax formatting is locale aware and should not   * [#338](#338) -- Correcting SQL for required_options column   * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning * Themes update:   * Old frontend (magento_demo) and backend (magento_basic) themes are removed   * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules * Fixed bugs:   * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix   * Fixed report Products in Cart   * Fixed error on attempt to insert image to CMS pages under version control   * Fixed order status grid so that you can assign state, edit, and view custom order status   * Fixed Related Products Rule page so that category can be selected on conditions tab   * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled   * Fixed the bug with international DHL quotes
  2.0.0.0-dev53 * Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module * Moved view-related methods from action interface to \Magento\App\ViewInterface with corresponding implementation * Moved redirect creation logic from the action interface to \Magento\App\Response\RedirectInterface * Moved Magento\Core common blocks to the library * Added reading of etc/integration/config.xml and etc/integration/api.xml files for API Integrations * Various improvements:   * Email-related logic from the Core and Adminhtml modules consolidated in the new Email module * GitHub requests:   * [#238](#238) -- Improve escaping HTML entities in URL   * [#199](#199) -- Replaced function calls to array_push with adding the elements directly   * [#182](#182) -- By default use collection _idFieldName for toOption* methods.   * [#233](#233) -- Google Rich Snippet Code   * [#339](#339) -- Correcting 'cahce' typo in documentation.   * [#232](#232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632) * Fixed bugs:   * Fixed JavaScript error when printing orders from the frontend   * Fixed Captcha problems on various forms when Captcha is enabled on the frontend   * Fixed "Page not found" on category page if setting "Add Store Code to Urls" to "Yes" in the backend config   * Fixed Fatal error when creating shipping label for returns
  2.0.0.0-dev52 * Better Navigation menu rendering due to improved Caching of Categories * Added Magento\Filesystem\Directory and Magento\Filesystem\File to the library * Various improvements:   * Added a static test to check for incorrect dependencies in the library   * Moved Magento\Core\Model\Theme to the Magento\View component   * Moved Magento\Core\Model\Design to the Magento\View component   * Consistent declaration of page-types   * The Framework part of the Cache functionality moved out from modules * Themes update:   * Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme   * Refactored and removed duplicate Persistent module templates   * Plushe theme made responsive * Fixed bugs:   * Fixed inability to print order, invoice, or creditmemo in the frontend   * Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test   * Fixed the broken link when the MAP feature is enabled and actual product price is set to be displayed in the shopping cart * Moved the following methods from Core Helpers to the appropriate libraries:   * Moved the Data Helper date format related functions to \Magento\Core\Model\Locale   * Moved the Data Helper array decoration related functions to Magento\Stdlib\ArrayUtils   * Moved the Data Helper functions that copy data from one object to another to \Magento\Object\Copy
4b15176
@Nas1k Nas1k referenced this pull request from a commit
@mage2-team mage2-team 2.0.0.0-dev54
* Modularity improvements:
  * Breakdown of the Adminhtml module:
     * Moved Newsletter, Report logic to the respective modules
     * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
  * Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
  * Areas are independent from Store
  * Removed deprecated annotation from the getArea methods
* GitHub requests:
  * [#245](#245) -- Resolve design flaws in core URL helper
  * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
  * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.
  * [#262](#262) -- Update Rule.php
  * [#373](#373) -- [Magento/Sales] Fixed typos
  * [#382](#382) -- [Magento/Core] Fixed typos
  * [#304](#304) -- Removed Erroneous closing "
  * [#323](#323) -- InstanceController.php - made setBody protected
  * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
  * [#265](#265) -- Update Merge.php
  * [#271](#271) -- Check Data should validate gallery information
  * [#305](#305) -- Extra ", tidied up nested quotes
  * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
  * [#224](#224) -- Tax formatting is locale aware and should not
  * [#338](#338) -- Correcting SQL for required_options column
  * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
  * Old frontend (magento_demo) and backend (magento_basic) themes are removed
  * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
  * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix
  * Fixed report Products in Cart
  * Fixed error on attempt to insert image to CMS pages under version control
  * Fixed order status grid so that you can assign state, edit, and view custom order status
  * Fixed Related Products Rule page so that category can be selected on conditions tab
  * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
  * Fixed the bug with international DHL quotes
789face
@Nas1k Nas1k referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@Nas1k Nas1k referenced this pull request from a commit
@mage2-team mage2-team (split Module_Customer)2.0.0.0-dev54
* Modularity improvements:
  * Breakdown of the Adminhtml module:
     * Moved Newsletter, Report logic to the respective modules
     * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
  * Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
  * Areas are independent from Store
  * Removed deprecated annotation from the getArea methods
* GitHub requests:
  * [#245](#245) -- Resolve design flaws in core URL helper
  * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
  * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.
  * [#262](#262) -- Update Rule.php
  * [#373](#373) -- [Magento/Sales] Fixed typos
  * [#382](#382) -- [Magento/Core] Fixed typos
  * [#304](#304) -- Removed Erroneous closing "
  * [#323](#323) -- InstanceController.php - made setBody protected
  * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
  * [#265](#265) -- Update Merge.php
  * [#271](#271) -- Check Data should validate gallery information
  * [#305](#305) -- Extra ", tidied up nested quotes
  * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
  * [#224](#224) -- Tax formatting is locale aware and should not
  * [#338](#338) -- Correcting SQL for required_options column
  * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
  * Old frontend (magento_demo) and backend (magento_basic) themes are removed
  * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
  * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix
  * Fixed report Products in Cart
  * Fixed error on attempt to insert image to CMS pages under version control
  * Fixed order status grid so that you can assign state, edit, and view custom order status
  * Fixed Related Products Rule page so that category can be selected on conditions tab
  * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
  * Fixed the bug with international DHL quotes
db39f5b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 4, 2013
  1. @pborreli

    Fixed typos

    pborreli authored
This page is out of date. Refresh to see the latest.
Showing with 52 additions and 52 deletions.
  1. +1 −1  app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
  2. +5 −5 app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
  3. +1 −1  app/code/Magento/Sales/Block/Order/Comments.php
  4. +1 −1  app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
  5. +3 −3 app/code/Magento/Sales/Model/Order.php
  6. +2 −2 app/code/Magento/Sales/Model/Order/Creditmemo.php
  7. +3 −3 app/code/Magento/Sales/Model/Order/Invoice.php
  8. +5 −5 app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
  9. +2 −2 app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
  10. +1 −1  app/code/Magento/Sales/Model/Order/Item.php
  11. +3 −3 app/code/Magento/Sales/Model/Order/Payment.php
  12. +1 −1  app/code/Magento/Sales/Model/Order/Payment/Transaction.php
  13. +1 −1  app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
  14. +2 −2 app/code/Magento/Sales/Model/Order/Shipment.php
  15. +2 −2 app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
  16. +1 −1  app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
  17. +3 −3 app/code/Magento/Sales/Model/Quote/Item.php
  18. +3 −3 app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
  19. +3 −3 app/code/Magento/Sales/Model/Recurring/Profile.php
  20. +1 −1  app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
  21. +1 −1  app/code/Magento/Sales/Model/Resource/Order/Collection.php
  22. +1 −1  app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
  23. +1 −1  app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
  24. +1 −1  app/code/Magento/Sales/Model/Resource/Setup.php
  25. +2 −2 app/code/Magento/Sales/Model/Service/Order.php
  26. +1 −1  app/code/Magento/Sales/i18n/en_US.csv
  27. +1 −1  app/code/Magento/Sales/i18n/fr_FR.csv
View
2  app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
@@ -142,7 +142,7 @@ protected function _prepareForm()
/**
* if there is a parent element defined, it will be replaced by a hidden element with the same name
- * and overriden by the form elements
+ * and overridden by the form elements
* It is needed to maintain HTML consistency of the parent element's form
*/
if ($this->_parentElement) {
View
10 app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -68,14 +68,14 @@ protected function _prepareLayout()
));
$profile = $this->_coreRegistry->registry('current_recurring_profile');
- $comfirmationMessage = __('Are you sure you want to do this?');
+ $confirmationMessage = __('Are you sure you want to do this?');
// cancel
if ($profile->canCancel()) {
$url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'cancel'));
$this->_addButton('cancel', array(
'label' => __('Cancel'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'delete',
));
}
@@ -85,7 +85,7 @@ protected function _prepareLayout()
$url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'suspend'));
$this->_addButton('suspend', array(
'label' => __('Suspend'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'delete',
));
}
@@ -95,7 +95,7 @@ protected function _prepareLayout()
$url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'activate'));
$this->_addButton('activate', array(
'label' => __('Activate'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'add',
));
}
@@ -105,7 +105,7 @@ protected function _prepareLayout()
$url = $this->getUrl('*/*/updateProfile', array('profile' => $profile->getId(),));
$this->_addButton('update', array(
'label' => __('Get Update'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'add',
));
}
View
2  app/code/Magento/Sales/Block/Order/Comments.php
@@ -51,7 +51,7 @@ public function __construct(
protected $_entity;
/**
- * Currect comments collection
+ * Current comments collection
*
* @var \Magento\Sales\Model\Resource\Order\Comment\Collection\AbstractCollection
*/
View
2  app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
@@ -107,7 +107,7 @@ protected function _prepareItem(\Magento\Core\Block\AbstractBlock $renderer)
}
/**
- * Get html of invoice totlas block
+ * Get html of invoice totals block
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
* @return string
View
6 app/code/Magento/Sales/Model/Order.php
@@ -1138,7 +1138,7 @@ public function getShippingAddress()
/**
* Order state setter.
* If status is specified, will add order status history with specified comment
- * the setData() cannot be overriden because of compatibility issues with resource model
+ * the setData() cannot be overridden because of compatibility issues with resource model
*
* @param string $state
* @param string|bool $status
@@ -1154,7 +1154,7 @@ public function setState($state, $status = false, $comment = '', $isCustomerNoti
/**
* Order state protected setter.
* By default allows to set any state. Can also update status to default or specified value
- * Сomplete and closed states are encapsulated intentionally, see the _checkState()
+ * Complete and closed states are encapsulated intentionally, see the _checkState()
*
* @param string $state
* @param string|bool $status
@@ -1506,7 +1506,7 @@ public function sendOrderUpdateEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
View
4 app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -852,7 +852,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -928,7 +928,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
View
6 app/code/Magento/Sales/Model/Order/Invoice.php
@@ -419,7 +419,7 @@ public function isCanceled()
}
/**
- * Check invice capture action availability
+ * Check invoice capture action availability
*
* @return bool
*/
@@ -879,7 +879,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -954,7 +954,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
View
10 app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -42,14 +42,14 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
* So basically if we have invoice with positive discount and it
* was not canceled we don't add shipping discount to this one.
*/
- $addShippingDicount = true;
- foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
- if ($previusInvoice->getDiscountAmount()) {
- $addShippingDicount = false;
+ $addShippingDiscount = true;
+ foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+ if ($previousInvoice->getDiscountAmount()) {
+ $addShippingDiscount = false;
}
}
- if ($addShippingDicount) {
+ if ($addShippingDiscount) {
$totalDiscountAmount = $totalDiscountAmount + $invoice->getOrder()->getShippingDiscountAmount();
$baseTotalDiscountAmount = $baseTotalDiscountAmount + $invoice->getOrder()->getBaseShippingDiscountAmount();
}
View
4 app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -132,8 +132,8 @@ protected function _canIncludeShipping($invoice)
/**
* Check shipping amount in previous invoices
*/
- foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
- if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) {
+ foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+ if ($previousInvoice->getShippingAmount() && !$previousInvoice->isCanceled()) {
$includeShippingTax = false;
}
}
View
2  app/code/Magento/Sales/Model/Order/Item.php
@@ -655,7 +655,7 @@ public function addChildItem($item)
}
/**
- * Return chilgren items of this item
+ * Return children items of this item
*
* @return array
*/
View
6 app/code/Magento/Sales/Model/Order/Payment.php
@@ -178,7 +178,7 @@ class Payment extends \Magento\Payment\Model\Info
protected $_eventObject = 'payment';
/**
- * Transaction addditional information container
+ * Transaction additional information container
*
* @var array
*/
@@ -1597,9 +1597,9 @@ public function setTransactionAdditionalInfo($key, $value)
}
/**
- * Additionnal transaction info getter
+ * Additional transaction info getter
*
- * @param sting $key
+ * @param string $key
* @return mixed
*/
public function getTransactionAdditionalInfo($key = null)
View
2  app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -98,7 +98,7 @@ class Transaction extends \Magento\Core\Model\AbstractModel
/**
* Child transactions, assoc array of txn_id => instance
* Filled only in case when all child transactions have txn_id
- * Used for quicker search of child transactions using isset() as oposite to foreaching $_children
+ * Used for quicker search of child transactions using isset() as opposite to foreaching $_children
* @var array
*/
protected $_identifiedChildren = null;
View
2  app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -935,7 +935,7 @@ public function newPage(array $settings = array())
* font string; font style, optional: bold, italic, regular
* font_file string; path to font file (optional for use your custom font)
* font_size int; font size (default 7)
- * align string; text align (also see feed parametr), optional left, right
+ * align string; text align (also see feed parameter), optional left, right
* height int;line spacing (default 10)
*
* @param \Zend_Pdf_Page $page
View
4 app/code/Magento/Sales/Model/Order/Shipment.php
@@ -514,7 +514,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -591,7 +591,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
View
4 app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
@@ -115,7 +115,7 @@ public function fetch(\Magento\Sales\Model\Quote\Address $address)
}
/**
- * Set address shich can be used inside totals calculation
+ * Set address which can be used inside totals calculation
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
@@ -239,7 +239,7 @@ public function getItemBaseRowTotal(\Magento\Sales\Model\Quote\Item\AbstractItem
}
/**
- * Whether the item row total may be compouded with others
+ * Whether the item row total may be compounded with others
*
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return bool
View
2  app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
@@ -65,7 +65,7 @@ public function collect(\Magento\Sales\Model\Quote\Address $address)
foreach ($items as $item) {
if ($this->_initItem($address, $item) && $item->getQty() > 0) {
/**
- * Separatly calculate subtotal only for virtual products
+ * Separately calculate subtotal only for virtual products
*/
if ($item->getProduct()->isVirtual()) {
$virtualAmount += $item->getRowTotal();
View
6 app/code/Magento/Sales/Model/Quote/Item.php
@@ -329,8 +329,8 @@ public function addQty($qty)
$qty = $this->_prepareQty($qty);
/**
- * We can't modify quontity of existing items which have parent
- * This qty declared just once duering add process and is not editable
+ * We can't modify quantity of existing items which have parent
+ * This qty declared just once during add process and is not editable
*/
if (!$this->getParentItem() || !$this->getId()) {
$this->setQtyToAdd($qty);
@@ -664,7 +664,7 @@ public function addOption($option)
/**
* Can specify specific actions for ability to change given quote options values
- * Exemple: cataloginventory decimal qty validation may change qty to int,
+ * Example: cataloginventory decimal qty validation may change qty to int,
* so need to change quote item qty option value.
*
* @param \Magento\Object $option
View
6 app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
@@ -32,7 +32,7 @@
* - original_price - product price before any calculations
* - calculation_price - prices for item totals calculation
* - custom_price - new price that can be declared by user and recalculated during calculation process
- * - original_custom_price - original defined value of custom price without any convertion
+ * - original_custom_price - original defined value of custom price without any conversion
*
* @category Magento
* @package Magento_Sales
@@ -177,7 +177,7 @@ public function getParentItem()
}
/**
- * Get chil items
+ * Get children items
*
* @return array
*/
@@ -620,7 +620,7 @@ public function isChildrenCalculated()
}
/**
- * Checking can we ship product separatelly (each child separately)
+ * Checking can we ship product separately (each child separately)
* or each parent product item can be shipped only like one item
*
* @return bool
View
6 app/code/Magento/Sales/Model/Recurring/Profile.php
@@ -26,7 +26,7 @@
/**
* Sales implementation of recurring payment profiles
- * Implements saving and manageing profiles
+ * Implements saving and managing profiles
*
* @method \Magento\Sales\Model\Resource\Recurring\Profile _getResource()
* @method \Magento\Sales\Model\Resource\Recurring\Profile getResource()
@@ -424,7 +424,7 @@ public function isValid()
/**
* Import quote information to the profile
*
- * @param \Magento\Sales\Model\Quote\ $quote
+ * @param \Magento\Sales\Model\Quote $quote
* @return \Magento\Sales\Model\Recurring\Profile
*/
public function importQuote(\Magento\Sales\Model\Quote $quote)
@@ -814,7 +814,7 @@ protected function _getInitialItem($itemInfo)
}
/**
- * Add additional options suboption into itev
+ * Add additional options suboption into item
*
* @param \Magento\Sales\Model\Order\Item $item
* @param array $option
View
2  app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
@@ -135,7 +135,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
* Backward compatibility with EAV collection
*
* @param int $limit
View
2  app/code/Magento/Sales/Model/Resource/Order/Collection.php
@@ -131,7 +131,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
/**
* Join table sales_flat_order_address to select for billing and shipping order addresses.
- * Create corillation map
+ * Create correlation map
*
* @return \Magento\Sales\Model\Resource\Order\Collection
*/
View
2  app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
@@ -40,7 +40,7 @@ class Child
/**
* Performed before data is saved
*
- * @param Varieb_Object $object
+ * @param Varien_Object $object
* @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*/
public function beforeSave($object)
View
2  app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
@@ -26,7 +26,7 @@
/**
- * Quote addresses shiping rates collection
+ * Quote addresses shipping rates collection
*
* @category Magento
* @package Magento_Sales
View
2  app/code/Magento/Sales/Model/Resource/Setup.php
@@ -120,7 +120,7 @@ protected function _flatTableExist($table)
}
/**
- * Add entity attribute. Overwrited for flat entities support
+ * Add entity attribute. Overwritten for flat entities support
*
* @param int|string $entityTypeId
* @param string $code
View
4 app/code/Magento/Sales/Model/Service/Order.php
@@ -330,7 +330,7 @@ protected function _initCreditmemoData($creditmemo, $data)
}
/**
- * Check if order item can be invoiced. Dummy item can be invoiced or with his childrens or
+ * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
* with parent item which is included to invoice
*
* @param \Magento\Sales\Model\Order\Item $item
@@ -370,7 +370,7 @@ protected function _canInvoiceItem($item, $qtys = array())
}
/**
- * Check if order item can be shiped. Dummy item can be shiped or with his childrens or
+ * Check if order item can be shipped. Dummy item can be shipped or with his children or
* with parent item which is included to shipment
*
* @param \Magento\Sales\Model\Order\Item $item
View
2  app/code/Magento/Sales/i18n/en_US.csv
@@ -468,7 +468,7 @@
"Orders and Returns","Orders and Returns"
"Orders and Returns Search Form","Orders and Returns Search Form"
"Original Price","Original Price"
-"Original order item that recurring payment profile correspondss to.","Original order item that recurring payment profile correspondss to."
+"Original order item that recurring payment profile correspondss to.","Original order item that recurring payment profile corresponds to."
"PDF Credit Memos","PDF Credit Memos"
"PDF Invoices","PDF Invoices"
"PDF Packing Slips","PDF Packing Slips"
View
2  app/code/Magento/Sales/i18n/fr_FR.csv
@@ -285,7 +285,7 @@
"Invalid entity model","Modèle d'entité invalide"
"Invalid item option format.","Format d'option d'objet invalide."
"Invalid qty to invoice item ""%s""","Qté invalide pour facturer l'article ""%s"""
-"Invalid qty to refund item ""%s""","Qté invalide pourrembourser l'article ""%s"""
+"Invalid qty to refund item ""%s""","Qté invalide pour rembourser l'article ""%s"""
"Invalid qty to ship for item ""%s""","Qté invalide pour expédier l'article ""%s"""
"Invalid renderer model","Modèle de rendu invalide"
"Invalid request for adding product to quote.","Requête non valide pour l'ajout du produit au devis."
Something went wrong with that request. Please try again.