|
@@ -692,7 +692,7 @@ class Fullorder extends Start_Controller {
|
|
{
|
|
{
|
|
$x .= "<p><b class='focz' data-type='2' data-id='".$value['id']."'>提交审核</b></p>";
|
|
$x .= "<p><b class='focz' data-type='2' data-id='".$value['id']."'>提交审核</b></p>";
|
|
}
|
|
}
|
|
- $x .= "<p><b class='window' data-h='/customer/edit/".$customer['id']."' data-t='客户信息 - 修改'>客户信息</b></p>";
|
|
|
|
|
|
+ //$x .= "<p><b class='window' data-h='/customer/edit/".$customer['id']."' data-t='客户信息 - 修改'>客户信息</b></p>";
|
|
$info_list[$key]['black'] = $x;
|
|
$info_list[$key]['black'] = $x;
|
|
$tly = "";
|
|
$tly = "";
|
|
if($value['clientremarks'] != "")
|
|
if($value['clientremarks'] != "")
|
|
@@ -4638,14 +4638,30 @@ class Fullorder extends Start_Controller {
|
|
echo json_encode(array('msg'=>'请求失败,已有Return Label信息!','success'=>false));exit;
|
|
echo json_encode(array('msg'=>'请求失败,已有Return Label信息!','success'=>false));exit;
|
|
}
|
|
}
|
|
$barcode = $this->usps->get_return($data);
|
|
$barcode = $this->usps->get_return($data);
|
|
|
|
+ // if(isset($barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription']))
|
|
|
|
+ // {
|
|
|
|
+ // echo json_encode(array('msg'=>$barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription'],'success'=>false));exit;
|
|
|
|
+ // }
|
|
|
|
+ // else if(isset($barcode['TrackingNumber']))
|
|
|
|
+ // {
|
|
|
|
+ // $pdf = $this->_pdf($barcode['ReturnLabel'],'t-'.$barcode['TrackingNumber'],$bctime);
|
|
|
|
+ // $read = 'PostalRouting:'.$barcode['PostalRouting'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['TrackingNumber'].'.pdf" target="_blank">'.$barcode['TrackingNumber'].'</a>';
|
|
|
|
+ // $this->$fu->save(array('returndata'=>$read),$data['id']);
|
|
|
|
+ // echo json_encode(array('msg'=>'生成Return Label成功!','data'=>$read,'success'=>true));exit;
|
|
|
|
+ // }
|
|
|
|
+ // else
|
|
|
|
+ // {
|
|
|
|
+ // echo json_encode(array('msg'=>'请求失败,请稍后重试!','cs'=>$barcode,'success'=>false));exit;
|
|
|
|
+ // }
|
|
|
|
+
|
|
if(isset($barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription']))
|
|
if(isset($barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription']))
|
|
{
|
|
{
|
|
echo json_encode(array('msg'=>$barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription'],'success'=>false));exit;
|
|
echo json_encode(array('msg'=>$barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription'],'success'=>false));exit;
|
|
}
|
|
}
|
|
- else if(isset($barcode['TrackingNumber']))
|
|
|
|
|
|
+ else if(isset($barcode['trackingNumber']))
|
|
{
|
|
{
|
|
- $pdf = $this->_pdf($barcode['ReturnLabel'],'t-'.$barcode['TrackingNumber'],$bctime);
|
|
|
|
- $read = 'PostalRouting:'.$barcode['PostalRouting'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['TrackingNumber'].'.pdf" target="_blank">'.$barcode['TrackingNumber'].'</a>';
|
|
|
|
|
|
+ $pdf = $this->_pdf($barcode['returnLabelImage'],'t-'.$barcode['trackingNumber'],$bctime);
|
|
|
|
+ $read = 'PostalRouting:'.$barcode['routingInformation'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['trackingNumber'].'.pdf" target="_blank">'.$barcode['trackingNumber'].'</a>';
|
|
$this->$fu->save(array('returndata'=>$read),$data['id']);
|
|
$this->$fu->save(array('returndata'=>$read),$data['id']);
|
|
echo json_encode(array('msg'=>'生成Return Label成功!','data'=>$read,'success'=>true));exit;
|
|
echo json_encode(array('msg'=>'生成Return Label成功!','data'=>$read,'success'=>true));exit;
|
|
}
|
|
}
|