longyi 2 mesi fa
parent
commit
bb4363bdad
2 ha cambiato i file con 6 aggiunte e 5 eliminazioni
  1. 5 4
      core/CoreApp/controllers/Ac.php
  2. 1 1
      core/CoreApp/models/Model_dhl.php

+ 5 - 4
core/CoreApp/controllers/Ac.php

@@ -125,7 +125,7 @@ class Ac extends Start_Controller {
 	
 	public function _x3($arg_array)
 	{
-	   die;
+	   
 		$fullorder = $this->fullorder->get_number($arg_array[0]);
 		if(!$fullorder)
 		{
@@ -246,9 +246,10 @@ class Ac extends Start_Controller {
 // 		$b = $this->fedexv1->get_data($fullorder);
 // 		var_dump($b);
 		//echo $fullorder['zzl'];
-	//	echo  "<pre>";
-	//	var_dump($fullorder);
-		$b = $this->usps->get_data($fullorder);
+		echo  "<pre>";
+		var_dump($fullorder);
+	
+		$b = $this->dhl->get_data($fullorder);
 		
 // 		$b = $this->ups->get_data($fullorder);
 		echo "<pre>";

+ 1 - 1
core/CoreApp/models/Model_dhl.php

@@ -285,7 +285,7 @@ function __construct(){
 			/** 发件人承担税费 e**/
 		}
 		
-		if(($data['country'] == 119) && !empty($data['r_tax_id'])){
+		if(($data['country'] == 'Mexico'  || $data['al'] == 'MX') && !empty($data['r_tax_id'])){
 			$xml .= "<CustomerDetails>".$xmend;
 			$xml .= "<RegistrationNumbers>".$xmend;
 			$xml .= "<RegistrationNumber>".$xmend;