Changeset 3415749

Timestamp:

12/09/2025 07:38:24 PM (2 months ago)

Author:

shipo

Message:

Checkout improvments

Location:

shipo/trunk

Files:

• assets/js/checkout.js (modified) (8 diffs)
• includes/class-shipo-checkout.php (modified) (3 diffs)
• includes/class-shipo-wc-shipping.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• shipo.php (modified) (2 diffs)

shipo/trunk/assets/js/checkout.js

@@ -6 +6 @@
         var cityValue = $(this).val();
         var elementId = $(this).attr('id');
+        var prefix = elementId.split('_')[0] + '_' + elementId.split('_')[1];
+
+        $('#' + elementId + '_id').val('');
+        $('#' + prefix + '_street').val('');
+        $('#' + prefix + '_street_id').val('');
+        $('#' + prefix + '_street_suggestions').html('');
+        $('#' + elementId.split('_')[0] + '_postcode').val('');
 
         clearMapElements();
@@ -37 +44 @@
                                     label: suggestionsResponse[key]['name'],
                                     value: suggestionsResponse[key]['name'],
-                                    coord: suggestionsResponse[key]['coord']
+                                    coord: suggestionsResponse[key]['coord'],
+                                    zipcode: suggestionsResponse[key]['zipcode']
                                 });
                             });
@@ -44 +52 @@
                         if (suggestions.length > 0 && suggestions[0].coord) {
                             suggestions.forEach(function(suggestion) {
-                                $('#' + elementId + '_suggestions ul').append('<li data-coord="' + suggestion.coord['lat'] + ',' + suggestion.coord['lng'] + '" data-city-id="' + suggestion.id + '">' + suggestion.value + '</li>');
+                                $('#' + elementId + '_suggestions ul').append('<li data-coord="' + suggestion.coord['lat'] + ',' + suggestion.coord['lng'] + '" data-city-id="' + suggestion.id + '" data-zipcode="' + suggestion.zipcode + '">' + suggestion.value + '</li>');
                             });
                         } else {
@@ -50 +58 @@
                         }
                     } else {
-                        console.log(response.data.message);
                         $('#' + elementId + '_suggestion ul').append('<li>' + response.data.message + '</li>');
                     }
@@ -88 +95 @@
         var prefix = elementId.split('_')[0] + '_' + elementId.split('_')[1];
 
+        $('#' + prefix + '_street').val('');
+        $('#' + prefix + '_street_id').val('');
+        $('#' + prefix + '_street_suggestions').html('');
+
         var selectedAddress = $(this).text();
         var coordAddress = $(this).data('coord');
         var cityId = $(this).data('city-id');
+        var zipcode = $(this).data('zipcode');
         var cityName = $(this).text();
         $('#' + prefix + '_city').val(selectedAddress);
@@ -96 +108 @@
         $('input[name="' + prefix + '_coord"]').val(coordAddress);
         $('input[name="' + prefix + '_city_id"]').val(cityId);
-        $('input[name="' + prefix + '_postcode"]').val('');
-        $('input[name="' + elementId.split('_')[0] + '_postcode"]').val('');
+        $('input[name="' + prefix + '_postcode"]').val(zipcode);
+        $('input[name="' + elementId.split('_')[0] + '_postcode"]').val(zipcode);
 
         toggleViewSector(prefix, cityName);
@@ -131 +143 @@
         var newElementId = elementIdParts.join('_');
         var cityValue = $('#' + newElementId + '_city').val();
+
+        $('#' + elementId + '_id').val('');
+        $('#' + elementIdParts[0] + '_postcode').val('');
 
         if (streetValue.length >= 3) {
@@ -193 +208 @@
         $('input[name="' + prefix + '_street_id"]').val(streetId);
 
-        $(document.body).trigger('update_checkout');
+        // $(document.body).trigger('update_checkout');
     });
 

shipo/trunk/includes/class-shipo-checkout.php

@@ -484 +484 @@
         
         if (empty($_POST['billing_shipo_street'])) {
-            wc_add_notice(__('Seletează o stradă validă din.', 'shipo'), 'error');
+            wc_add_notice(__('Selecteaza strada.', 'shipo'), 'error');
         }
 
