diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml index 59d3d5b5e2d..2a634797a58 100644 --- a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/view/info.phtml @@ -19,21 +19,16 @@ formatDate($_order->getCreatedAtDate(), 'medium', true); $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', true); +$emailSentInfo = $_order->getEmailSent() ? Mage::helper('sales')->__('Sent') : Mage::helper('sales')->__('Not sent'); ?>
- getEmailSent()): - $_email = Mage::helper('sales')->__('the order confirmation email was sent'); - else: - $_email = Mage::helper('sales')->__('the order confirmation email is not sent'); - endif; ?>
getNoUseOrderLink()): ?> - + __('Order # %s', $this->escapeHtml($_order->getRealOrderId())) ?> - ()
@@ -52,6 +47,10 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', getStatusLabel() ?> + + + + getOrderStoreName(); ?> @@ -75,7 +74,8 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', getRemoteIp() && $this->shouldDisplayCustomerIp()): ?> - escapeHtml($_order->getRemoteIp()); echo ($_order->getXForwardedFor())?' (' . $this->escapeHtml($_order->getXForwardedFor()) . ')':''; ?> + escapeHtml($_order->getRemoteIp()); + echo ($_order->getXForwardedFor()) ? ' (' . $this->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?> getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?> @@ -107,7 +107,7 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', - getCustomerViewUrl()) : ?> + getCustomerViewUrl()) : ?> escapeHtml($_order->getCustomerName()) ?> escapeHtml($_order->getCustomerName()) ?> diff --git a/app/locale/en_US/Mage_Sales.csv b/app/locale/en_US/Mage_Sales.csv index 7844dd203f5..39303b2406f 100644 --- a/app/locale/en_US/Mage_Sales.csv +++ b/app/locale/en_US/Mage_Sales.csv @@ -885,3 +885,6 @@ "the order confirmation email was sent","the order confirmation email was sent" "the shipment email is not sent","the shipment email is not sent" "the shipment email was sent","the shipment email was sent" +"Order Confirmation Email","Order Confirmation Email" +"Sent","Sent" +"Not sent","Not sent" diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index b43d194d6bd..17a364c77d4 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -232,10 +232,16 @@ tr.dynamic-grid input.input-text { width:154px; } cursor: pointer; width: 12px; height: 12px; - margin: 2px 0 0 2px; + margin-left: 4px; } -.entry-edit-head .icon-copy { width: 11px; height: 11px; margin: 0 0 0 5px; filter: hue-rotate(0) brightness(0) contrast(1) saturate(0) invert(1); } +.entry-edit-head .icon-copy { + width: 11px; + height: 11px; + margin: 0 0 0 5px; + filter: hue-rotate(0) brightness(0) contrast(1) saturate(0) invert(1); + float: right; +} .icon-copy-copied { background-image: url('data:image/svg+xml,'); } diff --git a/skin/adminhtml/default/openmage/override.css b/skin/adminhtml/default/openmage/override.css index 4189487f428..b5984e00277 100644 --- a/skin/adminhtml/default/openmage/override.css +++ b/skin/adminhtml/default/openmage/override.css @@ -301,6 +301,7 @@ small { height: 16px; margin: 8px 0 0 5px; filter: revert; + float: right; } .grid table { border: 1px solid lightgrey; diff --git a/skin/adminhtml/default/openmage/override.css.map b/skin/adminhtml/default/openmage/override.css.map index 4ed9303b689..0ee560c3411 100644 --- a/skin/adminhtml/default/openmage/override.css.map +++ b/skin/adminhtml/default/openmage/override.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_variables.scss","scss/_base.scss","scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_variables.scss","scss/_base.scss","scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/scss/override.scss b/skin/adminhtml/default/openmage/scss/override.scss index 076ca1acda3..f74e0b92e75 100644 --- a/skin/adminhtml/default/openmage/scss/override.scss +++ b/skin/adminhtml/default/openmage/scss/override.scss @@ -192,6 +192,7 @@ small { height: 16px; margin: 8px 0 0 5px; filter: revert; + float: right; } }