支付中间表调整为非洲格式地址相关，合并feature/york-1365-i18n-inpro-0613

common/models/ApproachOrder.php

@@ -116,6 +116,8 @@ class ApproachOrder extends \common\components\ActiveRecord
             'PROVINCE' => '省份名称',
             'CITY' => '城市名称',
             'COUNTY' => '县区',
+            'LGA_NAME' => 'lga name',
+            'CITY_NAME' => 'City name',
             'ADDRESS' => '详细地址',
             'P_CALC_MONTH' => '分区日期',
             'CREATED_AT' => '订单创建时间',

common/models/forms/ApproachOrderForm.php

@@ -48,6 +48,8 @@ class ApproachOrderForm extends Model
     public $province;
     public $city;
     public $county;
+    public $lgaName;
+    public $cityName;
     public $detailaddress;
 
     private $_address;
@@ -75,8 +77,8 @@ class ApproachOrderForm extends Model
     public function rules()
     {
         return [
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','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','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'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
             [['payType'], 'isPayType'],
@@ -103,6 +105,8 @@ class ApproachOrderForm extends Model
             'province' => '省',
             'city' => '市',
             'county' => '区',
+            'lgaName' => 'lga name',
+            'cityName' => 'City Name',
             'detailaddress' => '收货详细地址',
             'email' => 'Email',
         ];
@@ -430,8 +434,10 @@ class ApproachOrderForm extends Model
         $orderModel->CONSIGNEE = $this->_address['CONSIGNEE'];
         $orderModel->MOBILE = $this->_address['MOBILE'];
         $orderModel->PROVINCE = $this->_address['PROVINCE'];
-        $orderModel->CITY = $this->_address['CITY'];
-        $orderModel->COUNTY = $this->_address['COUNTY'];
+//        $orderModel->CITY = $this->_address['CITY'];
+//        $orderModel->COUNTY = $this->_address['COUNTY'];
+        $orderModel->LGA_NAME = $this->_address['LGA_NAME'];
+        $orderModel->CITY_NAME = $this->_address['CITY_NAME'];
         $orderModel->ADDRESS = $this->_address['ADDRESS'];
         $orderModel->FRONT_REMARK = $this->remark;
         $orderModel->WAREHOUSE = $warehouse;

common/models/forms/OrderForm.php

@@ -76,7 +76,7 @@ class OrderForm extends Model
     public function rules()
     {
         return [
-            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress','email'], 'trim'],
+            [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province'/*,'city','county'*/,'cityName','lgaName','detailaddress','email'], 'trim'],
             [['sn', 'expressCompany', 'orderTrackNo', 'status', 'remark','type','addressId','payType','goodsId','goodsNum', 'payPassword','userName','consignee','acceptMobile','province','city','county','detailaddress'/*,'email'*/], 'required'],
             [['status'], 'isStatus'],
             [['addressId'], 'isAddress'],
@@ -104,6 +104,8 @@ class OrderForm extends Model
             'province' => '省',
             'city' => '市',
             'county' => '区',
+            'lgaName' => 'lga name',
+            'cityName' => 'city name',
             'detailaddress' => '收货详细地址',
             'email' => 'Email',
         ];

frontendApi/modules/v1/controllers/ShopController.php

@@ -244,17 +244,23 @@ class ShopController extends BaseController {
             $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::SALE_TYPE, NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
             $data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
             $data['list'][$key]['CATEGORY'] = array_column(ShopGoods::CATEGORY_TYPE, NULL, 'id')[$value['CATEGORY_TYPE']]['name'] ?? '普通商品';
-            $data['list'][$key]['FULL_ADDRESS'] = '';
-            if($value['PROVINCE']){
-                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['PROVINCE']);
+            $data['list'][$key]['FULL_ADDRESS'] = $value['ADDRESS'];//.', '.$value['CITY_NAME'].', '.$value['LGA_NAME'];
+            if($value['CITY_NAME']){
+                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . $value['CITY_NAME'];
             }
-            if($value['CITY']){
-                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['CITY']);
+            if($value['LGA_NAME']){
+                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . $value['LGA_NAME'];
             }
-            if($value['COUNTY']){
-                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['COUNTY']);
+            if($value['PROVINCE']){
+                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . Region::getCnName($value['PROVINCE']);
             }
-            $data['list'][$key]['FULL_ADDRESS'] .= $value['ADDRESS'];
+//            if($value['CITY']){
+//                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['CITY']);
+//            }
+//            if($value['COUNTY']){
+//                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['COUNTY']);
+//            }
+
         }
         return static::notice($data);
     }

frontendEle/src/views/shop/order-list.vue

@@ -22,7 +22,7 @@
                 <el-table-column width="120" label="Member Name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
                 <el-table-column width="130" label="Recipient name" prop="CONSIGNEE"></el-table-column><!--收货人-->
                 <el-table-column width="120" label="Phone number" prop="MOBILE"></el-table-column><!--收货电话-->
-                <el-table-column width="150" label="Receiving address" prop="FULL_ADDRESS"></el-table-column><!--收获地址-->
+                <el-table-column width="150" label="Receiving address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
                 <el-table-column label="支付方式" prop="PAY_TYPE"></el-table-column>
                 <el-table-column width="120" label="Created time" prop="PAY_AT"></el-table-column><!--支付时间-->
                 <el-table-column label="订单状态" prop="STATUS"></el-table-column>

frontendEle/src/views/shop/order.vue

@@ -94,7 +94,7 @@
 <!--                        </div>-->
                         <div class="sum_box">
                             <div>Account Balance</div><!-- 账户余额 -->
-                            <div>$ {{ balance.cash }} US</div>
+                            <div>₦ {{ balance.cash }} NGN</div>
                         </div>
                         <div class="sum_box">
                             <div>Exchange points</div><!-- 兑换点数 -->
@@ -195,8 +195,8 @@
                 payPassword:'',
                 submitButtonStat:false,
                 category_type: '',
-                prefixSign: '$',
-                unit: 'US',
+                prefixSign: '₦',
+                unit: 'NGN',
 
                 visible: false,
                 payStackLoading: false,
@@ -352,7 +352,7 @@
                         })
                     } else {
                         // 非PayStack支付
-                        return network.postData(serviceApi, params).then((response) => {
+                        return network.postData('shop/sure-order', params).then((response) => {
                             this.submitButtonStat = false
 
                                 // 非PayStack支付