|
@@ -795,9 +795,9 @@ class SalesOrderService extends Service
|
|
$data['data'][$key]['product'] = $product[$value['id']] ?? [];
|
|
$data['data'][$key]['product'] = $product[$value['id']] ?? [];
|
|
$data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
|
|
$data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
|
|
if($value['sales_order_type'] == SalesOrder::Order_type_one){
|
|
if($value['sales_order_type'] == SalesOrder::Order_type_one){
|
|
- $data['data'][$key]['state_name'] = SalesOrder::$state[$value['state']] ?? '';
|
|
|
|
|
|
+ $data['data'][$key]['state_title'] = SalesOrder::$state[$value['state']] ?? '';
|
|
}else{
|
|
}else{
|
|
- $data['data'][$key]['state_name'] = SalesOrder::$state2[$value['state']] ?? '';
|
|
|
|
|
|
+ $data['data'][$key]['state_title'] = SalesOrder::$state2[$value['state']] ?? '';
|
|
}
|
|
}
|
|
$data['data'][$key]['invoice_state_name'] = SalesOrder::$invoice_state[$value['invoice_state']] ?? '';
|
|
$data['data'][$key]['invoice_state_name'] = SalesOrder::$invoice_state[$value['invoice_state']] ?? '';
|
|
$tmp = $invoiceData[$value['id']] ?? [];
|
|
$tmp = $invoiceData[$value['id']] ?? [];
|