Plugin Directory

Changeset 3297131


Ignore:
Timestamp:
05/20/2025 09:00:53 AM (11 months ago)
Author:
expedico
Message:

Improved address parsing

Location:
expedico
Files:
20 added
4 edited

Legend:

Unmodified
Added
Removed
  • expedico/trunk/ExpedicoAPI.php

    r3265668 r3297131  
    1616    public function createParcel(\WC_Order $order): bool
    1717    {
    18         $streetAndNumber = $this->parseStreetAndNumber($order->get_shipping_address_1() ?: $order->get_billing_address_1());
     18        //$streetAndNumber = $this->parseStreetAndNumber($order->get_shipping_address_1() ?: $order->get_billing_address_1());
     19        $rawStreet = $order->get_shipping_address_1() ?: $order->get_billing_address_1();
     20        $streetAndNumber = $this->parseStreetAndNumber($rawStreet);
     21
     22        // Fallbacks
     23        $street = $streetAndNumber['street'] ?? $rawStreet;
     24        $streetNumber = $streetAndNumber['number'] ?? '';
     25        $apartment = $order->get_shipping_address_2() ?: $order->get_billing_address_2();
     26
     27
    1928        $data = [
    2029//          "carrier" => "{carrier_sys}",
     
    2635                'firstname'     => $order->get_shipping_first_name() ?: $order->get_billing_first_name(),
    2736                'lastname'      => $order->get_shipping_last_name() ?: $order->get_billing_last_name(),
    28                 'street'        => $streetAndNumber['street'],
    29                 'streetNumber'  => $streetAndNumber['number'],
     37                'street'        => $street,
     38                'streetNumber'  => trim($streetNumber . ' ' . $apartment),
    3039                'city'          => $order->get_shipping_city() ?: $order->get_billing_city(),
    3140                'zipCode'       => $order->get_shipping_postcode() ?: $order->get_billing_postcode(),
  • expedico/trunk/expedico.php

    r3265668 r3297131  
    1212 * Plugin Name:         Expedico
    1313 * Description:         Single point for your ecommerce parcel delivery, returns handling and fulfillment service mainly in Eastern Europe.
    14  * Version:             2.0.4
     14 * Version:             2.0.5
    1515 * Author:              Expedico
    1616 * Author URI:          https://expedico.eu
  • expedico/trunk/readme.txt

    r3265668 r3297131  
    44WC tested up to: 9.7.1
    55Tested up to: 6.7.2
    6 Stable tag: 2.0.4
     6Stable tag: 2.0.5
    77Requires PHP: 7.4
    88License: GPLv2
Note: See TracChangeset for help on using the changeset viewer.