WordPress.org
Get WordPress

Plugin Directory

Changeset 2912942


Ignore:
Timestamp:
05/16/2023 11:21:43 AM (3 years ago)
Author:
shiptimizeplugins
Message:

Remove the constraint in the plugin to 1 order per label request, let the API decide

Location:
shiptimize-for-woocommerce/trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • shiptimize-for-woocommerce/trunk/constants.php

    r2885078 r2912942  
    44define( 'SHIPTIMIZE_API_URL', 'https://api.pakketmail.nl/v3' );
    55define( 'SHIPTIMIZE_BRAND', 'Shiptimize' );
    6 define( 'SHIPTIMIZE_VERSION', '3.1.68' );
     6define( 'SHIPTIMIZE_VERSION', '3.1.69' );
    77define( 'SHIPTIMIZE_CREATE_ACCOUNT', 'https://www.shiptimize.me/quote/' );
    88define( 'SHIPTIMIZE_CHECKOUT', 0);

  • shiptimize-for-woocommerce/trunk/includes/admin/class-shiptimize-order-ui.php

    r2901902 r2912942  
    328328    global $shiptimize;
    329329
    330     if (count($post_ids) > 1) {
    331       return admin_url("edit.php?post_type=shop_order&paged=" . filter_input(INPUT_GET, 'paged') . '&Error=' . $shiptimize->translate('multiorderlabelwarn'));
    332     }
    333     // if(size($post_ids) > 1) {
    334     //   return admin_url("edit.php?post_type=shop_order&paged=" . filter_input(INPUT_GET, 'paged') . '&Error=' . );
    335     // }
    336 
    337330    $summary = WooShiptimizeOrder::print_label($post_ids); 
    338     $urlString = '';
    339 
     331
     332    # Too Many labels
     333    if ( isset( $summary->response->ErrorList ) && count( $summary->response->ErrorList ) > 0 && $summary->response->ErrorList[0]->Id ==  6 ) {
     334      return admin_url( "edit.php?post_type=shop_order&paged=" . filter_input( INPUT_GET, 'paged' ) . '&Error=' . $shiptimize->translate( 'multiorderlabelwarn' ) );
     335    }
     336
     337    # Other high level errors
     338    if ( isset($summary->response->ErrorList) && count($summary->response->ErrorList) > 0 && $summary->response->ErrorList[0]->Id > 0 ) {
     339      return admin_url("edit.php?post_type=shop_order&paged=" . filter_input(INPUT_GET, 'paged') . '&Error=' . $summary->ErrorList[0]->Info);
     340    }
     341
     342    if ( $summary->httpCode == 500 ){
     343       return admin_url("edit.php?post_type=shop_order&paged=" . filter_input(INPUT_GET, 'paged') . '&Error=Fatal API error. Contact support with the order ids you just tried to print');
     344    }
     345
     346    $urlString = ''; 
    340347   
    341348    WooShiptimize::log ( "bulk_export summary " . var_export($summary, true) );

  • shiptimize-for-woocommerce/trunk/includes/class-woo-shiptimize-order.php

    r2901902 r2912942  
    173173                }
    174174                else {
    175                   $pickupoption->OptionFields = array();
     175                  $pickupoption['OptionFields'] = array();
    176176                  foreach ( $carrier->MapFields as $mapField ) {
    177                     array_push( $pickupoption->OptionFields, array(
     177                    array_push( $pickupoption['OptionFields'], array(
    178178                      'Id' => $mapField->Id,
    179179                      'Value' => $meta->pickup_extended

  • shiptimize-for-woocommerce/trunk/includes/core/class-shiptimize-api-v3.php

    r2885078 r2912942  
    9393        $this->test = $test;
    9494
    95         $this->is_dev =  file_exists(ABSPATH . 'isdevmachine');
     95        $this->is_dev =  defined('SHIPTIMIZE_DEV');
    9696    }
    9797

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

    r2901902 r2912942  
    5858
    5959== Changelog ==
     60
     61= 3.1.69 - 2023-05-15 =
     62* Enhancement  - Enable multi order label print when allowed for client
     63
    6064= 3.1.68 - 2023-04-20 =
    6165* BugFix - Issue in displaying the selected sub option of extra options in carrier settings.

  • shiptimize-for-woocommerce/trunk/shiptimize.php

    r2901902 r2912942  
    33 * Plugin Name: Shiptimize for WooCommerce
    44 * Description: Shiptimize for WooCommerce 
    5  * Version: 3.1.68
     5 * Version: 3.1.69
    66 * Author: Shiptimize
    77 * Author URI: https://shiptimize.me
Note: See TracChangeset for help on using the changeset viewer.