WordPress.org
Get WordPress

Plugin Directory

Changeset 3025210


Ignore:
Timestamp:
01/22/2024 02:45:08 PM (2 years ago)
Author:
shadim
Message:

tagging version v3.6.4

Location:
dhl-for-woocommerce
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • dhl-for-woocommerce/tags/3.6.4/includes/REST_API/Parcel_DE/Item_Info.php

    r3005042 r3025210  
    772772            'endorsement'          => array(
    773773                'default' => '',
    774                 'rename' => 'endorsement',
     774                'sanitize' => function ( $value, $args ) use ( $self ) {
     775                    switch ( $value ) {
     776                        case 'IMMEDIATE':
     777                            $value = 'RETURN';
     778                            break;
     779                        case 'ABANDONMENT':
     780                            $value = 'ABANDON';
     781                            break;
     782                        default:
     783                            $value = 'RETURN';
     784                            break;
     785                    }
     786
     787                    return $value;
     788                },
    775789            ),
    776790            'return_address_enabled'    => array(

  • dhl-for-woocommerce/tags/3.6.4/includes/class-pr-dhl-wc-method-paket.php

    r3007982 r3025210  
    405405                'default'           => '',
    406406                'options'           => array(
    407                     ''            => esc_html__( 'none', 'dhl-for-woocommerce' ),
    408                     'IMMEDIATE'   => esc_html__( 'Sending back to sender', 'dhl-for-woocommerce' ),
    409                     'ABANDONMENT' => esc_html__( 'Abandonment of parcel', 'dhl-for-woocommerce' )
     407                    'IMMEDIATE'        => esc_html__( 'Sending back to sender', 'dhl-for-woocommerce' ),
     408                    'ABANDONMENT'      => esc_html__( 'Abandonment of parcel', 'dhl-for-woocommerce' )
    410409                ),
    411410                'description'       => esc_html__( 'Please, tick here if you want the "Endorsement value" to be selected in the "Edit Order" before printing a label.', 'dhl-for-woocommerce' ),

  • dhl-for-woocommerce/tags/3.6.4/includes/class-pr-dhl-wc-order-paket.php

    r3007982 r3025210  
    429429                    'value'             => $dhl_label_items['pr_dhl_endorsement'] ?? $this->shipping_dhl_settings['dhl_default_endorsement'],
    430430                    'options'           => array(
    431                         ''            => esc_html__( 'none', 'dhl-for-woocommerce' ),
    432                         'IMMEDIATE'   => esc_html__( 'Sending back to sender', 'dhl-for-woocommerce' ),
    433                         'ABANDONMENT' => esc_html__( 'Abandonment of parcel', 'dhl-for-woocommerce' )
     431                        'IMMEDIATE'        => esc_html__( 'Sending back to sender', 'dhl-for-woocommerce' ),
     432                        'ABANDONMENT'      => esc_html__( 'Abandonment of parcel', 'dhl-for-woocommerce' )
    434433                    ),
    435434                    'custom_attributes' => array( $is_disabled => $is_disabled )

  • dhl-for-woocommerce/tags/3.6.4/includes/pr-dhl-api/class-pr-dhl-api-paket.php

    r3008865 r3025210  
    9797                        'order_id'        => $order_id,
    9898                        'label_path'      => $file['label_path'],
    99                         'item_barcode'    => $item->shipmentNo,
    10099                        'tracking_number' => $item->shipmentNo,
    101100                        'tracking_status' => '',

  • dhl-for-woocommerce/tags/3.6.4/includes/pr-dhl-api/class-pr-dhl-api-rest-parcel-de.php

    r3011343 r3025210  
    157157
    158158        if ( count( $item_response['items'] ) > 1 ) {
    159             $file = $this->save_shipment_files( 'label', $args['order_details']['order_id'], $item_response['items'] );
     159            $label_tracking_info = $this->save_multiple_shipments( 'label', $args['order_details']['order_id'], $item_response['items'] );
    160160        } else {
    161             $file = $this->save_data_file( 'label', $args['order_details']['order_id'], $item_response['items'][0]->label->b64 );
    162         }
    163 
    164         return array(
    165             'label_path'      => $file['label_path'],
    166             'item_barcode'    => $item_response['items'][0]->shipmentNo,
    167             'tracking_number' => $item_response['items'][0]->shipmentNo,
    168             'tracking_status' => '',
    169         );
     161            $label_tracking_info = $this->save_export_files( 'label', $args['order_details']['order_id'], $item_response['items'][0] );
     162        }
     163
     164        return $label_tracking_info;
    170165    }
    171166
    … …  
    226221
    227222    /**
     223     * Merge export files.
     224     *
     225     * @throws exception
     226     */
     227    public function save_export_files( $prefix, $order_id, $item ) {
     228       
     229
     230        $file = $this->save_data_file( $prefix, $order_id, $item->label->b64 );
     231
     232        // Merge export doc with label
     233        if( isset( $item->customsDoc->b64 ) ) {
     234            $loader    = PR_DHL_Libraryloader::instance();
     235            $pdfMerger = $loader->get_pdf_merger();
     236
     237            if ( $pdfMerger ) {
     238                $pdfMerger->addPDF( $file['label_path'] );
     239
     240                $file = $this->save_data_file( $prefix . '-customs', $order_id, $item->customsDoc->b64 );
     241                $pdfMerger->addPDF( $file['label_path'] );
     242
     243                $filename   = 'dhl-' . $prefix . '-' . $order_id . '-export' . '.pdf';
     244                $label_url  = PR_DHL()->get_dhl_label_folder_url() . $filename;
     245                $label_path = PR_DHL()->get_dhl_label_folder_dir() . $filename;
     246                $pdfMerger->merge( 'file', $label_path );
     247            } else {
     248                throw new Exception( 'Failed to merge export files.' );
     249            }
     250        } else {
     251            $label_url = $file['label_url'];
     252            $label_path = $file['label_path'];
     253        }
     254
     255        // If return label exists, add number
     256        $return_num = '';
     257        if( isset( $item->returnShipmentNo ) ) {
     258            $return_num = $item->returnShipmentNo;
     259        }
     260
     261        return array( 'label_url' => $label_url,
     262            'label_path' => $label_path,
     263            'tracking_number' => $item->shipmentNo,
     264            'return_label_number' =>  $return_num
     265        );
     266    }
     267
     268    /**
    228269     * Merge returned labels.
    229270     *
    230271     * @throws exception
    231272     */
    232     public function save_shipment_files( $prefix, $order_id, $items ) {
     273    public function save_multiple_shipments( $prefix, $order_id, $items ) {
    233274        // Merge PDF files
    234275        $loader    = PR_DHL_Libraryloader::instance();
    235276        $pdfMerger = $loader->get_pdf_merger();
    236277
     278        $shipmentNos = array();
     279        $return_nums = array();
     280
    237281        if ( $pdfMerger ) {
    238282            foreach ( $items as $key => $item ) {
    239                 $file = $this->save_data_file( 'label-' . $key . '-' . count( $items ), $order_id, $item->label->b64 );
     283                $file = $this->save_export_files( $prefix . '-' . $key, $order_id, $item );
     284
    240285                $pdfMerger->addPDF( $file['label_path'] );
     286
     287                array_push( $shipmentNos, $file['tracking_number'] );
     288                array_push( $return_nums, $file['return_label_number'] );
    241289            }
    242290
    … …  
    246294            $pdfMerger->merge( 'file', $label_path );
    247295        } else {
    248             throw new Exception( 'Failed to merge files.' );
    249         }
    250 
    251         return array( 'label_url' => $label_url, 'label_path' => $label_path );
     296            throw new Exception( 'Failed to merge multiple files.' );
     297        }
     298
     299        return array( 'label_url' => $label_url,
     300            'label_path' => $label_path,
     301            'tracking_number' => $shipmentNos,
     302            'return_label_number' =>  $return_nums
     303        );
    252304    }
    253305

  • dhl-for-woocommerce/tags/3.6.4/pr-dhl-woocommerce.php

    r3011343 r3025210  
    88 * Text Domain: dhl-for-woocommerce
    99 * Domain Path: /lang
    10  * Version: 3.6.3
     10 * Version: 3.6.4
    1111 * Tested up to: 6.3
    1212 * WC requires at least: 3.0
    … …  
    3939class PR_DHL_WC {
    4040
    41     private $version = "3.6.3";
     41    private $version = "3.6.4";
    4242
    4343    /**

  • dhl-for-woocommerce/tags/3.6.4/readme.txt

    r3011343 r3025210  
    66Requires PHP: 5.6
    77Tested up to: 6.3
    8 Stable tag: 3.6.3
     8Stable tag: 3.6.4
    99WC requires at least: 3.0
    1010WC tested up to: 8.4
    … …  
    7676
    7777== Changelog ==
     78
     79= 3.6.4 =
     80* DHL Paket: Fix REST API customs doc merged with label
     81* DHL Paket: Fix "Endorsement" warning
    7882
    7983= 3.6.3 =

  • dhl-for-woocommerce/trunk/readme.txt

    r3011343 r3025210  
    66Requires PHP: 5.6
    77Tested up to: 4.8.2
    8 Stable tag: 3.6.3
     8Stable tag: 3.6.4
    99License: GPLv2 or later
    1010License URI: https://www.gnu.org/licenses/gpl-2.0.html
Note: See TracChangeset for help on using the changeset viewer.