|
@@ -1043,7 +1043,7 @@ class Fullordertt extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81 || $post['express'] == 83 || $post['express'] == 85) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['express'] != 83 && $post['express'] != 85 && $post['type'] == 5))
|
|
|
|
|
|
|
+ if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81 || $post['express'] == 83 || $post['express'] == 85 || $post['express'] == 87) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['express'] != 83 && $post['express'] != 85 & $post['express'] != 87 && $post['type'] == 5))
|
|
|
{
|
|
{
|
|
|
echo json_encode(array('msg'=>'此快递方式不可从美仓发货!','success'=>false));exit;
|
|
echo json_encode(array('msg'=>'此快递方式不可从美仓发货!','success'=>false));exit;
|
|
|
}
|
|
}
|
|
@@ -1543,7 +1543,7 @@ class Fullordertt extends Start_Controller {
|
|
|
$product = $a;
|
|
$product = $a;
|
|
|
}
|
|
}
|
|
|
$this->data['product'] = $product;
|
|
$this->data['product'] = $product;
|
|
|
- if(in_array($fullordertt['express'],[85])){
|
|
|
|
|
|
|
+ if(in_array($fullordertt['express'],[85,87])){
|
|
|
if(empty($fullordertt['extra_text'])){
|
|
if(empty($fullordertt['extra_text'])){
|
|
|
$this->data['serve_list'] = [];
|
|
$this->data['serve_list'] = [];
|
|
|
}else{
|
|
}else{
|
|
@@ -1776,12 +1776,12 @@ class Fullordertt extends Start_Controller {
|
|
|
echo json_encode(array('msg'=>'非英国无法选择CNE和GES!','success'=>false));exit;
|
|
echo json_encode(array('msg'=>'非英国无法选择CNE和GES!','success'=>false));exit;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if($post['type'] != 5 && in_array($post['express'],[2,63,64,81,83,85]))
|
|
|
|
|
|
|
+ if($post['type'] != 5 && in_array($post['express'],[2,63,64,81,83,85,87]))
|
|
|
{
|
|
{
|
|
|
echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
|
|
echo json_encode(array('msg'=>"此快递方式必须从美仓发货!",'success'=>false));exit;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85]))
|
|
|
|
|
|
|
+ if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81,83,85,87]))
|
|
|
{
|
|
{
|
|
|
echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
|
|
echo json_encode(array('msg'=>"此快递方式不能美仓发货!",'success'=>false));exit;
|
|
|
}
|
|
}
|