Commit e17f10b0 by 朱继来

添加判断

parent afe1b3c0
Showing with 9 additions and 8 deletions
...@@ -236,11 +236,11 @@ ...@@ -236,11 +236,11 @@
发票信息 发票信息
<!-- 发票状态小于2(已发货)且更改权限存在 显示按钮 --> <!-- 发票状态小于2(已发货)且更改权限存在 显示按钮 -->
@if (!isset($_REQUEST['tags'])) @if (!isset($_REQUEST['tags']))
@if ($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms)) @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
<a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
@if ($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms)) @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
<a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
...@@ -384,6 +384,7 @@ ...@@ -384,6 +384,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if (!empty($order_items_info))
@foreach ($order_items_info as $v) @foreach ($order_items_info as $v)
<tr> <tr>
<td>{{$v['goods_name']}}</td> <td>{{$v['goods_name']}}</td>
...@@ -405,7 +406,7 @@ ...@@ -405,7 +406,7 @@
@endif @endif
</tr> </tr>
@endforeach @endforeach
@endif
</tbody> </tbody>
<tfoot> <tfoot>
...@@ -418,6 +419,11 @@ ...@@ -418,6 +419,11 @@
<div class="tabs-box order-total"> <div class="tabs-box order-total">
<div> <div>
<table> <table>
<tr>
<td>商品总额:</td>
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price']}}</span></td>
</tr>
@if (isset($order_price_info['ext_price'])) @if (isset($order_price_info['ext_price']))
<tr> <tr>
<td>附加款:</td> <td>附加款:</td>
...@@ -427,11 +433,6 @@ ...@@ -427,11 +433,6 @@
</tr> </tr>
@endif @endif
<tr>
<td>商品总额:</td>
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['goods_price']}}</span></td>
</tr>
@if ($order_price_info['shipping_price'] != 0) @if ($order_price_info['shipping_price'] != 0)
<tr> <tr>
<td>快递费用:</td> <td>快递费用:</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment