Changeset 2730820

Timestamp:

05/25/2022 01:27:21 PM (4 years ago)

Author:

PerfectSolution

Message:

Update trunk/ - 1.0.0

Location:

wc-unzer-direct/trunk

Files:

• README.txt (modified) (1 diff)
• classes/instances/instance.php (modified) (2 diffs)
• classes/instances/unzer-direct-debit.php (modified) (1 diff)
• classes/instances/unzer-direct-invoice.php (modified) (2 diffs)
• wc-unzer-direct.php (modified) (2 diffs)

wc-unzer-direct/trunk/README.txt

@@ -32 +32 @@
 
 == Changelog ==
+= 1.4.4 =
+* Fix: Disable Unzer Denit Invoice if country is not CH as well.
+* Feat: Hide Unzer specific gateways if "Ship to different address" is enabled since the addresses must match.
+
 = 1.4.3 =
 * Fix: Remove VISA Electron card logo

wc-unzer-direct/trunk/classes/instances/instance.php

@@ -54 +54 @@
             'section' => 'unzer_direct'
         ];
-        $html = sprintf( "<p><small>Version: %s</small>", WC_UNZER_DIRECT_VERSION );
-        $html .= "<p>" . sprintf( __( 'Allows you to receive payments via %s', 'wc-unzer-direct' ), $this->method_title ) . "</p>";
-        $html .= "<p>" . sprintf( __( 'This module has it\'s main configuration inside the \'Unzer Direct\' tab.', 'wc-unzer-direct' ), 's' ) . "</p>";
-        $html .= "<p>" . sprintf( __( 'Click <a href="%s">here</a> to access the main configuration.', 'wc-unzer-direct' ), add_query_arg( $main_settings_args, admin_url( 'admin.php' ) ) ) . "</p>";
+        $html               = sprintf( "<p><small>Version: %s</small>", WC_UNZER_DIRECT_VERSION );
+        $html               .= "<p>" . sprintf( __( 'Allows you to receive payments via %s', 'wc-unzer-direct' ), $this->method_title ) . "</p>";
+        $html               .= "<p>" . sprintf( __( 'This module has it\'s main configuration inside the \'Unzer Direct\' tab.', 'wc-unzer-direct' ), 's' ) . "</p>";
+        $html               .= "<p>" . sprintf( __( 'Click <a href="%s">here</a> to access the main configuration.', 'wc-unzer-direct' ), add_query_arg( $main_settings_args, admin_url( 'admin.php' ) ) ) . "</p>";
 
         $html .= get_parent_class( get_parent_class( get_parent_class( $this ) ) )::generate_settings_html( $form_fields, $echo );
@@ -115 +115 @@
         return str_replace( 'Unzer Direct - ', '', $this->method_title );
     }
+
+    /**
+     * @return bool
+     */
+    protected function is_checkout_different_shipping_address_enabled() {
+        parse_str( wc()->checkout()->get_value( 'post_data' ), $data );
+
+        return isset( $data['ship_to_different_address'] ) && wc_string_to_bool( $data['ship_to_different_address'] );
+    }
 }

wc-unzer-direct/trunk/classes/instances/unzer-direct-debit.php

@@ -96 +96 @@
             $country    = strtoupper( WC()->checkout()->get_value( 'billing_country' ) );
 
-            if ( ! ( $cart_total >= $cart_min && $cart_total <= $cart_max ) || ( 'EUR' !== $currency && 'CHF' !== $currency ) || ( 'DE' !== $country && 'AT' !== $country ) ) {
+            if ( ! ( $cart_total >= $cart_min && $cart_total <= $cart_max ) || ( 'EUR' !== $currency && 'CHF' !== $currency ) || ( 'DE' !== $country && 'AT' !== $country ) || $this->is_checkout_different_shipping_address_enabled() ) {
                 unset( $gateways[ $this->id ] );
             }

wc-unzer-direct/trunk/classes/instances/unzer-direct-invoice.php

@@ -79 +79 @@
     public function filter_icon( $icon ) {
         if ( 'invoice' === $icon ) {
-            $icon     = 'unzer';
+            $icon = 'unzer';
         }
+
         return $icon;
     }
@@ -89 +90 @@
     public function maybe_disable_gateway( $gateways ) {
         if ( isset( $gateways[ $this->id ] ) && is_checkout() && ( $cart = WC()->cart ) ) {
-            $cart_total = (float) $cart->get_total( 'edit' );
-            $cart_min   = 10;
-            $cart_max   = 3500;
-            $currency   = strtoupper( get_woocommerce_currency() );
+            $cart_total  = (float) $cart->get_total( 'edit' );
+            $cart_min    = 10;
+            $cart_max    = 3500;
+            $currency    = strtoupper( get_woocommerce_currency() );
+            $country     = strtoupper( WC()->checkout()->get_value( 'billing_country' ) );
 
-            if ( ! ( $cart_total >= $cart_min && $cart_total <= $cart_max ) || ( 'EUR' !== $currency && 'CHF' !== $currency ) ) {
+            if ( ! ( $cart_total >= $cart_min && $cart_total <= $cart_max ) || ( 'EUR' !== $currency && 'CHF' !== $currency ) || ( 'DE' !== $country && 'AT' !== $country && 'CH' !== $country ) || $this->is_checkout_different_shipping_address_enabled() ) {
                 unset( $gateways[ $this->id ] );
             }

wc-unzer-direct/trunk/wc-unzer-direct.php

@@ -4 +4 @@
  * Plugin URI: http://wordpress.org/plugins/wc-unzer-direct/
  * Description: Integrate Unzer Direct payment gateway with WooCommerce
- * Version: 1.4.3
+ * Version: 1.4.4
  * Author: Unzer
  * Text Domain: wc-unzer-direct
@@ -17 +17 @@
 }
 
-define( 'WC_UNZER_DIRECT_VERSION', '1.4.3' );
+define( 'WC_UNZER_DIRECT_VERSION', '1.4.4' );
 define( 'WC_UNZER_DIRECT_URL', plugins_url( __FILE__ ) );
 define( 'WC_UNZER_DIRECT_PATH', plugin_dir_path( __FILE__ ) );