|
@@ -1913,7 +1913,9 @@ class Systemprint extends Start_Controller {
|
|
|
$fullorder['shipremarks'] = str_replace(array('<','>'),array('<','>'),$fullorder['shipremarks']);
|
|
|
$fullorder['shipremarks'] = str_replace(array('<','>',';',';'),array('<','>',';<br>',';<br>'),$fullorder['shipremarks']);
|
|
|
$shop = $this->shop->read($fullorder['shop']);
|
|
|
+ $fullorder['tmp_shop_id'] = $fullorder['shop'];
|
|
|
$fullorder['shop'] = $shop['shopname'];
|
|
|
+
|
|
|
$shoptype = $this->typeclass->read($shop['type']);
|
|
|
$fullorder['shoptype'] = $shoptype['classtitle'];
|
|
|
$fullorder['city'] = preg_replace('/( | | |\s)/',' ',$fullorder['city']);
|