Merge branch 'feature/ru' into develop

# Conflicts:
#	config/constants/Constants.php

app/controller/CarTypeController.php

@@ -18,9 +18,13 @@ class CarTypeController
         $list = CarType::getAll();
 
         if($request->user['language'] != 'zh_CN'){
-            foreach ($list as $key => &$value) {
+            foreach ($list as &$value) {
                 $value['name'] = $value['name_en'];
             }
+        }elseif ($request->user['language'] == 'ru'){
+            foreach ($list as &$value) {
+                $value['name'] = $value['name_ru'];
+            }
         }
 
         return Util::success($list);

app/controller/CustomerController.php

@@ -33,6 +33,8 @@ class CustomerController
         $gradeConstants = Constants::GRADE_EN;
         if($request->user['language'] == 'zh_CN'){
             $gradeConstants = Constants::GRADE;
+        }elseif ($request->user['language'] == 'ru'){
+            $gradeConstants = Constants::GRADE_RU;
         }
         foreach ($gradeConstants as $key => $value) {
             $grade[] = [
@@ -54,6 +56,8 @@ class CustomerController
         $magnitudeConstants = Constants::MAGNITUDE_EN;
         if($request->user['language'] == 'zh_CN'){
             $magnitudeConstants = Constants::MAGNITUDE;
+        }elseif ($request->user['language'] == 'ru'){
+            $magnitudeConstants = Constants::MAGNITUDE_RU;
         }
         foreach ($magnitudeConstants as $key => $value) {
             $grade[] = [
@@ -74,9 +78,13 @@ class CustomerController
         $list = Channel::getAll();
 
         if($request->user['language'] != 'zh_CN'){
-            foreach ($list as $key => &$value) {
+            foreach ($list as &$value) {
                 $value['name'] = $value['name_en'];
             }
+        }elseif ($request->user['language'] == 'ru'){
+            foreach ($list as &$value) {
+                $value['name'] = $value['name_ru'];
+            }
         }
 
         return Util::success($list);

app/controller/UserController.php

@@ -330,7 +330,7 @@ class UserController
         if (Util::isEmpty($language)) {
             return Util::fail([], 'language' . trans('not_null'));
         }
-        if (!in_array($language, ['en', 'zh_CN'])) {
+        if (!in_array($language, ['en', 'zh_CN','ru'])) {
             return Util::fail([], trans('param_error'));
         }
         $data = [

app/model/Customer.php

@@ -68,19 +68,19 @@ class Customer extends Model
     public static function getCustomer($customer, $request, $tag = false)
     {
         $language = $request->user['language'] ?: 'en';
-        $customer['grade_txt'] = $language=='en'?Constants::GRADE_EN[$customer['grade']]:Constants::GRADE[$customer['grade']];
-        $customer['magnitude_txt'] = $language=='en'?Constants::MAGNITUDE_EN[$customer['magnitude']]:Constants::MAGNITUDE[$customer['magnitude']];
-        $customer['sex_txt'] = $language=='en'?Constants::SEX_EN[$customer['sex']]:Constants::SEX[$customer['sex']];
+        $customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE[$customer['grade']], Constants::GRADE_RU[$customer['grade']]);
+        $customer['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['grade']], Constants::MAGNITUDE[$customer['grade']], Constants::MAGNITUDE_RU[$customer['grade']]);
+        $customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['grade']], Constants::SEX[$customer['grade']], Constants::SEX_RU[$customer['grade']]);
 
         if ($customer['grade']<=2) {
             $customer['follow'] = 0;
-            $customer['follow_txt'] = ($language == 'en' ? 'Following' : '跟进中');
+            $customer['follow_txt'] = Util::language($language,'Following','跟进中','Продолжение');
         }elseif ($customer['grade']<5) {
             $customer['follow'] = 1;
-            $customer['follow_txt'] = ($language == 'en' ? 'transacted' : '已成交');
+            $customer['follow_txt'] = Util::language($language,'transacted','已成交','Транзакция завершена');
         }else{
             $customer['follow'] = 2;
-            $customer['follow_txt'] = ($language == 'en' ? 'lost' : '已流失');
+            $customer['follow_txt'] = Util::language($language,'lost','已流失','Потерянный');
         }
 
         $where = [
@@ -96,7 +96,7 @@ class Customer extends Model
 //        $customer['updated_at'] = Util::timeTotDate($customer['updated_at']);
 
         $customer = Util::formatDate($customer,['follow_last']);
-        $nameLang = $language=='en'?'name_en':'name';
+        $nameLang = $language=='en'?'name_en':($language=='ru'?'name_ru':'name');
         $countryLang = $language=='en'?'en_addr':'cn_addr';
         $customer['car_type_name'] = empty($customer['car_type_id'])?'':CarType::where(['id'=>$customer['car_type_id']])->value($nameLang);
         $customer['country_name'] = empty($customer['country_id'])?'':Country::where(['id'=>$customer['country_id']])->value($countryLang);

app/util/Util.php

@@ -105,4 +105,17 @@ class Util
         return $value;
     }
 
+    /**
+     * 格式化创建时间
+     */
+    public static function language($language = 'en',$en,$zh_CN,$ru)
+    {
+        if ($language == 'zh_CN'){
+            return $zh_CN;
+        }elseif ($language == 'ru'){
+            return $ru;
+        }
+        return $en;
+    }
+
 }