Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Magento/Sales] Fixed typos #373

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
));
}
Expand All @@ -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',
));
}
Expand All @@ -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',
));
}
Expand All @@ -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',
));
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct(
protected $_entity;

/**
* Currect comments collection
* Current comments collection
*
* @var \Magento\Sales\Model\Resource\Order\Comment\Collection\AbstractCollection
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Model/Order/Creditmemo.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Order/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public function isCanceled()
}

/**
* Check invice capture action availability
* Check invoice capture action availability
*
* @return bool
*/
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Order/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ public function addChildItem($item)
}

/**
* Return chilgren items of this item
* Return children items of this item
*
* @return array
*/
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Order/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class Payment extends \Magento\Payment\Model\Info
protected $_eventObject = 'payment';

/**
* Transaction addditional information container
* Transaction additional information container
*
* @var array
*/
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Order/Payment/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Model/Order/Shipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Quote/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -177,7 +177,7 @@ public function getParentItem()
}

/**
* Get chil items
* Get children items
*
* @return array
*/
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Recurring/Profile.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Resource/Order/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


/**
* Quote addresses shiping rates collection
* Quote addresses shipping rates collection
*
* @category Magento
* @package Magento_Sales
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Model/Resource/Setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading