Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tig-mickeybeijer committed Apr 25, 2023
2 parents aeb2a15 + 23e03f8 commit c18ca6d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

---

### Make sure you are using the *latest* version: https://github.com/tig-nl/postcode-magento2/releases/
### Make sure you are using the *latest* version: https://github.com/postcodeservice/postcode-magento2/releases/
Issues with outdated version will be rejected.
- [ ] I've **verified** and **I assure** that I'm running the latest version of the TIG Postcode Magento 2 extension.

Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

---

### Make sure you are using the *latest* version: https://github.com/tig-nl/postcode-magento2/releases/
### Make sure you are using the *latest* version: https://github.com/postcodeservice/postcode-magento2/releases/
Issues with outdated version will be rejected.
- [ ] I've **verified** and **I assure** that I'm running the latest version of the TIG Postcode Magento 2 extension.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<p align="center"><img src="https://postcodeservice.com/wp-content/uploads/2021/01/postcode-service-logo__Logo-color.svg" width="300px" /></p>

# Postcode Service Magento 2
[![Latest Stable Version](https://img.shields.io/github/v/release/tig-nl/postcode-magento2?style=for-the-badge&color=227cff)](https://github.com/tig-nl/postcode-magento2/releases/latest)
[![Latest Stable Version](https://img.shields.io/github/v/release/tig-nl/postcode-magento2?style=for-the-badge&color=227cff)](https://github.com/postcodeservice/postcode-magento2/releases/latest)
![TIG Postcode Service 2.3.7 versions](https://img.shields.io/badge/Tested%20with%20Magento-2.3.7-%2300cf00?style=for-the-badge)
![TIG Postcode Service 2.4.6 versions](https://img.shields.io/badge/Tested%20with%20Magento-2.4.6-%2300cf00?style=for-the-badge)
[![Total Extension downloads](https://img.shields.io/packagist/dt/tig/postcode-magento2?style=for-the-badge&color=227cff)](https://packagist.org/packages/tig-nl/postcode-magento2/stats)
[![Total Extension downloads](https://img.shields.io/packagist/dt/tig/postcode-magento2?style=for-the-badge&color=227cff)](https://packagist.org/packages/tig/postcode-magento2/stats)
![Build Status](https://img.shields.io/travis/tig-nl/postcode-magento2/master?style=for-the-badge)


Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<system>
<section id="tig_postcode" translate="label" type="text"
sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Postcode Service NL/BE</label>
<label>Postcode Service Internationaal</label>
<tab>sales</tab>
<resource>Sales_Postcode::configuration</resource>
<class>postcode-section</class>
Expand Down
13 changes: 5 additions & 8 deletions view/adminhtml/templates/config/support/tab.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<ul>
<p><?= $block->escapeHtml(__('Documents regarding the Postcode Magento 2 extension:'));?></p>
<li>
<a class="pdf" target="_blank" href="https://confluence.tig.nl/x/8IBaAg"
<a class="pdf" target="_blank" href="https://postcodeservice.github.io/postcode-magento2/"
title="<?= $block->escapeHtml(__('View the user manual.' .
' Currently the manual is only available in Dutch.'));
?>">
Expand All @@ -76,7 +76,7 @@
</a>
</li>
<li>
<a target="_blank" href="https://confluence.tig.nl/x/B4FaAg"
<a target="_blank" href="https://github.com/postcodeservice/postcode-magento2/releases"
title="<?= $block->escapeHtml(__('View the complete release notes of the extension.' .
' Currently the release notes is only available in Dutch.'));?>">
<?= $block->escapeHtml(__('Full Release Notes'));?>
Expand Down Expand Up @@ -136,8 +136,8 @@
<h3 data-role="trigger"><?= $block->escapeHtml(__('Support'));?></h3>
</div>
<div class="collapse-content support-postcode-tig" data-role="content" style="display:none;">
<p><?= $block->escapeHtml(__('This extension is developed' .
' by Total Internet Group (<a href="https://tig.nl" target="_blank">TIG</a>).'));
<p><?= __('This extension is developed' .
' by Total Internet Group (<a href="https://tig.nl" target="_blank">TIG</a>).');
?>

<div class="block_contact">
Expand Down Expand Up @@ -172,10 +172,7 @@
<span><?= $block->escapeHtml(__('E-mail:'));?></span>
</li>
<li class="last">
<?= $block->escapeHtml(
__('<a href="mailto:[email protected]">[email protected]</a>')
);
?>
<?= __('<a href="mailto:[email protected]">[email protected]</a>'); ?>
</li>
</ul>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion view/adminhtml/web/css/adminhtml_config_postcode.css
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
}

.postcode-config-page #container:before {
content: 'Postcode Service NL/BE';
content: 'Postcode Service Internationaal';
text-indent: 0px;
float: left;
height: 50px;
Expand Down

0 comments on commit c18ca6d

Please sign in to comment.