hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去掉stiReport插件相关调用

Browse Source
This commit is contained in:
hawind
2021-06-08 21:40:11 +08:00
parent de2a0ff193
commit dcddd8e35a
4 changed files with 12 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Model/views/template/create.blade.php
-1
View File
@@ -220,7 +220,6 @@
<select class="input-select2 form-control input-sm" id="print_type" name="print_type" data-width="100%">
<option value="html" @if($template['print_type'] == 'html') selected @endif>html</option>
<option value="pdf" @if($template['print_type'] == 'pdf') selected @endif>pdf</option>
<option value="stiReport" @if($template['print_type'] == 'stiReport') selected @endif>stiReport</option>
</select>
</div>
</div>
app/Gdoo/Order/Controllers/OrderController.php
+6 -18
View File
@@ -738,27 +738,15 @@ class OrderController extends WorkflowController
$print_type = $template['print_type'];
$this->layout = 'layouts.print_'.$print_type;
if ($print_type == 'stiReport') {
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = OrderService::getPrintData($id);
$print_data = [
'master' => [$data['master']],
'customer_order_data' => $data['rows'],
];
return $this->display([
'template' => $template,
'print_data' => $print_data,
]);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = OrderService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
public function dialog()
app/Gdoo/Stock/Controllers/DeliveryController.php
+6 -18
View File
@@ -306,27 +306,15 @@ class DeliveryController extends WorkflowController
$this->layout = 'layouts.print_'.$print_type;
// 打印插件
if ($print_type == 'stiReport') {
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = DeliveryService::getPrintData($id);
$print_data = [
'master' => [$data['master']],
'stock_delivery_data' => $data['rows'],
];
return $this->display([
'template' => $template,
'print_data' => $print_data,
]);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = DeliveryService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
// 物流信息