@@ -496 +496 @@
         
         if (empty($_POST['shipping_shipo_street'])) {
-            wc_add_notice(__('Seletează o stradă validă din.', 'shipo'), 'error');
+            wc_add_notice(__('Selecteaza strada.', 'shipo'), 'error');
         }
 
@@ -611 +611 @@
         if (isset($_POST['ship_to_different_address']) && isset($_POST['shipping_shipo_city_id']) && empty($_POST['shipping_shipo_city_id'])) {
             wc_add_notice('<a href="#shipping_shipo_city">' . __('Selectează un oraș valid din listă', 'shipo') . '</a>', 'error');
-        }
-        
-        if (isset($_POST['billing_shipo_street_id']) && empty($_POST['billing_shipo_street_id'])) {
-            wc_add_notice('<a href="#billing_shipo_street">' . __('Selectează o stradă validă din listă.', 'shipo') . '</a>', 'error');
-        }
-
-        if (isset($_POST['ship_to_different_address']) && isset($_POST['shipping_shipo_street_id']) && empty($_POST['shipping_shipo_street_id'])) {
-            wc_add_notice('<a href="#shipping_shipo_street">' . __('Selectează o stradă validă din listă.', 'shipo') . '</a>', 'error');
         }
 

shipo/trunk/includes/class-shipo-wc-shipping.php

@@ -151 +151 @@
         // Try multiple sources for Shipo data
         $shipo_city = '';
-        $shipo_street = '';
         
         // 1. Try data from current session
         if(WC()->customer) {
             $shipo_city = WC()->customer->get_meta('shipping_shipo_city');
-            $shipo_street = WC()->customer->get_meta('shipping_shipo_street');
             
-            if(empty($shipo_city) && empty($shipo_street)) {
+            if(empty($shipo_city)) {
                 $shipo_city = WC()->customer->get_meta('billing_shipo_city');
-                $shipo_street = WC()->customer->get_meta('billing_shipo_street');
             }
         }
@@ -195 +192 @@
                 $shipo_city = sanitize_text_field(wp_unslash($_POST['shipping_shipo_city']));
             }
-            if(empty($shipo_street) && isset($_POST['shipping_shipo_street'])) {
-                $shipo_street = sanitize_text_field(wp_unslash($_POST['shipping_shipo_street']));
-            }
         }
         
@@ -204 +198 @@
             $shipo_city = $package['destination']['city'];
         }
-        if(empty($shipo_street) && isset($package['destination']['address_1'])) {
-            $shipo_street = $package['destination']['address_1'];
-        }
+        
         // 4. Try data from session
         if(empty($shipo_city) && WC()->session && WC()->session->get('shipo_city')) {
             $shipo_city = WC()->session->get('shipo_city');
         }
-        if(empty($shipo_street) && WC()->session && WC()->session->get('shipo_street')) {
-            $shipo_street = WC()->session->get('shipo_street');
-        }
+        
         if (!empty($shipo_city)) {
             $package['destination']['shipo_city'] = sanitize_text_field($shipo_city);
             $package['destination']['city'] = sanitize_text_field($shipo_city);
-        }
-        if (!empty($shipo_street)) {
-            $package['destination']['address'] = sanitize_text_field($shipo_street);
-            $package['destination']['shipo_address'] = sanitize_text_field($shipo_street);
-            $package['destination']['address_1'] = sanitize_text_field($shipo_street);
         }
 

shipo/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 6.9
-Stable tag: 1.3
+Stable tag: 1.4
 Requires PHP: 8.0
 License: GPLv2 or later
@@ -54 +54 @@
 
 Showing all lockers
+
+= 1.4 =
+
+Checkout page improvements:
+- Allows users to manually enter a street name in the free text field if the street is not found in the suggestions dropdown list

shipo/trunk/shipo.php

@@ -3 +3 @@
  * Plugin Name: Shipo
  * Description: Shipo connects your webshop with top couriers instantly, no contract. Ship to address or locker, pay only when parcels are delivered.
- * Version: 1.3
+ * Version: 1.4
  * Author: Shipo
  * Author URI: https://shipo.ro
@@ -16 +16 @@
 
 // Define plugin constants
-define('SHIPO_PLUGIN_VERSION', '1.3.0');
+define('SHIPO_PLUGIN_VERSION', '1.4.0');
 define('SHIPO_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('SHIPO_PLUGIN_URL', plugin_dir_url(__FILE__));