Changeset 2982324
- Timestamp:
- 10/22/2023 08:07:13 PM (2 years ago)
- Location:
- dhl-for-woocommerce
- Files:
-
- 6 edited
- 1 copied
-
tags/3.5.8 (copied) (copied from dhl-for-woocommerce/tags/3.5.7)
-
tags/3.5.8/includes/REST_API/Parcel_DE/Client.php (modified) (1 diff)
-
tags/3.5.8/includes/REST_API/Parcel_DE/Item_Info.php (modified) (4 diffs)
-
tags/3.5.8/includes/abstract-pr-dhl-wc-order.php (modified) (4 diffs)
-
tags/3.5.8/pr-dhl-woocommerce.php (modified) (2 diffs)
-
tags/3.5.8/readme.txt (modified) (2 diffs)
-
trunk/readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
dhl-for-woocommerce/tags/3.5.8/includes/REST_API/Parcel_DE/Client.php
r2977612 r2982324 295 295 $address_fields = array( 296 296 'name1', 297 'name2', 297 298 'addressStreet', 298 299 'addressHouse', -
dhl-for-woocommerce/tags/3.5.8/includes/REST_API/Parcel_DE/Item_Info.php
r2977612 r2982324 137 137 $this->weightUom = $weightUom; 138 138 $this->isCrossBorder = PR_DHL()->is_crossborder_shipment( $args['shipping_address'] ); 139 139 140 $this->args = $args; 140 141 … … 145 146 $this->set_address_2(); 146 147 $this->parse_args(); 148 147 149 } 148 150 … … 481 483 return $self->string_length_sanitization( $name, 50 ); 482 484 }, 485 ), 486 'company' => array( 487 'rename' => 'name2', 483 488 ), 484 489 'address_1' => array( … … 1102 1107 if ( ! empty( $this->args['shipping_address']['address_2'] ) ) { 1103 1108 1109 // If address_2 greated than 10 chars, try to pass with additional address (does not show for DE) 1104 1110 if ( strlen( $this->args['shipping_address']['address_2'] ) > 10 ) { 1105 1111 $this->args['shipping_address']['address_additional'] = $this->args['shipping_address']['address_2']; -
dhl-for-woocommerce/tags/3.5.8/includes/abstract-pr-dhl-wc-order.php
r2945338 r2982324 1149 1149 $args = apply_filters( 'pr_shipping_dhl_label_args', $args, $order_id ); 1150 1150 1151 if ( API_Utils::is_new_merchant() || API_Utils::is_rest_api_enabled() ) { 1152 $orders_args[] = $args; 1153 } else { 1151 1154 1152 // SOAP API request. 1155 1153 $label_tracking_info = $dhl_obj->get_dhl_label( $args ); … … 1170 1168 ); 1171 1169 1172 if ( ! empty( $label_tracking_info['label_path'] ) ) {1173 $merge_files[] = $label_tracking_info['label_path'];1174 }1170 // if ( ! empty( $label_tracking_info['label_path'] ) ) { 1171 // $merge_files[] = $label_tracking_info['label_path']; 1172 // } 1175 1173 1176 1174 do_action( 'pr_shipping_dhl_label_created', $order_id ); 1177 } 1175 1176 } 1177 1178 if( ! empty( $label_tracking_info['label_path'] ) ) { 1179 array_push($merge_files, $label_tracking_info['label_path']); 1178 1180 } 1179 1181 … … 1186 1188 } 1187 1189 } 1188 1190 /* 1189 1191 if ( API_Utils::is_new_merchant() || API_Utils::is_rest_api_enabled() ) { 1190 1192 $labels_tracking_info = $dhl_obj->get_dhl_labels( $orders_args ); … … 1225 1227 } 1226 1228 } 1227 1229 */ 1228 1230 try { 1229 1231 -
dhl-for-woocommerce/tags/3.5.8/pr-dhl-woocommerce.php
r2977612 r2982324 8 8 * Text Domain: dhl-for-woocommerce 9 9 * Domain Path: /lang 10 * Version: 3.5. 710 * Version: 3.5.8 11 11 * Tested up to: 6.3 12 12 * WC requires at least: 3.0 … … 39 39 class PR_DHL_WC { 40 40 41 private $version = "3.5. 7";41 private $version = "3.5.8"; 42 42 43 43 /** -
dhl-for-woocommerce/tags/3.5.8/readme.txt
r2977612 r2982324 6 6 Requires PHP: 5.6 7 7 Tested up to: 6.3 8 Stable tag: 3.5. 78 Stable tag: 3.5.8 9 9 WC requires at least: 3.0 10 10 WC tested up to: 8.2 … … 76 76 77 77 == Changelog == 78 79 = 3.5.8 = 80 * DHL Paket: Add Company Name is destination address label 81 * DHL Paket: Fix bulk merge issue when label previously exists 78 82 79 83 = 3.5.7 = -
dhl-for-woocommerce/trunk/readme.txt
r2977612 r2982324 6 6 Requires PHP: 5.6 7 7 Tested up to: 4.8.2 8 Stable tag: 3.5. 78 Stable tag: 3.5.8 9 9 License: GPLv2 or later 10 10 License URI: https://www.gnu.org/licenses/gpl-2.0.html
Note: See TracChangeset
for help on using the changeset viewer.