Merge branch 'feature/theo-translate' into feature/york-1365-i18n-inpro-0613

common/models/Order.php

@@ -40,6 +40,8 @@ use Yii;
  * @property int $PROVINCE 省份名称
  * @property int $CITY 城市名称
  * @property int $COUNTY 县区
+ * @property string $LGA_NAME
+ * @property string $CITY_NAME
  * @property string $ADDRESS 详细地址
  * @property string $P_CALC_MONTH 分区日期
  * @property int $CREATED_AT 订单创建时间

common/models/forms/OrderForm.php

@@ -610,7 +610,7 @@ class OrderForm extends Model
         $orderModel->STATUS = ($this->payType == 'pay_stack' ? \Yii::$app->params['orderStatus']['notPaid']['value'] : \Yii::$app->params['orderStatus']['paid']['value']);
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->CREATE_USER = $userName;
-        $orderModel->EMAIL = $userEmail;
+        $orderModel->EMAIL = $userEmail?$userEmail:$userName.'@elken.com';
         $orderModel->ORDER_AMOUNT_STANDARD = $this->_decAmountStandard;
         $orderModel->PAY_AMOUNT_STANDARD = $this->_standardAmount;
         $orderModel->EXCHANGE_RATE = $exchangeRate;
@@ -621,7 +621,9 @@ class OrderForm extends Model
             $orderModel->PROVINCE = 1;
             $orderModel->CITY = 1;
             $orderModel->COUNTY = 1;
-            $orderModel->ADDRESS = '';
+            $orderModel->LGA_NAME = $this->_address['LGA_NAME'];
+            $orderModel->CITY_NAME = $this->_address['CITY_NAME'];
+            $orderModel->ADDRESS = 'Self Pick-up';
         }
         if(!$orderModel->save()){
             $this->addErrors($orderModel->getErrors());