Skip to content

Commit

Permalink
Version bump to 3.17.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisnissle committed Aug 7, 2024
1 parent e2cef9c commit e2926f1
Show file tree
Hide file tree
Showing 9 changed files with 97 additions and 7 deletions.
Binary file added assets/images/hermes-label.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"digitick/sepa-xml" : "^2.0.0",
"defuse/php-encryption": "^2.0.0",
"globalcitizen/php-iban": "^4.0.0",
"vendidero/woocommerce-germanized-dhl": "3.1.7",
"vendidero/woocommerce-germanized-shipments": "3.4.1",
"vendidero/woocommerce-germanized-dhl": "3.1.8",
"vendidero/woocommerce-germanized-shipments": "3.5.0",
"vendidero/woocommerce-eu-tax-helper": "2.0.4"
},
"require-dev": {
Expand Down
47 changes: 47 additions & 0 deletions includes/admin/class-wc-gzd-admin-provider-hermes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php
use Vendidero\Germanized\Shipments\ShippingProvider\Simple;

defined( 'ABSPATH' ) || exit;

class WC_GZD_Admin_Provider_Hermes extends Simple {

public function get_edit_link( $section = '' ) {
return 'https://vendidero.de/woocommerce-germanized/features';
}

public function get_name( $context = 'view' ) {
return '_hermes';
}

public function get_description( $context = 'view' ) {
return __( 'Create Hermes labels and return labels conveniently', 'woocommerce-germanized' );
}

public function get_title( $context = 'view' ) {
return __( 'Hermes', 'woocommerce-germanized' ) . ' <span class="wc-gzd-pro wc-gzd-pro-outlined">' . __( 'pro', 'woocommerce-germanized' ) . '</span>';
}

public function is_manual_integration() {
return false;
}

public function is_pro() {
return true;
}

public function is_activated() {
return false;
}

public function activate() {
return false;
}

public function get_help_link() {
return 'https://vendidero.de/woocommerce-germanized/features';
}

public function save() {
return false;
}
}
23 changes: 23 additions & 0 deletions includes/admin/class-wc-gzd-admin-welcome.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,29 @@ private function intro() {
<a href="https://vendidero.de/woocommerce-germanized#upgrade" target="_blank" class="button wc-gzd-button wc-germanized-welcome-pro">Upgrade zur <span class="wc-gzd-pro wc-gzd-pro-outlined">pro</span> Version</a>
</p>

<div class="changelog new-feature">
<h3>Hermes Schnittstelle <span class="wc-gzd-pro wc-gzd-pro-outlined">pro</span></h3>

<div class="columns two-col">
<div class="col col-center">
<img src="<?php echo esc_url( WC_germanized()->plugin_url() ); ?>/assets/images/hermes-label.png" style=""/>
</div>
<div class="col">
<p>
Erstelle mit Germanized Pro bequem Labels für den Versanddienstleister Hermes. Mit unserer neuen Hermes-Schnittstelle
kannst du sowohl normale, als auch Retouren-Labels (auch als QR-Code) erzeugen. Zudem haben wir die Möglichkeit des Versands an
Hermes Paketshops an die in Germanized integrierte Abholstationen-Auswahl im Checkout angebunden.
</p>

<div class="wc-gzd-actions wc-gzd-actions-right">
<a href="https://vendidero.de/dokument/hermes-integration-einrichten" class="wc-gzd-default-button button button-primary" target="_blank">Mehr erfahren</a>
<a href="https://vendidero.de/woocommerce-germanized" target="_blank" class="wc-gzd-pro-version button button-primary wc-gzd-button"><span class="wc-gzd-pro wc-gzd-pro-outlined">pro</span> Version entdecken</a>
<p class="price smaller wc-gzd-pro-version">ab 79 € inkl. MwSt. - inkl. 1 Jahr Updates & Premium Support!</p>
</div>
</div>
</div>
</div>

<div class="changelog new-feature">
<h3>E-Rechnungen einfach erstellen (lassen) <span class="wc-gzd-pro wc-gzd-pro-outlined">pro</span></h3>

Expand Down
9 changes: 9 additions & 0 deletions includes/admin/class-wc-gzd-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ public function maybe_register_shipping_providers( $providers ) {
$gls = new WC_GZD_Admin_Provider_GLS();
$providers['_gls'] = $gls;
}

if ( $this->is_hermes_available() ) {
$hermes = new WC_GZD_Admin_Provider_Hermes();
$providers['_hermes'] = $hermes;
}
}

return $providers;
Expand All @@ -211,6 +216,10 @@ public function is_gls_available() {
return in_array( \Vendidero\Germanized\Shipments\Package::get_base_country(), array( 'DE', 'AT', 'CH', 'BE', 'LU', 'FR', 'IE', 'ES' ), true );
}

public function is_hermes_available() {
return in_array( \Vendidero\Germanized\Shipments\Package::get_base_country(), array( 'DE' ), true );
}

public function is_dpd_available() {
return in_array( \Vendidero\Germanized\Shipments\Package::get_base_country(), array( 'DE', 'AT' ), true );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected function get_available_providers() {
$providers = array();

if ( class_exists( '\Vendidero\Germanized\DHL\Package' ) && \Vendidero\Germanized\DHL\Package::has_dependencies() ) {
$providers = array( __( 'DHL', 'woocommerce-germanized' ), __( 'Deutsche Post', 'woocommerce-germanized' ) );
$providers = array( __( 'DHL', 'woocommerce-germanized' ) );
}

if ( WC_GZD_Admin::instance()->is_dpd_available() ) {
Expand All @@ -30,6 +30,10 @@ protected function get_available_providers() {
$providers[] = __( 'GLS', 'woocommerce-germanized' ) . '<span class="wc-gzd-pro wc-gzd-pro-outlined">' . __( 'pro', 'woocommerce-germanized' ) . '</span>';
}

if ( WC_GZD_Admin::instance()->is_hermes_available() ) {
$providers[] = __( 'Hermes', 'woocommerce-germanized' ) . '<span class="wc-gzd-pro wc-gzd-pro-outlined">' . __( 'pro', 'woocommerce-germanized' ) . '</span>';
}

return $providers;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "woocommerce-germanized",
"title": "Germanized for WooCommerce",
"version": "3.17.1",
"version": "3.17.2",
"homepage": "https://vendidero.de/woocommerce-germanized",
"repository": {
"type": "git",
Expand Down
9 changes: 8 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Requires at least: 5.4
Tested up to: 6.6
WC requires at least: 3.9
WC tested up to: 9.0
Stable tag: 3.17.1
Stable tag: 3.17.2
Requires PHP: 5.6
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html
Expand Down Expand Up @@ -205,6 +205,13 @@ Bug reports may be filed via our [GitHub repository](https://github.com/vendider
6. Edit pdf documents (Pro)

== Changelog ==
= 3.17.2 =
* Improvement: Add link to last shipment's tracking url in order shipping status column
* Improvement: Added new abstraction layer for pickup location provider settings
* Improvement: Support for specific item based free shipping rules, e.g. based on exact shipping class match or restricted packaging
* Fix: Variation shipping dimensions
* Fix: Prevent certain special chars in DHL label references to prevent cryptic inlay label error messages

= 3.17.1 =
* Improvement: Support unit product ranges for variable products, e.g. 100 ml - 200 ml
* Improvement: Use all available (even non-fitting) packaging options in view-mode only
Expand Down
4 changes: 2 additions & 2 deletions woocommerce-germanized.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Germanized for WooCommerce
* Plugin URI: https://www.vendidero.de/woocommerce-germanized
* Description: Germanized for WooCommerce extends WooCommerce to become a legally compliant store in the german market.
* Version: 3.17.1
* Version: 3.17.2
* Author: vendidero
* Author URI: https://vendidero.de
* Requires at least: 5.4
Expand Down Expand Up @@ -69,7 +69,7 @@ final class WooCommerce_Germanized {
*
* @var string
*/
public $version = '3.17.1';
public $version = '3.17.2';

/**
* @var WooCommerce_Germanized $instance of the plugin
Expand Down

0 comments on commit e2926f1

Please sign in to comment.