Authored by 周少峰

Merge branch 'hotfix/openInvoice'

... ... @@ -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">
... ...
... ... @@ -259,6 +259,7 @@ class IndexController extends WebAction
$this->_view->display('order-ensure', array(
'orderEnsurePage' => true,
'openInvoice' => false, //是否开启电子发票
'orderEnsure' => $orderEnsure,
));
}
... ...