WordPress.org
Get WordPress

Plugin Directory

Changeset 3413292


Ignore:
Timestamp:
12/07/2025 01:35:23 AM (3 months ago)
Author:
rermis
Message:

v5.0.20 = * Variation meta improvements to queue and ship screen.

Location:
pb-shipping/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pb-shipping/trunk/pb_functions.php

    r3410295 r3413292  
    66Author: RLDD
    77Author URI: https://richardlerma.com/contact/
    8 Version: 5.0.19
     8Version: 5.0.20
    99Copyright: (c) 2020-2025 rldd.net - All Rights Reserved
    1010License: GPLv3 or later
    … …  
    1414*/
    1515
    16 global $espb_version; $espb_version='5.0.19';
     16global $espb_version; $espb_version='5.0.20';
    1717if(!defined('ABSPATH')) exit;
    1818
    … …  
    750750  $hpos=0;
    751751  $post_type=get_post_type($order_id);
     752  $weight_unit=get_option('woocommerce_weight_unit');
    752753  $product_lookup='wp_wc_order_product_lookup';
    753   if($post_type=='import_order') $product_lookup='wp_import_order_product_lookup';
    754   $weight_unit=get_option('woocommerce_weight_unit');
     754  $meta_subquery="(SELECT CONCAT('<div class=\'meta\'>',GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),':',m.meta_value) SEPARATOR ' | '),'</div>') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_item_id=po.order_item_id AND pl.variation_id=IFNULL(NULLIF(po.variation_id,0),po.product_id) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL)";
     755  if($post_type=='import_order') {
     756    $product_lookup='wp_import_order_product_lookup';
     757    $meta_subquery="(SELECT CONCAT('<div class=\'meta\'>',post_excerpt,'</div>') FROM wp_posts WHERE ID=NULLIF(po.variation_id,0))";
     758  }
    755759 
    756760  if($post_type='shop_order' && espb_is_hpos()>0)
    … …  
    792796      LEFT JOIN (
    793797        SELECT IFNULL(NULLIF(po.variation_id,0),po.product_id) product_id
    794         ,(SELECT CONCAT('<div class=\'meta\'>',GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),':',m.meta_value) SEPARATOR ' | '),'</div>') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_item_id=po.order_item_id AND pl.variation_id=IFNULL(NULLIF(po.variation_id,0),po.product_id) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL)meta
     798        ,$meta_subquery meta
    795799        ,IFNULL((SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.variation_id,0) AND meta_key='_weight'),(SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.product_id,0) AND meta_key='_weight'))weight
    796800        ,IFNULL((SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.variation_id,0) AND meta_key='_length'),(SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.product_id,0) AND meta_key='_length'))length
    … …  
    798802        ,IFNULL((SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.variation_id,0) AND meta_key='_height'),(SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.product_id,0) AND meta_key='_height'))height
    799803        FROM wp_wc_order_product_lookup po
    800         WHERE po.order_id=2985
     804        WHERE po.order_id=$order_id
    801805      )a ON a.product_id=IFNULL(NULLIF(po.variation_id,0),po.product_id)
    802806      LEFT JOIN wp_posts p ON p.ID=IFNULL(NULLIF(po.variation_id,0),po.product_id)
    … …  
    844848    LEFT JOIN (
    845849      SELECT IFNULL(NULLIF(po.variation_id,0),po.product_id) product_id
    846       ,(SELECT CONCAT('<div class=\'meta\'>',GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),':',m.meta_value) SEPARATOR ' | '),'</div>') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_item_id=po.order_item_id AND pl.variation_id=IFNULL(NULLIF(po.variation_id,0),po.product_id) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL)meta
     850      ,$meta_subquery meta
    847851      ,IFNULL((SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.variation_id,0) AND meta_key='_weight'),(SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.product_id,0) AND meta_key='_weight'))weight
    848852      ,IFNULL((SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.variation_id,0) AND meta_key='_length'),(SELECT NULLIF(NULLIF(meta_value,''),0) FROM wp_postmeta WHERE post_id=NULLIF(po.product_id,0) AND meta_key='_length'))length
    … …  
    15531557    .pb_rpt td a{border:1px solid #ddd;padding:.5em;border-radius:5px}
    15541558    .pb_rpt tr:hover td a{background:#fff;color:var(--bgd_hl_clr);border:1px solid #fff}
     1559    .woocommerce_page_pb-queue .pb_rpt tr:nth-child(even){background:#d2d0ce57}
    15551560    .pb_rpt td a.pb_remove{background:transparent!important;border:none!important;color:#ddd!important}
    15561561    .pb_rpt td a.pb_remove:hover{color:#fff!important;background:red!important}
    1557     .pb_rpt .prd{margin-bottom:1em}
    15581562    .prd .meta,.itm .meta{font-size:.9em;padding:.5em 0 0 1em}
    15591563    .module.slip .logo{display:block;margin:0 0 1em}
    … …  
    19691973          if($admin_rtn_updates>0 && ($rtn_sent==$current_time || $rtn_del==$current_time)) {
    19701974            $subject=$msg;
    1971             if(!empty($delivery_date)) $msg.=", estimated delivery: $delivery_date.";
     1975            if(!empty($delivery_date) && stripos($new_status,'Delivered')===false) $msg.=", estimated delivery: $delivery_date.";
    19721976            $body="Hi Shipper,<br><br>$msg<br><br>$carrier tracking number: <a href='$track_url' target='_blank'>$tracking_num</a><br><br>This is an automated notification related to order ID $order_id.";
    19731977            wp_mail($admin_email,$subject,$body,$headers); //$to,$subject,$body,$headers

  • pb-shipping/trunk/pb_queue.php

    r3410295 r3413292  
    9393          SELECT o.ID, o2.post_type
    9494          ,o.post_date
    95           ,REPLACE(CONCAT((SELECT DISTINCT post_title FROM wp_posts WHERE ID=op.product_id),'(',SUM(IFNULL(op.product_qty,ip.product_qty)),')'),'(1)','')item
     95          ,REPLACE(CONCAT((SELECT DISTINCT post_title FROM wp_posts WHERE ID=IFNULL(ip.product_id,op.product_id)),'(',SUM(IFNULL(op.product_qty,ip.product_qty)),')'),'(1)','')item
    9696          ,o2.reship
    9797          ,IFNULL((SELECT meta_value FROM wp_postmeta WHERE post_id=o.ID AND meta_key='shipping' LIMIT 1),(SELECT order_item_name FROM wp_woocommerce_order_items WHERE order_id=o.ID AND order_item_type='shipping' LIMIT 1))method
    9898          ,(SELECT NULLIF(m.meta_value,0) FROM wp_woocommerce_order_items oi JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=oi.order_item_id AND m.meta_key='cost' WHERE oi.order_id=o.ID AND oi.order_item_type='shipping' LIMIT 1)cost
    99           ,(SELECT GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),': ',m.meta_value) SEPARATOR '&#10;') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_id=o.ID AND pl.variation_id=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL)meta
     99          ,IFNULL((SELECT GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),': ',m.meta_value) SEPARATOR '&#10;') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_id=o.ID AND pl.variation_id=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL),(SELECT post_excerpt FROM wp_posts WHERE ID=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0)))meta
    100100          ,(SELECT meta_value FROM wp_postmeta WHERE meta_key='delivery_est' AND post_id=o.ID LIMIT 1)delivery_est
    101101          FROM wp_posts o
    … …  
    161161          SELECT o.ID, post_type
    162162          ,o.post_date
    163           ,REPLACE(CONCAT((SELECT DISTINCT post_title FROM wp_posts WHERE ID=op.product_id),'(',SUM(IFNULL(op.product_qty,ip.product_qty)),')'),'(1)','')item
     163          ,REPLACE(CONCAT((SELECT DISTINCT post_title FROM wp_posts WHERE ID=IFNULL(ip.product_id,op.product_id)),'(',SUM(IFNULL(op.product_qty,ip.product_qty)),')'),'(1)','')item
    164164          ,o2.reship
    165165          ,IFNULL((SELECT meta_value FROM wp_postmeta WHERE post_id=o.ID AND meta_key='shipping' LIMIT 1),(SELECT order_item_name FROM wp_woocommerce_order_items WHERE order_id=o.ID AND order_item_type='shipping' LIMIT 1))method
    166166          ,(SELECT NULLIF(m.meta_value,0) FROM wp_woocommerce_order_items oi JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=oi.order_item_id AND m.meta_key='cost' WHERE oi.order_id=o.ID AND oi.order_item_type='shipping' LIMIT 1)cost
    167           ,(SELECT GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),': ',m.meta_value) SEPARATOR '&#10;') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_id=o.ID AND pl.variation_id=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL)meta
     167          ,IFNULL((SELECT GROUP_CONCAT(DISTINCT CONCAT(UCASE(SUBSTRING(m.meta_key,1,1)),SUBSTRING(m.meta_key,2),': ',m.meta_value) SEPARATOR '&#10;') FROM wp_wc_order_product_lookup pl JOIN wp_woocommerce_order_itemmeta m ON m.order_item_id=pl.order_item_id WHERE pl.order_id=o.ID AND pl.variation_id=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0) AND m.meta_key NOT LIKE '\_%' AND m.meta_value IS NOT NULL),(SELECT post_excerpt FROM wp_posts WHERE ID=COALESCE(NULLIF(op.variation_id,0),ip.variation_id,0)))meta
    168168          ,(SELECT meta_value FROM wp_postmeta WHERE meta_key='delivery_est' AND post_id=o.ID LIMIT 1)delivery_est
    169169          FROM wp_posts o

  • pb-shipping/trunk/readme.txt

    r3410295 r3413292  
    66Requires at least: 4.6
    77Tested up to: 6.9
    8 Stable tag: 5.0.19
     8Stable tag: 5.0.20
    99
    1010A streamlined US shipping solution for WooCommerce and Pitney Bowes.
    … …  
    3737
    3838== Changelog ==
    39 = 5.0.19 = * Compatibility with WC 10.3. Variation improvements to queue and packing slip.
     39= 5.0.20 = * Variation meta improvements to queue and ship screen.
     40= 5.0.19 = * Compatibility with WC 10.3. Variation meta in queue and packing slip.
    4041= 5.0.18 = * Compatibility with WC 10.1.
    4142= 5.0.17 = * Updates to allow 4 digit ins values.
Note: See TracChangeset for help on using the changeset viewer.