Skip to content

Commit

Permalink
Fix typo
Browse files Browse the repository at this point in the history 
Restore PR #279
  • Loading branch information
@Schrank
Schrank committed Oct 15, 2017
1 parent 7854911 commit 208eb0f
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 23 deletions.
4 changes: 2 additions & 2 deletions docs/api/html/classes/FireGento_Pdf_Model_Engine_Abstract.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</li><li>public FireGento_Pdf_Model_Engine_Abstract <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/setMode.xhtml">setMode</a>()
</li><li>public string <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/getMode.xhtml">getMode</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/Ln.xhtml">Ln</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/insertLogo.xhtml">insertLogo</a>()
</li><li>protected bool <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertLogoPositioned.xhtml">_insertLogoPositioned</a>()
Expand Down Expand Up @@ -240,7 +240,7 @@
— Insert Notes</li>
<li id="_insertPageCounter"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertPageCounter.xhtml">_insertPageCounter()</a>
— Insert page counter</li>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar()</a>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar()</a>
— Insert sender address bar</li>
<li id="_isLogoFullWidth"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth()</a>
— is the setting to show the logo full width?</li>
Expand Down
6 changes: 3 additions & 3 deletions ...ine_Abstract/_insertSenderAddessBar.xhtml → ...ne_Abstract/_insertSenderAddressBar.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<li class="separator">
<a title="FireGento_Pdf_Model_Engine_Abstract" href="../../classes/FireGento_Pdf_Model_Engine_Abstract.xhtml">FireGento_Pdf_Model_Engine_Abstract</a>
</li>
<li class="separator">_insertSenderAddessBar</li>
<li class="separator">_insertSenderAddressBar</li>
</ul>
</div>
<nav class="box">
Expand All @@ -64,13 +64,13 @@
</ul>
</nav>
<section>
<h1><small>FireGento_Pdf_Model_Engine_Abstract::</small>_insertSenderAddessBar</h1>
<h1><small>FireGento_Pdf_Model_Engine_Abstract::</small>_insertSenderAddressBar</h1>
<h4>Insert sender address bar</h4>
<p/>
<ul/>
<h2 id="signature">Signature</h2>
<div class="styled synopsis">
<code>protected function _insertSenderAddessBar(&amp;
<code>protected function _insertSenderAddressBar(&amp;
$page )
</code>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/api/html/classes/FireGento_Pdf_Model_Engine_Creditmemo_Default.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</li><li>public FireGento_Pdf_Model_Engine_Abstract <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/setMode.xhtml">setMode</a>()
</li><li>public string <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/getMode.xhtml">getMode</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/Ln.xhtml">Ln</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/insertLogo.xhtml">insertLogo</a>()
</li><li>protected bool <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertLogoPositioned.xhtml">_insertLogoPositioned</a>()
Expand Down Expand Up @@ -214,7 +214,7 @@
— Insert Notes</li>
<li id="_insertPageCounter"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertPageCounter.xhtml">_insertPageCounter()</a>
— Insert page counter</li>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar()</a>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar()</a>
— Insert sender address bar</li>
<li id="_isLogoFullWidth"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth()</a>
— is the setting to show the logo full width?</li>
Expand Down
4 changes: 2 additions & 2 deletions docs/api/html/classes/FireGento_Pdf_Model_Engine_Invoice_Default.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</li><li>public FireGento_Pdf_Model_Engine_Abstract <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/setMode.xhtml">setMode</a>()
</li><li>public string <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/getMode.xhtml">getMode</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/Ln.xhtml">Ln</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/insertLogo.xhtml">insertLogo</a>()
</li><li>protected bool <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertLogoPositioned.xhtml">_insertLogoPositioned</a>()
Expand Down Expand Up @@ -214,7 +214,7 @@
— Insert Notes</li>
<li id="_insertPageCounter"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertPageCounter.xhtml">_insertPageCounter()</a>
— Insert page counter</li>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar()</a>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar()</a>
— Insert sender address bar</li>
<li id="_isLogoFullWidth"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth()</a>
— is the setting to show the logo full width?</li>
Expand Down
4 changes: 2 additions & 2 deletions docs/api/html/classes/FireGento_Pdf_Model_Engine_Shipment_Default.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</li><li>public FireGento_Pdf_Model_Engine_Abstract <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/setMode.xhtml">setMode</a>()
</li><li>public string <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/getMode.xhtml">getMode</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/Ln.xhtml">Ln</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/insertLogo.xhtml">insertLogo</a>()
</li><li>protected bool <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth</a>()
</li><li>protected void <a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertLogoPositioned.xhtml">_insertLogoPositioned</a>()
Expand Down Expand Up @@ -220,7 +220,7 @@
— Insert Notes</li>
<li id="_insertPageCounter"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertPageCounter.xhtml">_insertPageCounter()</a>
— Insert page counter</li>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddessBar()</a>
<li id="_insertSenderAddessBar"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_insertSenderAddessBar.xhtml">_insertSenderAddressBar()</a>
— Insert sender address bar</li>
<li id="_isLogoFullWidth"><a title="FireGento_Pdf_Model_Engine_Abstract" href="../classes/FireGento_Pdf_Model_Engine_Abstract/_isLogoFullWidth.xhtml">_isLogoFullWidth()</a>
— is the setting to show the logo full width?</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/html/source/app/code/community/FireGento/Pdf/Model/Engine/Abstract.php.xhtml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/api/xml/classes/FireGento_Pdf_Model_Engine_Abstract.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</docblock>
<parameter name="height" byreference="false" type="integer" default="15"/>
</method>
<method name="_insertSenderAddessBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<method name="_insertSenderAddressBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<docblock>
<description compact="Insert sender address bar"/>
<param description="&amp;$page Current page object of Zend_Pdf" type="object">
Expand Down
2 changes: 1 addition & 1 deletion docs/api/xml/classes/FireGento_Pdf_Model_Engine_Creditmemo_Default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</docblock>
<parameter name="height" byreference="false" type="integer" default="15"/>
</method>
<method name="_insertSenderAddessBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<method name="_insertSenderAddressBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<docblock>
<description compact="Insert sender address bar"/>
<param description="&amp;$page Current page object of Zend_Pdf" type="object">
Expand Down
2 changes: 1 addition & 1 deletion docs/api/xml/classes/FireGento_Pdf_Model_Engine_Invoice_Default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</docblock>
<parameter name="height" byreference="false" type="integer" default="15"/>
</method>
<method name="_insertSenderAddessBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<method name="_insertSenderAddressBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<docblock>
<description compact="Insert sender address bar"/>
<param description="&amp;$page Current page object of Zend_Pdf" type="object">
Expand Down
2 changes: 1 addition & 1 deletion docs/api/xml/classes/FireGento_Pdf_Model_Engine_Shipment_Default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
</docblock>
<parameter name="height" byreference="false" type="integer" default="15"/>
</method>
<method name="_insertSenderAddessBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<method name="_insertSenderAddressBar" start="230" end="242" abstract="false" final="false" static="false" visibility="protected">
<docblock>
<description compact="Insert sender address bar"/>
<param description="&amp;$page Current page object of Zend_Pdf" type="object">
Expand Down
4 changes: 2 additions & 2 deletions docs/api/xml/tokens/app/code/community/FireGento/Pdf/Model/Engine/Abstract.php.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@
<token name="T_WHITESPACE"> </token>
<token name="T_FUNCTION">function</token>
<token name="T_WHITESPACE"> </token>
<token name="T_STRING">_insertSenderAddessBar</token>
<token name="T_STRING">_insertSenderAddressBar</token>
<token name="T_PHPDOX_OPEN_BRACKET">(</token>
<token name="T_PHPDOX_AMPERSAND">&amp;</token>
<token name="T_VARIABLE">$page</token>
Expand Down Expand Up @@ -3164,7 +3164,7 @@
<token name="T_WHITESPACE"> </token>
<token name="T_VARIABLE">$this</token>
<token name="T_OBJECT_OPERATOR">-&gt;</token>
<token name="T_STRING">_insertSenderAddessBar</token>
<token name="T_STRING">_insertSenderAddressBar</token>
<token name="T_PHPDOX_OPEN_BRACKET">(</token>
<token name="T_VARIABLE">$page</token>
<token name="T_PHPDOX_CLOSE_BRACKET">)</token>
Expand Down
13 changes: 8 additions & 5 deletions src/app/code/community/FireGento/Pdf/Model/Engine/Abstract.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ protected function Ln($height = 15)
*
* @return void
*/
protected function _insertSenderAddessBar($page)
protected function _insertSenderAddressBar($page)
{
if (Mage::getStoreConfig('sales_pdf/firegento_pdf/sender_address_bar') != '') {
$this->_setFontRegular($page, 6);
Expand Down Expand Up @@ -404,22 +404,25 @@ protected function insertAddressesAndHeader(

// Add sender address
$this->y = 705 - $this->_marginTop;
$this->_insertSenderAddessBar($page);
$this->_insertSenderAddressBar($page);

// Add head
$this->y = 592 - $this->_marginTop;
// make sure that header does not overlap address bar
$headOffset = 0;
if ($this->y > 592 - $this->_marginTop) {
$headOffset = 40;
}

// Add head
$this->y = 592 - $this->_marginTop;
$this->y = 592 - $headOffset - $this->_marginTop;
$this->insertHeader($page, $order, $source);

/* Add table head */
// make sure that item table does not overlap heading
if ($this->y > 575 - $this->_marginTop) {
$this->y = 575 - $this->_marginTop;
if ($this->y > 575 - $headOffset - $this->_marginTop) {
$this->y = 575 - $headOffset - $this->_marginTop;
}
}
}

Expand Down

5 comments on commit 208eb0f

@riker09
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for squatting typos
-1.000 for not providing an alias to the old method. 😜

protected function _insertSenderAddessBar($page)
{
    $this->_insertSenderAddressBar($page);
}

@Schrank
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MQEP1 disallows that :(

@riker09
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

who dat?

(sorry for being so rude today. rough day at work, even more rough when coming home. sick kids, sick wife.)

@Schrank
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#193

@Schrank
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All fine. Take care for your kids

Please sign in to comment.