Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 55a02cd2 by 朱继来
Options

调整邮件按钮

parent dffc703c
Inline Side-by-side
Showing with 2 additions and 3 deletions
app/Http/Controllers/OrderController.php
...@@ -2120,7 +2120,6 @@ Class OrderController extends Controller ...@@ -2120,7 +2120,6 @@ Class OrderController extends Controller
$send_buyers[$value['buyer_id']]['data'][] = $tmp; $send_buyers[$value['buyer_id']]['data'][] = $tmp;
$send_buyers[$value['buyer_id']]['toUser'] = $value['send_email']; $send_buyers[$value['buyer_id']]['toUser'] = $value['send_email'];
$send_buyers[$value['buyer_id']]['date'] = date('Y-m-d',time()); $send_buyers[$value['buyer_id']]['date'] = date('Y-m-d',time());
$send_buyers[$value['buyer_id']]['date'] = intval($id);
$send_buyers[$value['buyer_id']]['id'] = $sale_name; $send_buyers[$value['buyer_id']]['id'] = $sale_name;
$to_user_array[] = $value['send_email']; $to_user_array[] = $value['send_email'];
......
resources/views/detail/content.blade.php
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
@endif @endif
<!-- 判断邮件发送时机 --> <!-- 判断邮件发送时机 -->
@if (!empty($order_temp_info['erp_sn']) ) @if (!empty($order_temp_info['erp_sn']) && in_array($order_info['status'], [2, 3, 4]))
<a class="btn btn-primary send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a> <a class="btn btn-primary send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a>
@endif @endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 --> <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
......
resources/views/orderlist/content.blade.php
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
<a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a> <a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a>
@endif @endif
@if (!empty($order_extend->erp_sn)) @if (!empty($order_extend->erp_sn) && in_array($v['status'], [2, 3, 4]))
<a class="btn btn-warning send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a> <a class="btn btn-warning send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>
@endif @endif
......
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