|
@@ -1667,7 +1667,8 @@ class Systemprint extends Start_Controller {
|
|
|
$text['name'] = '独立站';
|
|
$text['name'] = '独立站';
|
|
|
}
|
|
}
|
|
|
$text['express'] = $fullorder['express'];
|
|
$text['express'] = $fullorder['express'];
|
|
|
- $text['country'] = $fullorder['country'];
|
|
|
|
|
|
|
+ //$text['country'] = $fullorder['country'];
|
|
|
|
|
+ $text['country'] = $this->logic_order->getCountry($fullorder['country']);
|
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
|
$text['number'] = $fullorder['number'];
|
|
$text['number'] = $fullorder['number'];
|
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
|
@@ -1697,7 +1698,8 @@ class Systemprint extends Start_Controller {
|
|
|
$text['name'] = '独立站';
|
|
$text['name'] = '独立站';
|
|
|
}
|
|
}
|
|
|
$text['express'] = $fullorder['express'];
|
|
$text['express'] = $fullorder['express'];
|
|
|
- $text['country'] = $fullorder['country'];
|
|
|
|
|
|
|
+ //$text['country'] = $fullorder['country'];
|
|
|
|
|
+ $text['country'] = $this->logic_order->getCountry($fullorder['country']);
|
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
|
$text['number'] = $fullorder['number'];
|
|
$text['number'] = $fullorder['number'];
|
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
|
@@ -1722,7 +1724,8 @@ class Systemprint extends Start_Controller {
|
|
|
$text['name'] = '独立站';
|
|
$text['name'] = '独立站';
|
|
|
}
|
|
}
|
|
|
$text['express'] = $fullorder['express'];
|
|
$text['express'] = $fullorder['express'];
|
|
|
- $text['country'] = $fullorder['country'];
|
|
|
|
|
|
|
+ //$text['country'] = $fullorder['country'];
|
|
|
|
|
+ $text['country'] = $this->logic_order->getCountry($fullorder['country']);
|
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
$text['orderinfo'] = $fullorder['orderinfo'];
|
|
|
$text['number'] = $fullorder['number'];
|
|
$text['number'] = $fullorder['number'];
|
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
|
$text['shipremarks'] = $fullorder['shipremarks'];
|
