Merge branch 'hotfix/openInvoice'

@@ -51,7 +51,8 @@ function invoiceInit() {
     if (orderCont.invoiceType) {
         $('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')');
     } else {
-        $('.invoice-type').text('服装(电子)');
+        //$('.invoice-type').text('服装(电子)');
+        $('.invoice-type').text('服装(纸质)');
     }
 }
 
@@ -138,7 +139,7 @@ $invoice.on('touchend', '.checkbox', function() {
         orderInfo('invoiceText', '');
         orderInfo('invoiceType', '7');
         orderInfo('receiverMobile', $('.user-mobile').val());
-        orderInfo('invoicesType', '2');
+        orderInfo('invoicesType', '1');
         orderInfo('invoiceTitle', '个人');
     }
     if ($this.hasClass('icon-radio')) {

@@ -404,7 +404,7 @@ class IndexController extends AbstractAction
             $invoices_title = '';
             $invoiceType = '7'; //发票类型ID
             $invoices_type = '1'; //发票类型 /**纸质 1 ，电子 2    */
-            $invoices_type = '2'; //发票类型 /**纸质 1 ，电子 2    */
+//            $invoices_type = '2'; //发票类型 /**纸质 1 ，电子 2    */
             $invoice_Top = '个人';
         }
 
@@ -417,11 +417,11 @@ class IndexController extends AbstractAction
             'companyName' => $invoices_title,
             'isPaper' => $invoices_type == 1 ? true : false,
             'invoicesType' => array(
-                array(
-                    'id' => '2',
-                    'type' => '电子发票',
-                    'choosed' => empty($invoices_type) || $invoices_type == 2 ? true : false,
-                ),
+//                array(
+//                    'id' => '2',
+//                    'type' => '电子发票',
+//                    'choosed' => empty($invoices_type) || $invoices_type == 2 ? true : false,
+//                ),
                 array(
                     'id' => '1',
                     'type' => '纸质发票',