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
f954dedf
authored
Aug 22, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_create_order_20180813' into development
parents
f40551fa
11abd980
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
app/Http/Controllers/OrderController.php
resources/views/detail/content.blade.php
app/Http/Controllers/OrderController.php
View file @
f954dedf
...
...
@@ -881,6 +881,10 @@ Class OrderController extends Controller
$data
[
'shippings'
]
=
$shippingInfo
;
}
$extend
=
DB
::
connection
(
'order'
)
->
table
(
'lie_order_extend'
)
->
where
([
'order_id'
=>
$id
,
'order_type'
=>
3
])
->
first
();
$data
[
'extend'
]
=
$extend
?
$extend
:
''
;
}
return
view
(
$view_id
,
$data
);
...
...
resources/views/detail/content.blade.php
View file @
f954dedf
...
...
@@ -245,7 +245,7 @@
@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>
@endif
@elseif (isset($_REQUEST['tags'])
&&
$_REQUEST['tags'] == 'self'
&&
$user_mobile != Config('website.internal-account')
)
@elseif (isset($_REQUEST['tags'])
&&
$_REQUEST['tags'] == 'self'
&&
!$extend
)
@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>
@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