Changeset 3718397

Timestamp:

09/29/2026 06:45:58 AM (4 weeks ago)

Author:

matejpodstrelenec

Message:

2.0.1

Location:

slovenska-posta-epodaci-harok

Files:

• tags/2.0.1 (added)
• tags/2.0.1/css (added)
• tags/2.0.1/css/spirit-eph.css (added)
• tags/2.0.1/export (added)
• tags/2.0.1/includes (added)
• tags/2.0.1/includes/Posta_ShippingClass.php (added)
• tags/2.0.1/includes/admin.php (added)
• tags/2.0.1/includes/balikobox.php (added)
• tags/2.0.1/includes/bonus.php (added)
• tags/2.0.1/includes/export.php (added)
• tags/2.0.1/includes/functions.php (added)
• tags/2.0.1/includes/pickup-widget.php (added)
• tags/2.0.1/includes/podacie_cisla.php (added)
• tags/2.0.1/includes/posta_api.php (added)
• tags/2.0.1/includes/settings.php (added)
• tags/2.0.1/includes/woo-metabox.php (added)
• tags/2.0.1/includes/woo-order-email.php (added)
• tags/2.0.1/includes/woo-table.php (added)
• tags/2.0.1/js (added)
• tags/2.0.1/js/spirit-eph-admin.js (added)
• tags/2.0.1/js/tsseph-pickup-widget.js (added)
• tags/2.0.1/languages (added)
• tags/2.0.1/languages/spirit-eph.pot (added)
• tags/2.0.1/readme.txt (added)
• tags/2.0.1/slovenska-posta-epodaci-harok.php (added)
• tags/2.0.1/src (added)
• tags/2.0.1/src/ajax-loader.gif (added)
• tags/2.0.1/src/bonus.json (added)
• tags/2.0.1/src/ePodaci-harok.png (added)
• tags/2.0.1/templates (added)
• tags/2.0.1/templates/settings-page.php (added)
• tags/2.0.1/uninstall.php (added)
• trunk/includes/Posta_ShippingClass.php (modified) (2 diffs)
• trunk/includes/pickup-widget.php (modified) (2 diffs)
• trunk/js/tsseph-pickup-widget.js (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/slovenska-posta-epodaci-harok.php (modified) (2 diffs)

slovenska-posta-epodaci-harok/trunk/includes/Posta_ShippingClass.php

@@ -77 +77 @@
                             'type' => 'number',
                             'custom_attributes' => array( 'step' => 'any', 'min' => '0' ),
-                            'description' => __( 'Doprava zdarma od sumy.', 'spirit-eph' ),
+                            'description' => __( 'Doprava zdarma od sumy. Ak pole necháte prázdne, doprava zdarma je vypnutá.', 'spirit-eph' ),
                             'default' => 50
+                        ),
+                        'free_shipping_label' => array(
+                            'title' => __( 'Text pri doprave zdarma', 'spirit-eph' ),
+                            'type' => 'text',
+                            'description' => __( 'Text zobrazený za názvom dopravy, ak je doprava zdarma (napr. "Slovenská pošta - doprava zadarmo"). Ak pole necháte prázdne, text sa nezobrazí.', 'spirit-eph' ),
+                            'default' => __( 'doprava zadarmo', 'spirit-eph' )
                         )
 
@@ -95 +101 @@
                     
                     // We will add the cost, rate and logics in here
-                    $cost = (double) $this->get_option( 'standard_cost' );
-                    $free_shipping = (double) $this->get_option( 'free_shipping' );
+                    $cost = (float) $this->get_option( 'standard_cost' );
+                    $free_shipping = $this->get_option( 'free_shipping' );
 
-                    //If total higher than 20, activate free shipping
-                    if ($free_shipping <= $package['cart_subtotal']) {
+                    // Empty threshold means free shipping is disabled
+                    if ( $free_shipping !== '' && (float) $free_shipping <= $package['cart_subtotal'] ) {
                         $cost = 0.00;
+                    }
+
+                    $label = $this->title;
+                    $free_shipping_label = trim( $this->get_option( 'free_shipping_label' ) );
+
+                    if ( $cost <= 0 && $free_shipping_label !== '' ) {
+                        $label .= ' - ' . $free_shipping_label;
                     }
 
                     $rate = array(
                         'id' => $this->id,
-                        'label' => $this->title,
+                        'label' => $label,
                         'cost' => $cost
                     );

slovenska-posta-epodaci-harok/trunk/includes/pickup-widget.php

@@ -35 +35 @@
                 ),
         ) );
