Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
55a02cd2
authored
Jun 23, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整邮件按钮
parent
dffc703c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
app/Http/Controllers/OrderController.php
resources/views/detail/content.blade.php
resources/views/orderlist/content.blade.php
app/Http/Controllers/OrderController.php
View file @
55a02cd2
...
...
@@ -2120,7 +2120,6 @@ Class OrderController extends Controller
$send_buyers
[
$value
[
'buyer_id'
]][
'data'
][]
=
$tmp
;
$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'
]
=
intval
(
$id
);
$send_buyers
[
$value
[
'buyer_id'
]][
'id'
]
=
$sale_name
;
$to_user_array
[]
=
$value
[
'send_email'
];
...
...
resources/views/detail/content.blade.php
View file @
55a02cd2
...
...
@@ -175,7 +175,7 @@
@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>
@endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
...
...
resources/views/orderlist/content.blade.php
View file @
55a02cd2
...
...
@@ -361,7 +361,7 @@
<a
class=
"btn btn-danger manager-audit"
data-id=
"{{$v['order_id']}}"
>
主管审核
</a>
@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>
@endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment