xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/ru' into develop

Browse Source 
# Conflicts:
#	config/constants/Constants.php
This commit is contained in:
HESU\HESU
2025-04-07 11:54:29 +08:00
parent 40fff988ce 6247d8cf4d
commit 6baf3dd44f
7 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/model/Customer.php
+7 -7
View File
@@ -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);