Changeset 2830540
- Timestamp:
- 12/08/2022 09:58:23 AM (3 years ago)
- Location:
- shiptimize-for-woocommerce/trunk
- Files:
-
- 6 edited
-
constants.php (modified) (1 diff)
-
includes/admin/class-shiptimize-order-ui.php (modified) (2 diffs)
-
includes/class-woo-shiptimize-order.php (modified) (4 diffs)
-
includes/core/class-shiptimize-order.php (modified) (2 diffs)
-
readme.txt (modified) (1 diff)
-
shiptimize.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
shiptimize-for-woocommerce/trunk/constants.php
r2819261 r2830540 4 4 define( 'SHIPTIMIZE_API_URL', 'https://api.pakketmail.nl/v3' ); 5 5 define( 'SHIPTIMIZE_BRAND', 'Shiptimize' ); 6 define( 'SHIPTIMIZE_VERSION', '3.1.6 2' );6 define( 'SHIPTIMIZE_VERSION', '3.1.64' ); 7 7 define( 'SHIPTIMIZE_CREATE_ACCOUNT', 'https://www.shiptimize.me/quote/' ); 8 8 define( 'SHIPTIMIZE_CHECKOUT', 0); -
shiptimize-for-woocommerce/trunk/includes/admin/class-shiptimize-order-ui.php
r2772699 r2830540 70 70 if (isset($response->response->ClientReferenceCodeList)) { 71 71 foreach($response->response->ClientReferenceCodeList as $labelresult) { 72 $order = new WooShiptimizeOrder($labelresult-> ReferenceCode);72 $order = new WooShiptimizeOrder($labelresult->ShopItemId); 73 73 $status = ShiptimizeOrder::$LABEL_STATUS_NOT_REQUESTED; 74 74 $msg = ''; … … 89 89 $msg = $order_meta->message . $msg; 90 90 $labelresult->message = $msg; 91 $order->set_label_meta($labelresult-> ReferenceCode,$status,$labelurl,$msg);91 $order->set_label_meta($labelresult->ShopItemId,$status,$labelurl,$msg); 92 92 } 93 93 } -
shiptimize-for-woocommerce/trunk/includes/class-woo-shiptimize-order.php
r2819261 r2830540 483 483 } 484 484 485 WooShiptimize::log("Updating tracking $tracking_id for order [$this->ShopItemId]"); 485 486 $this->add_message($this->get_formated_message($shiptimize->translate("api sent trackingId:").' '.$tracking_id)); 486 487 … … 655 656 656 657 $items = $this->woo_order->get_items(); 658 659 if(!is_array($items)) { 660 return array(); 661 } 662 657 663 $weight = 0; 658 664 … … 980 986 else { // error we want to ignore 981 987 WooShiptimize::log("Ignoring error $error->Id for $order->ShopItemId $error->Tekst "); 988 982 989 array_push($labelorders, $order->ShopItemId); 983 990 } … … 998 1005 999 1006 if (!empty($labelorders)) { 1000 $labelresponse = WooShiptimize::get_api()->post_labels_step1($labelorders); 1007 // The api receives client references make sure we're sending that and not ShopItemIds 1008 $labelReference = array(); 1009 foreach ($labelorders as $orderid) { 1010 $reference = apply_filters( 'woocommerce_order_number', $orderid, wc_get_order( $orderid ) ); 1011 array_push($labelReference, $reference); 1012 WooShiptimize::log("label for order id $orderid ref $reference"); 1013 } 1014 1015 $labelresponse = WooShiptimize::get_api()->post_labels_step1($labelReference); 1001 1016 $labelresponse->ErrorList = $errors; 1002 1017 WooShiptimize::log( "Labelresponse " . json_encode($labelresponse) ); -
shiptimize-for-woocommerce/trunk/includes/core/class-shiptimize-order.php
r2819261 r2830540 643 643 $this->Description = $this->escape_text_data($this->Description); 644 644 645 if( strlen($this->Description) > 255 ){645 if($this->Description && strlen($this->Description) > 255 ){ 646 646 $this->Description = substr( $this->Description, 0, 255); 647 647 $chars = str_split($this->Description); … … 655 655 } 656 656 657 if( strlen($this->PostalCode) > 15){657 if($this->PostalCode && strlen($this->PostalCode) > 15){ 658 658 $originalPostalCode = $this->PostalCode; 659 659 660 660 $words = explode(" ", $this->PostalCode); 661 661 $validPostalCode = ''; 662 for ( $i = 0; $i < count($words) && strlen($validPostalCode ." " .$words[$i]) < 15 ; ++$i ){662 for ( $i = 0; $i < count($words) && strlen($validPostalCode . " " . $words[$i]) < 15 ; ++$i ){ 663 663 $validPostalCode .= ($i ? " " : "") . $words[$i]; 664 664 } -
shiptimize-for-woocommerce/trunk/readme.txt
r2819311 r2830540 59 59 == Changelog == 60 60 61 = 3.1.64 - 2022-11-16 = 62 * Fix - Error when creating labels from websites that use custom order numbers 63 61 64 = 3.1.63 - 2022-11-16 = 62 65 * Fix - Error with Weight Based Shipping methods -
shiptimize-for-woocommerce/trunk/shiptimize.php
r2819311 r2830540 3 3 * Plugin Name: Shiptimize for WooCommerce 4 4 * Description: Shiptimize for WooCommerce 5 * Version: 3.1.6 35 * Version: 3.1.64 6 6 * Author: Shiptimize 7 7 * Author URI: https://shiptimize.me
Note: See TracChangeset
for help on using the changeset viewer.