Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
周少峰
9 years ago
Commit
034c09d085b6b93886050c8463dcfbdf439c2d09
2 parents
fb2e504d
31b80342
master
...
develop
feature/4LevelAddr
feature/birthCoupon
feature/cartEvent
feature/colorLength
feature/commentImgShow
feature/deleteMark
feature/favShopDelAll
feature/help
feature/jitTip
feature/paySuccess
feature/seoUrl
feature/shoppingCart
feature/wholesaleFrom5.3
gray
hotfix/firefoxCart
hotfix/govLink
hotfix/newPy
hotfix/serviceSwitch
hotfix/studentSwitch
hotfix/yas2.1.2
release/5.3.1
release/5.4
release/5.4.1
release/5.5
5.4.3
5.4.2
5.4.1
5.4.0
5.3.8
5.3.7
5.3.6
5.3.5
5.3.4
5.3.3
5.3.2
5.3.1
5.3.0
5.2.4
5.2.3
5.2.2
5.2.1
5.2.0
5.1.5
5.1.4
5.1.2
5.1.1
5.1.0
5.0.4
5.0.3
5.0.2
5.0.1
5.0.0.before
4.9.24
4.9.23
4.9.22
4.9.21
4.9.20
4.9.19
4.9.18
4.9.15.pinyou
4.9.14.icon
Merge branch 'hotfix/openInvoice'
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
template/www.yohobuy.com/actions/cart/index/order-ensure.phtml
yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
template/www.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @
034c09d
...
...
@@ -413,12 +413,12 @@
</div>
<div class="receipt-type receipt-margin">
<span class="e-receipt curser-buttonn receipt-type-selected ">电子发票</span>
<span class="paper-receipt curser-button">纸质发票</span>
<span class="e-receipt curser-buttonn {{#if openInvoice}} receipt-type-selected {{^}} hide {{/if}}">电子发票</span>
<span class="paper-receipt curser-button {{#unless openInvoice}}receipt-type-selected{{/unless}}">纸质发票</span>
</div>
<div class="receipt-container receipt-margin">
<div class="e-receipt-desc">
<div class="e-receipt-desc
{{#unless openInvoice}}hide{{/unless}}
">
<a href="{{invoiceUrl}}" target="_blank"></a>
</div>
...
...
@@ -450,7 +450,7 @@
</div>
</div>
<div class="invoice-list invoice-phone">
<div class="invoice-list invoice-phone
{{#unless openInvoice}}hide{{/unless}}
">
<span class="invoice-star">*</span>
<span class="invoice-list-type">收票人手机</span>
<div class="invoice-line first-line input-line">
...
...
yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @
034c09d
...
...
@@ -259,6 +259,7 @@ class IndexController extends WebAction
$this
->
_view
->
display
(
'order-ensure'
,
array
(
'orderEnsurePage'
=>
true
,
'openInvoice'
=>
false
,
//是否开启电子发票
'orderEnsure'
=>
$orderEnsure
,
));
}
...
...
Please
register
or
login
to post a comment