+}
+
+/*
+ * Resolve the pickup widget shipmentType ('b', 'ex', 'zb') from the default parcel
+ * type configured for the chosen Pošta shipping instance, so the widget only lists
+ * points that accept that parcel type.
+ */
+function tsseph_get_pickup_shipment_type() {
+        $shipment_types = array( 'b' => 'b', 'ek' => 'ex', 'zb' => 'zb' );
+
+        if ( ! WC()->session || ! WC()->shipping() ) return 'b';
+
+        $chosen   = WC()->session->get( 'chosen_shipping_methods', array() );
+        $packages = WC()->shipping()->get_packages();
+
+        foreach ( $chosen as $package_key => $rate_id ) {
+                if ( strpos( $rate_id, 'tssph_sk_posta' ) !== 0 ) continue;
+                if ( empty( $packages[ $package_key ]['rates'][ $rate_id ] ) ) continue;
+
+                $instance_id = $packages[ $package_key ]['rates'][ $rate_id ]->get_instance_id();
+                $eph_method  = tsseph_resolve_eph_method( $instance_id, 'tssph_sk_posta', get_option( 'tsseph_options' ) );
+                $druh        = tsseph_posta_api_get_druh_zasielky( tsseph_get_druh_zasielky( $eph_method ) );
+
+                return isset( $shipment_types[ $druh['code'] ] ) ? $shipment_types[ $druh['code'] ] : 'b';
+        }
+
+        return 'b';
 }
 
@@ -57 +84 @@
                 <th><?php esc_html_e( 'Odberné miesto', 'spirit-eph' ); ?></th>
                 <td>
-                        <button type="button" id="tsseph-pickup-btn" class="button wp-element-button">
+                        <button type="button" id="tsseph-pickup-btn" class="button wp-element-button" data-shipment-type="<?php echo esc_attr( tsseph_get_pickup_shipment_type() ); ?>">
                                 <?php echo esc_html( $btn_label ); ?>
                         </button>

slovenska-posta-epodaci-harok/trunk/js/tsseph-pickup-widget.js

@@ -48 +48 @@
                         $( '#tsseph-pickup-label' ).html( address );
                         $( '#tsseph-pickup-btn' ).text( tsseph_pickup.i18n.change_point );
-                        $( '.tsseph-pickup-address-row' ).show();
+                        // Keep the selection in session, but only show the address while Pošta is the chosen method
+                        $( '.tsseph-pickup-address-row' ).toggle( isPostaSelected() );
                 } else {
                         $( '#tsseph-pickup-label' ).html( '' );
@@ -107 +108 @@
                 slposta.PickupWidget.open( {
                         branchKinds:  [ 'office', 'bbox', 'point' ],
-                        shipmentType: 'b',
+                        shipmentType: $( '#tsseph-pickup-btn' ).data( 'shipment-type' ) || 'b',
                         callback: function ( pickupPoint ) {
                                 // Widget closed without selecting

slovenska-posta-epodaci-harok/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 7.0
 Requires PHP: 5.2.4
-Stable tag: 2.0.0
+Stable tag: 2.0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -56 +56 @@
  
 == Changelog ==
+
+= 2.0.1 =
+* BalíkoBOX: adresa odberného miesta sa skryje pri zmene na iný spôsob dopravy
+* Text "doprava zadarmo" za názvom dopravy Slovenská pošta (nastaviteľný v shipping zóne)
+* Prázdne pole "Doprava zdarma" vypína dopravu zdarma
+* Widget odberných miest zohľadňuje nastavený druh zásielky (Balík / Expres kuriér / Zmluvný balík)
 
 = 2.0.0 =

slovenska-posta-epodaci-harok/trunk/slovenska-posta-epodaci-harok.php

@@ -4 +4 @@
 Plugin URI:  https://www.matejpodstrelenec.sk
 Description: Plugin pre generovanie podacieho hárku určeného na import do webovej aplikácie slovenskej pošty. 
-Version:     2.0.0
+Version:     2.0.1
 Author: Matej Podstrelenec
 Author URI: https://www.matejpodstrelenec.sk/en/
@@ -32 +32 @@
 
 define('SPIRIT_EPH_PLUGIN_PATH', plugin_dir_path( __FILE__));
-define('SPIRIT_EPH_VERSION', '2.0.0' );
+define('SPIRIT_EPH_VERSION', '2.0.1' );
 
 include (SPIRIT_EPH_PLUGIN_PATH . "includes/functions.php");