WordPress.org
Get WordPress

Plugin Directory

Changeset 2651255


Ignore:
Timestamp:
12/31/2021 03:14:37 AM (4 years ago)
Author:
delyva
Message:

v1.1.25

Location:
delyvax/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • delyvax/trunk/changelog.txt

    r2583247 r2651255  
    55This file contains older changelog entries, so we can keep the size of the standard WordPress readme.txt file reasonable.
    66For the latest changes, please see the "Changelog" section of the [readme.txt file](https://plugins.svn.wordpress.org/delyvax/trunk/readme.txt).
     7
     8= 1.1.21 =
     9*Release Date - 8 Nov 2021*
     10
     11* Option for Multi-vendor Dokan and WCFM. After updates, Dokan and WCFM users need to set 'Multi-vendor system' to Dokan or WCFM in the plugin setting.
     12
     13= 1.1.20 =
     14*Release Date - 7 Oct 2021*
     15
     16* Fixed hidden print label button and service name.
     17
     18= 1.1.19 =
     19*Release Date - 7 Sep 2021*
     20
     21* Remove min product weight validation.
     22
     23= 1.1.18 =
     24*Release Date - 29 Aug 2021*
     25
     26* Add supports for multisite.
     27
     28= 1.1.17 =
     29*Release Date - 27 Aug 2021*
     30
     31* Fix tracking not update for delivery order fulfilled in customer web app.
     32
     33= 1.1.16 =
     34*Release Date - 26 Aug 2021*
     35
     36* Added processing time for auto schedule delivery order creation next X day(s) at YY time.
     37
     38= 1.1.15 =
     39*Release Date - 18 Aug 2021*
     40
     41* Product variant handling.
     42
     43= 1.1.14 =
     44*Release Date - 16 Aug 2021*
     45
     46* Bug fixes for order from WCFM vendor information.
     47
     48= 1.1.13 =
     49*Release Date - 08 Aug 2021*
     50
     51* Bug fixes for webhook delivery order status updates with tracking no
     52
     53= 1.1.12 =
     54*Release Date - 27 Jul 2021*
     55
     56* Bug fixes for vendor address multi-vendor Dokan and WCFM. Currently only supports 1 order 1 vendor.
     57
     58= 1.1.11 =
     59*Release Date - 18 June 2021*
     60
     61* Source of referral to identify delivery orders comes from woocommerce or web design agency
    762
    863= 1.1.10 =

  • delyvax/trunk/delyvax.php

    r2648895 r2651255  
    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.23
     6    Version: 1.1.25
    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.23');
     15    define('DELYVAX_PLUGIN_VERSION', '1.1.25');
    1616
    1717    require_once plugin_dir_path(__FILE__) . 'functions.php';

  • delyvax/trunk/functions.php

    r2648895 r2651255  
    600600                      ),
    601601                      "weight" => array(
    602                           "value" => ($product_weight),
    603                           "unit" => "kg"
     602                          "value" => (delyvaX_weight_to_kg($product_weight)),
     603                          "unit" => 'kg'
    604604                      ),
    605605                      "quantity" => $quantity,
    … …  
    743743                  ),
    744744                  "weight" => array(
    745                       "value" => ($product_weight),
    746                       "unit" => "kg"
     745                      "value" => (delyvaX_weight_to_kg($product_weight)),
     746                      "unit" => 'kg'
    747747                  ),
    748748                  "quantity" => $quantity,
    … …  
    838838
    839839      //calculate volumetric weight
    840       $total_actual_weight = $total_weight;
     840      $total_actual_weight = delyvaX_weight_to_kg($total_weight);
    841841
    842842      if($total_dimension > 0)
    … …  
    872872
    873873      $weight = array(
    874         "unit" => "kg",
    875         "value" => $total_weight
     874        "value" => $total_weight,
     875        "unit" => 'kg'
    876876      );
    877877
    … …  
    10061006
    10071007      return $resultCreate = DelyvaX_Shipping_API::postProcessOrder($shipmentId, $serviceCode);
     1008}
     1009
     1010function delyvaX_weight_to_kg($weight)
     1011{
     1012    $weight_unit = get_option('woocommerce_weight_unit');
     1013    // convert other unit into kg
     1014    if ($weight_unit != 'kg') {
     1015        if ($weight_unit == 'g') {
     1016            return $weight * 0.001;
     1017        } else if ($weight_unit == 'lbs') {
     1018            return $weight * 0.453592;
     1019        } else if ($weight_unit == 'oz') {
     1020            return $weight * 0.0283495;
     1021        }
     1022    }
     1023    // already kg
     1024    return $weight;
    10081025}
    10091026

  • delyvax/trunk/includes/delyvax-shipping.php

    r2633255 r2651255  
    315315            $multivendor_option = $settings['multivendor'];
    316316
     317            $weight_unit = get_option('woocommerce_weight_unit');
     318
    317319            $pdestination = $package["destination"];
    318320            $items = array();
    … …  
    383385                    );
    384386
    385                     $total_weight = $total_weight + $this->weightToKg($product->get_weight());
     387                    $total_weight = $total_weight + $product->get_weight();
    386388
    387389                    $total_dimension = $total_dimension + ($this->defaultDimension($this->dimensionToCm($product->get_width()))
    … …  
    503505
    504506            //calculate volumetric weight
    505             $total_actual_weight = $total_weight;
     507            $total_actual_weight = $this->weightToKg($total_weight);
    506508
    507509            if($total_dimension > 0)
    … …  
    538540            //
    539541            $weight = array(
    540               "unit" => "kg",
    541               "value" => $total_weight
     542              "value" => $total_weight,
     543              "unit" => 'kg'
    542544            );
    543545
    … …  
    617619        }
    618620
    619       protected function weightToKg($weight)
     621        protected function weightToKg($weight)
    620622        {
    621623            $weight_unit = get_option('woocommerce_weight_unit');

  • delyvax/trunk/readme.txt

    r2648895 r2651255  
    44Requires at least: 5.4
    55Tested up to: 5.7
    6 Stable tag: 1.1.23
     6Stable tag: 1.1.25
    77Requires PHP: 7.2
    88License: GPLv3
    … …  
    3232== Changelog ==
    3333
     34= 1.1.25 =
     35*Release Date - 29 Dec 2021*
     36
     37* Fixed weight and dimension unit. Default to kg.
     38
     39= 1.1.24 =
     40*Release Date - 27 Dec 2021*
     41
     42* Fixed weight and dimension unit.
     43
    3444= 1.1.23 =
    3545*Release Date - 24 Dec 2021*
    … …  
    4252* Fixed Dokan vendor's email address for delivery order creation.
    4353
    44 = 1.1.21 =
    45 *Release Date - 8 Nov 2021*
    46 
    47 * Option for Multi-vendor Dokan and WCFM. After updates, Dokan and WCFM users need to set 'Multi-vendor system' to Dokan or WCFM in the plugin setting.
    48 
    49 = 1.1.20 =
    50 *Release Date - 7 Oct 2021*
    51 
    52 * Fixed hidden print label button and service name.
    53 
    54 = 1.1.19 =
    55 *Release Date - 7 Sep 2021*
    56 
    57 * Remove min product weight validation.
    58 
    59 = 1.1.18 =
    60 *Release Date - 29 Aug 2021*
    61 
    62 * Add supports for multisite.
    63 
    64 = 1.1.17 =
    65 *Release Date - 27 Aug 2021*
    66 
    67 * Fix tracking not update for delivery order fulfilled in customer web app.
    68 
    69 = 1.1.16 =
    70 *Release Date - 26 Aug 2021*
    71 
    72 * Added processing time for auto schedule delivery order creation next X day(s) at YY time.
    73 
    74 = 1.1.15 =
    75 *Release Date - 18 Aug 2021*
    76 
    77 * Product variant handling.
    78 
    79 = 1.1.14 =
    80 *Release Date - 16 Aug 2021*
    81 
    82 * Bug fixes for order from WCFM vendor information.
    83 
    84 = 1.1.13 =
    85 *Release Date - 08 Aug 2021*
    86 
    87 * Bug fixes for webhook delivery order status updates with tracking no
    88 
    89 = 1.1.12 =
    90 *Release Date - 27 Jul 2021*
    91 
    92 * Bug fixes for vendor address multi-vendor Dokan and WCFM. Currently only supports 1 order 1 vendor.
    93 
    94 = 1.1.11 =
    95 *Release Date - 18 June 2021*
    96 
    97 * Source of referral to identify delivery orders comes from woocommerce or web design agency
    98 
    9954For older changelog entries, please see the [additional changelog.txt file](https://plugins.svn.wordpress.org/delyvax/trunk/changelog.txt) delivered with the plugin.
Note: See TracChangeset for help on using the changeset viewer.