WordPress.org
Get WordPress

Plugin Directory

Changeset 2848883


Ignore:
Timestamp:
01/16/2023 05:57:36 AM (3 years ago)
Author:
delyva
Message:

v1.1.40

Location:
delyvax/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • delyvax/trunk/delyvax.php

    r2833369 r2848883  
    44    Plugin URI: https://delyva.com
    55    description: The official Delyva plugin helps store owners to integrate WooCommerce with [Delyva](https://delyva.com) for seamless service comparison and order processing.
    6     Version: 1.1.39
     6    Version: 1.1.40
    77    Author: Delyva
    88    Author URI: https://delyva.com
    … …  
    1313    defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
    1414    define('DELYVAX_API_ENDPOINT', 'https://api.delyva.app/');
    15     define('DELYVAX_PLUGIN_VERSION', '1.1.39');
     15    define('DELYVAX_PLUGIN_VERSION', '1.1.40');
    1616
    1717    require_once plugin_dir_path(__FILE__) . 'functions.php';

  • delyvax/trunk/functions.php

    r2825940 r2848883  
    679679      $destination_lon = $order->get_meta( 'shipping_lon' ) ? $order->get_meta( 'shipping_lon' ) : null;
    680680
    681       $destination = array(
    682           "scheduledAt" => $scheduledAt->format('c'), //"2019-11-15T12:00:00+0800",
    683           "inventory" => $inventories,
    684           "contact" => array(
    685               "name" => $order->get_shipping_first_name() ? $order->get_shipping_first_name().' '.$order->get_shipping_last_name() : $order->get_billing_first_name().' '.$order->get_billing_last_name(),
    686               "email" => $order->get_billing_email(),
    687               "phone" => $r_shipping_phone ? $r_shipping_phone : $order->get_billing_phone(),
    688               "mobile" => $r_shipping_phone ? $r_shipping_phone : $order->get_billing_phone(),
    689               "address1" => $order->get_shipping_address_1() ? $order->get_shipping_address_1() : $order->get_billing_address_1(),
    690               "address2" => $order->get_shipping_address_2() ? $order->get_shipping_address_2() : $order->get_billing_address_2(),
    691               "city" => $order->get_shipping_city() ? $order->get_shipping_city() : $order->get_billing_city(),
    692               "state" => $order->get_shipping_state() ? $order->get_shipping_state() : $order->get_billing_state(),
    693               "postcode" => $order->get_shipping_postcode() ? $order->get_shipping_postcode() : $order->get_billing_postcode(),
    694               "country" => $order->get_shipping_country() ? $order->get_shipping_country() : $order->get_billing_country(),
    695               // "coord" => array(
    696               //     "lat" => "",
    697               //     "lon" => ""
    698               // )
    699           ),
    700           // "note"=> $order_notes
    701       );
     681      if($order->get_shipping_address_1() || $order->get_shipping_address_2())
     682      {
     683          $destination = array(
     684              "scheduledAt" => $scheduledAt->format('c'), //"2019-11-15T12:00:00+0800",
     685              "inventory" => $inventories,
     686              "contact" => array(
     687                  "name" => $order->get_shipping_first_name().' '.$order->get_shipping_last_name(),
     688                  "email" => $order->get_billing_email(),
     689                  "phone" => $r_shipping_phone ? $r_shipping_phone : $order->get_billing_phone(),
     690                  "mobile" => $r_shipping_phone ? $r_shipping_phone : $order->get_billing_phone(),
     691                  "address1" => $order->get_shipping_address_1(),
     692                  "address2" => $order->get_shipping_address_2(),
     693                  "city" => $order->get_shipping_city(),
     694                  "state" => $order->get_shipping_state(),
     695                  "postcode" => $order->get_shipping_postcode(),
     696                  "country" => $order->get_shipping_country(),
     697                  // "coord" => array(
     698                  //     "lat" => "",
     699                  //     "lon" => ""
     700                  // )
     701              ),
     702              // "note"=> $order_notes
     703          );
     704      }else {
     705          $destination = array(
     706              "scheduledAt" => $scheduledAt->format('c'), //"2019-11-15T12:00:00+0800",
     707              "inventory" => $inventories,
     708              "contact" => array(
     709                  "name" => $order->get_billing_first_name().' '.$order->get_billing_last_name(),
     710                  "email" => $order->get_billing_email(),
     711                  "phone" => $order->get_billing_phone(),
     712                  "mobile" => $order->get_billing_phone(),
     713                  "address1" => $order->get_billing_address_1(),
     714                  "address2" => $order->get_billing_address_2(),
     715                  "city" => $order->get_billing_city(),
     716                  "state" => $order->get_billing_state(),
     717                  "postcode" => $order->get_billing_postcode(),
     718                  "country" => $order->get_billing_country(),
     719                  // "coord" => array(
     720                  //     "lat" => "",
     721                  //     "lon" => ""
     722                  // )
     723              ),
     724              // "note"=> $order_notes
     725          );
     726      }
    702727
    703728      if($destination_lat && $destination_lon)

  • delyvax/trunk/readme.txt

    r2833369 r2848883  
    3232
    3333== Changelog ==
     34
     35= 1.1.40 =
     36*Release Date - 16th January 2023*
     37
     38* Bug-fixes for shipping and billing address.
    3439
    3540= 1.1.39 =
Note: See TracChangeset for help on using the changeset viewer.