WordPress.org
Get WordPress

Plugin Directory

Changeset 3319809


Ignore:
Timestamp:
06/30/2025 09:10:04 AM (6 months ago)
Author:
aarsiv
Message:

Shipi new update

Location:
shipi
Files:
15 added
4 edited

Legend:

Unmodified
Added
Removed

  • shipi/trunk/assets/js/admin.js

    r3151569 r3319809  
    5151                if(response.success){
    5252                    $("." + order_id + "_shipi_label_button").html( response.data.tracking_no);
    53                     $("." + order_id + "_shipi_pdf_btn").attr('href', "https://app.myshipi.com/shipping_labels/_label_"+ response.data.tracking_no +".pdf").show();
     53                    $("." + order_id + "_shipi_pdf_btn").attr('href', response.data.label).show();
    5454                    $("." + order_id + "_shipi_brand_img").attr('src', "https://app.myshipi.com/assets/img/brand/"+ response.data.carrier +".jpg").show();
    5555                }

  • shipi/trunk/includes/rest-api.php

    r3261026 r3319809  
    4141            $tracking_number = $data->get_param('tracking_number');
    4242            $carrier = $data->get_param('carrier');
     43            $label = $data->get_param('label');
    4344           
    4445            $order_id = sanitize_text_field($order_id);
    4546            $tracking_number = sanitize_text_field($tracking_number);
    4647            $carrier = sanitize_text_field($carrier);
     48            $label = sanitize_text_field($label);
    4749            $response = array();
    4850       
    … …  
    5961                $order->update_meta_data('_shipi_tracking_no', $tracking_number);
    6062                $order->update_meta_data('_shipi_carrier', $carrier);
     63                $order->update_meta_data('_shipi_carrier_label', $label);
    6164               
    6265                // Add tracking number to customer note
    … …  
    6568       
    6669                // Allow custom operations via filter
    67                 do_action('shipi_v1_update_shipment_custom_operations', $order_id, $tracking_number, $carrier);
     70                do_action('shipi_v1_update_shipment_custom_operations', $order_id, $tracking_number, $carrier, $label);
    6871       
    6972                $order->save();

  • shipi/trunk/readme.txt

    r3261026 r3319809  
    44Requires at least: 4.0.1
    55Tested up to: 6.7
    6 Stable tag: 1.2.0
     6Stable tag: 1.2.1
    77Requires PHP: 5.6
    88License: GPLv3 or later License
    … …  
    4040
    4141== Changelog ==
     42= 1.2.1 =
     43* Bug fix on the label URL
    4244= 1.2.0 =
    4345* . Updated the Customer order note

  • shipi/trunk/shipi.php

    r3261026 r3319809  
    33 * Plugin Name: Shipi
    44 * Description: 15+ Shipping carriers in one package.
    5  * Version: 1.2.0
     5 * Version: 1.2.1
    66 * Author: Shipi
    77 * Author URI: https://myshipi.com/
    … …  
    231231                $order_id = $order->get_id();
    232232                $carrier = "";
     233                $label = "";
    233234                if ($this->hpos_enabled) {
    234235                    $button_txt = $order->get_meta("_shipi_tracking_no");
    235236                    $carrier = $order->get_meta("_shipi_carrier");
     237                    $label = $order->get_meta("_shipi_carrier_label");
    236238                }else{
    237239                    $button_txt = get_post_meta($order_id, '_shipi_tracking_no', true);
    238240                    $carrier = get_post_meta($order_id, '_shipi_carrier', true);
     241                    $label = get_post_meta($order_id, '_shipi_carrier_label', true);
    239242                }
    240243
    … …  
    252255                echo '<p class="form-field form-field-wide wc-customer-user">';
    253256                echo ($show_txt) ? "<b>Tracking <br/></b>" : "";
    254                 echo '<a href="https://app.myshipi.com/shipping_labels/order_'. esc_html($order_id) .'_'. esc_html($carrier) .'_track_'. esc_html($button_txt) .'_label.pdf" class="'. esc_attr($order_id) .'_shipi_pdf_btn button button-secondary" target="_blank" style="cursor: pointer;margin-right:5px;'. esc_html($pdf_button_style) .'" ><span class="dashicons dashicons-pdf"></span></a>';
     257                if($label != ""){
     258                    echo '<a href="' . esc_url($label) . '" class="'. esc_attr($order_id) .'_shipi_pdf_btn button button-secondary" target="_blank" style="cursor: pointer;margin-right:5px;'. esc_html($pdf_button_style) .'" ><span class="dashicons dashicons-pdf"></span></a>';
     259                }else{
     260                    echo '<a href="https://app.myshipi.com/shipping_labels/order_'. esc_html($order_id) .'_'. esc_html($carrier) .'_track_'. esc_html($button_txt) .'_label.pdf" class="'. esc_attr($order_id) .'_shipi_pdf_btn button button-secondary" target="_blank" style="cursor: pointer;margin-right:5px;'. esc_html($pdf_button_style) .'" ><span class="dashicons dashicons-pdf"></span></a>';
     261                }
    255262                echo '<a data-order-id="' . esc_attr($order_id) . '" style="cursor: pointer;" class="'. esc_html($button_class) .' shipi_label_button '. esc_attr($order_id) .'_shipi_label_button">' . esc_html($button_txt) . '</a>';
    256263                echo  "<img src='https://app.myshipi.com/assets/img/brand/". esc_html($carrier) .".jpg' class='". esc_attr($order_id) ."_shipi_brand_img' style='width:50px;margin-left:5px;vertical-align: middle;". esc_html($pdf_button_style) ."' >";
    … …  
    319326                $order = wc_get_order($order_id);
    320327                $carrier = "";
     328                $label = "";
    321329                if ($this->hpos_enabled) {
    322330                    $tracking = $order->get_meta("_shipi_tracking_no");
    323331                    $carrier = $order->get_meta("_shipi_carrier");
     332                    $label = $order->get_meta("_shipi_carrier_label");
    324333                   
    325334                }else{
    326335                    $tracking = get_post_meta($order_id, '_shipi_tracking_no', true);
    327336                    $carrier = get_post_meta($order_id, '_shipi_carrier', true);
     337                    $label = get_post_meta($order_id, '_shipi_carrier_label', true);
    328338                }
    329339                if($tracking != ""){
    330                     wp_send_json_success( array( "tracking_no" => $tracking, "carrier" => $carrier) );
     340                    wp_send_json_success( array( "tracking_no" => $tracking, "carrier" => $carrier, "label" => $label) );
    331341                }
    332342
Note: See TracChangeset for help on using the changeset viewer.