Преглед изворни кода

bugfix: EK-1569: 报单时无法使用PayStack支付.

kevinElken пре 8 месеци
родитељ
комит
6da56bf213
1 измењених фајлова са 23 додато и 17 уклоњено
  1. 23 17
      common/models/forms/ApproachReconsumeOrderForm.php

+ 23 - 17
common/models/forms/ApproachReconsumeOrderForm.php

@@ -42,40 +42,46 @@ use yii\base\Exception;
  */
 class ApproachReconsumeOrderForm extends Model
 {
-    public $sn;
-    public $expressCompany;
-    public $orderTrackNo;
-    public $status;
-    public $remark;
-    public $note;
-
     public $type;
-    public $addressId;
-    public $payType;
+    public $decLv;
+    public $packageId;
     public $goodsId;
     public $goodsNum;
+    public $insertUserName;
+    public $password;
     public $payPassword;
+    public $realName;
+    public $insertUserIdCard;
+    public $mobile;
     public $email;
-
-    public $userName;
+    public $address;
+    public $openBank;
+    public $bankAddress;
+    public $bankNo;
+    public $bankProvince;
+    public $bankCity;
+    public $bankCounty;
+    public $conUserName;
+    public $recUserName;
     public $decUserName;
+    public $location;
     public $consignee;
     public $acceptMobile;
+    public $countryId;
     public $province;
     public $city;
     public $county;
-    public $lgaName;
     public $cityName;
-    public $detailaddress;
+    public $lgaName;
 
-    private $_address;
+    // 传过来的全部数据
+    public $allData;
     private $_decAmount;
     private $_decPv;
-    private $_freight;
-    private $_payAmount;
     private $_orderGoods;
     private $_standardAmount;
     private $_decAmountStandard;
+    public $period;
 
     /**
      * @var ApproachOrder
@@ -96,7 +102,7 @@ class ApproachReconsumeOrderForm extends Model
     {
         return [
             [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province',/*'city','county',*/'lgaName','cityName','detailaddress','email'], 'trim'],
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province',/*'city','county',*/'detailaddress'/*,'email'*/], 'required'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/,'decUserName'], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],