Plugin Directory

Changeset 3376737


Ignore:
Timestamp:
10/11/2025 04:41:12 PM (6 months ago)
Author:
hippooo
Message:

1.1.5

Location:
hippoo-shippo-integration-for-woocommerce/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • hippoo-shippo-integration-for-woocommerce/trunk/hippoo-shippo.php

    r3372485 r3376737  
    55Description: Hippoo Shippo Integration connects Shippo with the WooCommerce Admin app, allowing you to generate carrier shipping labels directly from your dashboard. Get real-time shipping rates at checkout and support for shipments. Designed by the Hippoo team to streamline your shipping process.
    66Short Description: Generate Shippo carrier labels inside WooCommerce Admin with real-time shipping rates at checkout.
    7 Version: 1.1.3
     7Version: 1.1.5
    88Author: Hippoo Team
    99License: GPLv2 or later
     
    2626}
    2727
    28 define( 'hippshipp_version', '1.1.3' );
     28define( 'hippshipp_version', '1.1.4' );
    2929define( 'hippshipp__FILE__', __FILE__ );
    3030define( 'hippshipp_path', plugin_dir_path( __FILE__ ) );
  • hippoo-shippo-integration-for-woocommerce/trunk/inc/helper.php

    r3359066 r3376737  
    110110            );
    111111        } else {
    112                 return array(
    113                     'name'    => "{$meta['billing_first_name']} {$meta['billing_last_name']}",
    114                     'company' => ( empty( $meta['billing_company'] ) ? '' : $meta['billing_company'] ),
    115                     'street1' => "{$meta['billing_address_1']} {$meta['billing_address_1']}",
    116                     'city'    => ( empty( $meta['billing_city'] ) ? '' : $meta['billing_city'] ),
    117                     'state'   => ( empty( $meta['billing_state'] ) ? '' : $meta['billing_state'] ),
    118                     'zip'     => ( empty( $meta['billing_postcode'] ) ? '' : $meta['billing_postcode'] ),
    119                     'country' => ( empty( $meta['billing_country'] ) ? '' : $meta['billing_country'] ),
    120                     'phone'   => ( empty( $meta['billing_phone'] ) ? '' : $meta['billing_phone'] ),
    121                     'email'   => ( empty( $meta['billing_email'] ) ? '' : $meta['billing_email'] ),
    122                 );
     112            return array(
     113                'name'    => "{$meta['billing_first_name']} {$meta['billing_last_name']}",
     114                'company' => ( empty( $meta['billing_company'] ) ? '' : $meta['billing_company'] ),
     115                'street1' => "{$meta['billing_address_1']} {$meta['billing_address_1']}",
     116                'city'    => ( empty( $meta['billing_city'] ) ? '' : $meta['billing_city'] ),
     117                'state'   => ( empty( $meta['billing_state'] ) ? '' : $meta['billing_state'] ),
     118                'zip'     => ( empty( $meta['billing_postcode'] ) ? '' : $meta['billing_postcode'] ),
     119                'country' => ( empty( $meta['billing_country'] ) ? '' : $meta['billing_country'] ),
     120                'phone'   => ( empty( $meta['billing_phone'] ) ? '' : $meta['billing_phone'] ),
     121                'email'   => ( empty( $meta['billing_email'] ) ? '' : $meta['billing_email'] ),
     122            );
    123123        }
    124124    }
  • hippoo-shippo-integration-for-woocommerce/trunk/inc/shippo-modal.php

    r3357076 r3376737  
    2323    $currency = get_option( 'woocommerce_currency' );
    2424
    25     if ( ! empty( $shipp ) ) {
    26         if ( count( $shipp ) > 1 ) {
    27             $address = $shipp[1];
    28         }
     25    if ( ! empty( $shipp ) && count( $shipp ) > 1 ) {
     26        $address = $shipp[1];
     27    } else {
     28        $order_data = $order->get_data();
     29        $meta = array(
     30            'ship_to_different_address' => ! empty( $order_data['shipping']['address_1'] ) && $order_data['shipping']['address_1'] !== $order_data['billing']['address_1'],
     31            'shipping_first_name' => $order_data['shipping']['first_name'] ?: $order_data['billing']['first_name'],
     32            'shipping_last_name' => $order_data['shipping']['last_name'] ?: $order_data['billing']['last_name'],
     33            'shipping_company' => $order_data['shipping']['company'] ?: $order_data['billing']['company'],
     34            'shipping_address_1' => $order_data['shipping']['address_1'] ?: $order_data['billing']['address_1'],
     35            'shipping_address_2' => $order_data['shipping']['address_2'] ?: $order_data['billing']['address_2'],
     36            'shipping_city' => $order_data['shipping']['city'] ?: $order_data['billing']['city'],
     37            'shipping_state' => $order_data['shipping']['state'] ?: $order_data['billing']['state'],
     38            'shipping_postcode' => $order_data['shipping']['postcode'] ?: $order_data['billing']['postcode'],
     39            'shipping_country' => $order_data['shipping']['country'] ?: $order_data['billing']['country'],
     40            'billing_phone' => $order_data['billing']['phone'],
     41            'billing_email' => $order_data['billing']['email'],
     42            'billing_first_name' => $order_data['billing']['first_name'],
     43            'billing_last_name' => $order_data['billing']['last_name'],
     44            'billing_company' => $order_data['billing']['company'],
     45            'billing_address_1' => $order_data['billing']['address_1'],
     46            'billing_address_2' => $order_data['billing']['address_2'],
     47            'billing_city' => $order_data['billing']['city'],
     48            'billing_state' => $order_data['billing']['state'],
     49            'billing_postcode' => $order_data['billing']['postcode'],
     50            'billing_country' => $order_data['billing']['country'],
     51        );
     52        $address = hippshipp_helper::get_live_rate_param( $meta );
    2953    }
    3054
  • hippoo-shippo-integration-for-woocommerce/trunk/readme.txt

    r3372485 r3376737  
    66Tested up to: 6.7
    77Requires PHP: 7.4
    8 Stable tag: 1.1.2
     8Stable tag: 1.1.5
    99License: GPLv2 or later
    1010License URI: https://www.gnu.org/licenses/gpl-2.0.html
     
    9494
    9595== Changelog ==
     96
     97= 1.1.5 =
     98
     99* Minor Improvements
     100
     101= 1.1.4 =
     102
     103* Order customer address bug fix
     104
    96105= 1.1.3 =
    97106
Note: See TracChangeset for help on using the changeset viewer.