|
@@ -588,8 +588,19 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ $tt_cate_one = [];
|
|
|
|
|
+ $tt_cate_two = [];
|
|
|
|
|
+ if($sj == 'fullordertt'){
|
|
|
|
|
+ if(strpos($feq,'ttcateone')!== false){
|
|
|
|
|
+ $feq = str_replace('ttcateone,',"cate_one as ttcateone,",$feq);
|
|
|
|
|
+ $tt_cate_one = $this->fullordertt->getCateOne();
|
|
|
|
|
+ $tt_cate_two = $this->fullordertt->getCateTwo();
|
|
|
|
|
+ }
|
|
|
|
|
+ if(strpos($feq,'ttcatetwo')!== false){
|
|
|
|
|
+ $feq = str_replace('ttcatetwo,',"cate_two as ttcatetwo,",$feq);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
-
|
|
|
|
|
//$dbapi_nocc
|
|
//$dbapi_nocc
|
|
|
if(strpos($feq,'dbapinocc')!= false){
|
|
if(strpos($feq,'dbapinocc')!= false){
|
|
|
$feq = str_replace('dbapinocc,',"fpdata as dbapinocc,",$feq);
|
|
$feq = str_replace('dbapinocc,',"fpdata as dbapinocc,",$feq);
|
|
@@ -1237,6 +1248,21 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$info_list[$key]['js'] = 'FICP';
|
|
$info_list[$key]['js'] = 'FICP';
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if(isset($value['ttcateone'])){
|
|
|
|
|
+ $info_list[$key]['ttcateone'] = isset($tt_cate_one[$value['ttcateone']])?$tt_cate_one[$value['ttcateone']]:'';
|
|
|
|
|
+ }
|
|
|
|
|
+ if(isset($value['ttcatetwo'])){
|
|
|
|
|
+ $str = "";
|
|
|
|
|
+ if(isset($tt_cate_two[$value['ttcateone']])){
|
|
|
|
|
+ if(isset($tt_cate_two[$value['ttcateone']][$value['ttcatetwo']])){
|
|
|
|
|
+ $str = $tt_cate_two[$value['ttcateone']][$value['ttcatetwo']];
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ $info_list[$key]['ttcatetwo'] = $str;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
if(isset($value['type']))
|
|
if(isset($value['type']))
|
|
|
{
|
|
{
|
|
|
$type = $this->warehouse->read($value['type']);
|
|
$type = $this->warehouse->read($value['type']);
|