WordPress.org
Get WordPress

Plugin Directory

Changeset 3417629


Ignore:
Timestamp:
12/11/2025 05:26:25 PM (3 months ago)
Author:
rermis
Message:

v5.0.21 = * Queue updates and aesthetic improvements

Location:
pb-shipping/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pb-shipping/trunk/pb_functions.php

    r3413292 r3417629  
    66Author: RLDD
    77Author URI: https://richardlerma.com/contact/
    8 Version: 5.0.20
     8Version: 5.0.21
    99Copyright: (c) 2020-2025 rldd.net - All Rights Reserved
    1010License: GPLv3 or later
    … …  
    1414*/
    1515
    16 global $espb_version; $espb_version='5.0.20';
     16global $espb_version; $espb_version='5.0.21';
    1717if(!defined('ABSPATH')) exit;
    1818
    … …  
    965965  if(!empty($error)) return $error;
    966966
    967   $rates=$rate=$sel_rate=$class=$parceltypes=$filter_parcel=$sel_charge=$switch_opt=$svc_desc='';
     967  $rates=$rate=$sel_rate=$parceltypes=$filter_parcel=$sel_charge=$switch_opt=$svc_desc='';
    968968  $svc_descs=array(
    969969    array('svc'=>'UGA','name'=>'Ground Advantage'),
    … …  
    992992        if($r_ratetypeid=='RETAIL' && (stripos($rates,'CONTRACT')!==false || stripos($rates,'COMMERCIAL')!==false)) {$rate=''; continue;}
    993993
    994         if(($serviceid==$r_serviceid || ($serviceid=='HOM' && $r_serviceid=='GRD')) && ($parceltype==$r_parceltype || empty($parceltype)) && empty($class)) {
     994        if(($serviceid==$r_serviceid || ($serviceid=='HOM' && $r_serviceid=='GRD')) && ($parceltype==$r_parceltype || empty($parceltype))) {
    995995          if($carrier=='FEDEX' && $r_serviceid=='GRD') {
    996996            if($serviceid=='HOM') {$r_serviceid='HOM'; $hom_sel='selected';} else $hom_sel='';
    … …  
    999999        }
    10001000
    1001         if($serviceid==$r_serviceid && ($parceltype==$r_parceltype || empty($parceltype)) && empty($class)) {
     1001        if($serviceid==$r_serviceid && ($parceltype==$r_parceltype || empty($parceltype))) {
    10021002          $sel_rate="<div class='rate selected' title='$r_serviceid-$r_parceltype-$r_ratetypeid' id='$r_serviceid-$r_parceltype' onclick=\"select_div(this.id,'rate','serviceid','$r_serviceid');select_div(this.id,'rate','parceltype','$r_parceltype');pb_getE('charge').value='$charge';\">$rate$switch_opt</div>";
    10031003          $sel_charge=$charge;
    … …  
    13721372
    13731373function espb_report_history($report_id=0) {
    1374   $history=$filter=$goback=$last_date=$class=$rpt_status='';
     1374  $history=$filter=$goback=$last_date=$rpt_status='';
    13751375  $url=admin_url('admin.php?page=pb-reports');
    13761376  if($report_id>0) $filter="AND ID=$report_id"; else $filter="AND post_status!='trash'";
    … …  
    14191419      } else $view_label='';
    14201420
    1421       if($last_date!=substr($rpt_date,0,10)) if(empty($class)) $class="class='even'"; else $class='';
    14221421      $last_date=substr($rpt_date,0,10);
    14231422      $avg_cost=$avg_wt='';
    … …  
    14291428        $avg_wt="<br>".number_format(($wt/$items),2).$weight_unit;
    14301429      } else $tot_wt=$avg_wt='';
    1431       $history.="<tr $class title='Report ID $rpt_id' $list_items_row><td>$rpt_date</td><td>$rpt_title</td><td>$$cost{$tot_wt}</td><td>$$avg_cost{$avg_wt}</td><td>$rpt_user</td><td nowrap>$list_items $view_label</td></tr>";
     1430      $history.="<tr title='Report ID $rpt_id' $list_items_row><td>$rpt_date</td><td>$rpt_title</td><td>$$cost{$tot_wt}</td><td>$$avg_cost{$avg_wt}</td><td>$rpt_user</td><td nowrap>$list_items $view_label</td></tr>";
    14321431    }
    14331432    $history="
    … …  
    15481547    .pb_rpt tr{-webkit-transition:all .5s;transition:all .5s}
    15491548    .pb_rpt tr.pb_del{opacity:0}
    1550     .pb_rpt tr.even{color:#fff;background:var(--bgd_hl_clr);}
    1551     .pb_rpt tr.even td a{background:#fff;border:1px solid #fff}
    15521549    .pb_rpt tr:hover{cursor:pointer;color:#fff;background:var(--bgd_hl_clr)}
    15531550    .admin_report.pb_rpt tr:hover{background:var(--txt_hl_clr)}
    1554     .admin_report.pb_rpt tr.even:hover{background:#015e88}
    15551551    .pb_rpt td .dashicons{color:#DDD;vertical-align:bottom}
    15561552    .pb_rpt tr:hover a{color:#fff}
    15571553    .pb_rpt td a{border:1px solid #ddd;padding:.5em;border-radius:5px}
    15581554    .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}
     1555    .pb_rpt tr:nth-child(even){background:#d2d0ce57}
     1556    .pb_rpt tr:nth-child(even):hover{background:var(--bgd_hl_clr);}
    15601557    .pb_rpt td a.pb_remove{background:transparent!important;border:none!important;color:#ddd!important}
    15611558    .pb_rpt td a.pb_remove:hover{color:#fff!important;background:red!important}

  • pb-shipping/trunk/pb_queue.php

    r3413292 r3417629  
    9292      FROM (
    9393          SELECT o.ID, o2.post_type
    94           ,o.post_date
     94          ,IFNULL((SELECT date_paid FROM wp_wc_order_stats WHERE order_id=o.ID AND date_paid IS NOT NULL),o.post_date)post_date
    9595          ,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
    … …  
    160160      FROM (
    161161          SELECT o.ID, post_type
    162           ,o.post_date
     162          ,IFNULL((SELECT date_paid FROM wp_wc_order_stats WHERE order_id=o.ID AND date_paid IS NOT NULL),o.post_date)post_date
    163163          ,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

  • pb-shipping/trunk/readme.txt

    r3413292 r3417629  
    66Requires at least: 4.6
    77Tested up to: 6.9
    8 Stable tag: 5.0.20
     8Stable tag: 5.0.21
    99
    1010A streamlined US shipping solution for WooCommerce and Pitney Bowes.
    … …  
    3737
    3838== Changelog ==
     39= 5.0.21 = * Queue updates and aesthetic improvements
    3940= 5.0.20 = * Variation meta improvements to queue and ship screen.
    4041= 5.0.19 = * Compatibility with WC 10.3. Variation meta in queue and packing slip.
Note: See TracChangeset for help on using the changeset viewer.