TPS
/
birzha-legalizasia-frontend
5
0
Fork 0
Code Issues 4 Pull Requests Projects 1 Releases Wiki Activity

developed

This commit is contained in:
Komek Hayytnazarov 2022-10-03 18:11:05 +05:00
parent 798f0565da
commit 6b25d554f1
8 changed files with 99 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/fetch-wrapper.js
View File

@ -30,7 +30,13 @@ function request(method) {
requestOptions.headers["Accept"] = "application/json";
requestOptions.body = isFormData ? body : JSON.stringify(body);
}
return fetch(url, requestOptions).then(handleResponse);
return fetch(url, requestOptions)
.then(handleResponse)
.catch((error) => {
console.log("err on fetch: ", error);
const alertStore = useAlertStore();
alertStore.error(error);
});
};
}
@ -54,7 +60,7 @@ async function handleResponse(response) {
?.includes("application/json");
const data = isJson ? await response.json() : null;
////console.log("response data: ", JSON.stringify(data));
console.log("response data: ", response);
const alertStore = useAlertStore();

3
src/i18n/en.js
View File

@ -120,4 +120,7 @@ export const locale = {
TYPE_TOKEN: "Type code you have received in email",
NEW_PASSWORD: "New password",
LEG_WARN_INFO:
"Чтобы подать документы онлайн, заполните все поля в разделах: Профиль, Контактная информация и Банковские счета",
};

53
src/i18n/ru.js
View File

@ -17,7 +17,7 @@ export const locale = {
NEW_TICKET_FORM: "Создать новое обращение",
CREATED: "Создан",
CREATE_TICKET: "Создать обращение",
TMEX_ADMINS_TEAM: "TMEX Administrators Team",
TMEX_ADMINS_TEAM: "Команда администраторов TMEX",
SIMPLE_HELLO: "Здравствуйте",
PLEASE_SELECT_TICKET: "Пожалуйста, выберите обращение для начала общения.",
TYPE_TICKET_MESSAGE: "Type your ticket message...",
@ -43,10 +43,11 @@ export const locale = {
DOCUMENTS: "Документы",
PLEASE_UPLOAD_DOCUMENTS: "Пожалуйста, загрузите все документы",
APPLY: "Отправить",
UNDER_APP_TITLE_DESC_ONE: "A few more clicks to sign up to your account.",
UNDER_APP_TITLE_DESC_TWO: "Manage all your e-commerce accounts in one place",
UNDER_APP_TITLE_DESC_ONE: "Добро пожаловать в личный кабинет",
UNDER_APP_TITLE_DESC_TWO:
"Здесь вы можете подать документы на легализацию и отслеживать статус контрактов",
SELECT_COUNTRY: "Выберите страну",
ACCOUNT_TYPE: "Account type",
ACCOUNT_TYPE: "Выберете тип аккаунта",
ACCOUNT_TYPE_BUSINESS: "Предприниматель",
ACCOUNT_TYPE_COMPANY: "Юридическое лицо",
@ -60,8 +61,8 @@ export const locale = {
PNAME: "Отчество",
CITIZENSHIP: "Гражданство",
REG_ADDR: "Адрес местонахождения (место регистрации)",
REG_NUMBER: "Registration number",
REG_DATE: "Реестровый номер",
REG_NUMBER: "Реестровый номер",
REG_DATE: "Дата регистрации",
REG_AGENCY: "Орган государственной регистрации",
REG_PLACE: "Место регистрации",
ENT_FORM: "Заявка предпринимателя",
@ -70,14 +71,14 @@ export const locale = {
BANK: "Банковские счета",
BANK_FORM: "Форма банка",
BANK_NAME: "Ниаименование банка",
BANK_NAME: "Наименование банка",
COUNTRY: "Страна",
ACC_NUMBER: "Номер счета",
ACC_DATE: "Дата счета",
CURRENCY: "Валюта",
IBAN: "МФО или SWIFT (IBAN)",
CONTACTS: "Контактна инофрмация",
CONTACTS: "Контактная инофрмация",
CONTACTS_FORM: "Форма контактной информации",
ADDRESS: "Адрес",
PHONE: "Номер телефона",
@ -93,31 +94,35 @@ export const locale = {
REGISTER: "Зарегистрироваться",
EDIT: "Редактировать",
LOGIN: "Login",
LOGIN: "Войти",
FORGOT_PASSWORD: "Forgot Password ?",
FORGOT_PASSWORD: "Забыли пароль?",
TERMS_AND_CONDITIONS: "Terms and Conditions",
PRIVACY_LEGACY: "Privacy Legacy",
BY_SIGN_UP: "By signing up, you agree to our",
SIGN_IN_MOTIVATION: "A few more clicks to",
SING_IN_MOTIVATION_RIGHT: "sign in to your account.",
SIGN_IN_MOTIVATION: "Добро пожаловать",
SING_IN_MOTIVATION_RIGHT: "в личный кабинет.",
SING_IN_MOTIVATION_MOBILE:
" A few more clicks to sign in to your account. Manage all your e-commerce accounts in one place",
MANAGE_DOCS: "Manage all your documents in one place",
"Добро пожаловать в личный кабинет. Здесь вы можете подать документы на легализацию и отслеживать статус контрактов",
MANAGE_DOCS: "",
UPDATE: "Update",
UPDATE_PWD: "Update password",
UPDATE: "Обновить",
UPDATE_PWD: "Сменить пароль",
INT_CONN_ERROR: "Пожалуйста, подключитесь к Интернету и повторите попытку!",
COMP_NAME: "Company Name",
TICKETS: "Tickets",
NEW_TICKET: "New Ticket",
CONTACTS: "Contracts",
COMP_NAME: "наименование компании",
TICKETS: "Все обращения",
NEW_TICKET: "Создать новое обращение",
CONTACTS: "Контакты",
CONTRACTS: "Мониторинг контрактов",
REQUIRED_VALIDATION: "Обязательное поле",
MIN_LENGTH_VALIDATION: "This field should be at least {min} characters long",
EMAIL_VALIDATION: "This field must be a valid email address",
MIN_LENGTH_VALIDATION: "Мин. {min} символов",
EMAIL_VALIDATION: "Введите корректный Email",
TYPE_TOKEN: "Type code you have received in email",
NEW_PASSWORD: "New password",
TYPE_TOKEN: "Введите код, отправленный на Ваш Email",
NEW_PASSWORD: "Новый пароль",
LEG_WARN_INFO:
"Чтобы подать документы онлайн, заполните все поля в разделах: Профиль, Контактная информация и Банковские счета",
};

3
src/i18n/tm.js
View File

@ -120,4 +120,7 @@ export const locale = {
TYPE_TOKEN: "Type code you have received in email",
NEW_PASSWORD: "New password",
LEG_WARN_INFO:
"Чтобы подать документы онлайн, заполните все поля в разделах: Профиль, Контактная информация и Банковские счета",
};

4
src/layouts/top-menu/Main.vue
View File

@ -35,7 +35,7 @@
<ActivityIcon />
</div>
<div class="top-menu__title">
{{ subMenu.title }}
{{ $t(subMenu.title) }}
<ChevronDownIcon v-if="subMenu.subMenu" class="top-menu__sub-icon" />
</div>
</a>
@ -51,7 +51,7 @@
<component :is="'zap-icon'" />
</div>
<div class="top-menu__title">
{{ lastSubMenu.title }}
{{ $t(lastSubMenu.title) }}
</div>
</a>
</li>

2
src/views/profile-forms/Business.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="intro-y flex items-center mt-8">
<h2 class="text-lg font-medium mr-auto">Entrepreneur</h2>
<h2 class="text-lg font-medium mr-auto">{{$t('ACCOUNT_TYPE_BUSINESS')}}</h2>
</div>
<div class="grid grid-cols-12 gap-6 mt-5">
<div class="intro-y col-span-12 lg:col-span-6">

2
src/views/profile-forms/Company.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="intro-y flex items-center mt-8">
<h2 class="text-lg font-medium mr-auto">Entrepreneur</h2>
<h2 class="text-lg font-medium mr-auto">{{$t('ACCOUNT_TYPE_COMPANY')}}</h2>
</div>
<div class="grid grid-cols-12 gap-6 mt-5">
<div class="intro-y col-span-12 lg:col-span-6">

103
src/views/profile/Main.vue
View File

@ -18,34 +18,34 @@
<div class="flex-1">
<!-- Begin first column -->
<div class="flex m-2">
<div class="flex font-medium">{{$t("NAME")}}:</div>
<div class="flex pl-3">{{ profile.name }}</div>
<div class="flex w-1/4 font-medium">{{$t("NAME")}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("SHORT_NAME")}}:</div>
<div class="flex pl-3">{{ profile.short_name }}</div>
<div class="flex w-1/4 font-medium">{{$t("SHORT_NAME")}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.short_name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("REG_NUMBER")}}:</div>
<div class="flex pl-3">{{ profile.registration_number }}</div>
<div class="flex w-1/4 font-medium">{{$t("REG_NUMBER")}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.registration_number }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("REG_DATE")}}:</div>
<div class="flex pl-3">{{ formattedDate }}</div>
<div class="flex w-1/4 font-medium">{{$t("REG_DATE")}}:</div>
<div class="flex w-3/4 pl-3">{{ formattedDate }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("REG_AGENCY")}}:</div>
<div class="flex pl-3">
<div class="flex w-1/4 font-medium">{{$t("REG_AGENCY")}}:</div>
<div class="flex w-3/4 pl-3">
{{ profile.state_registration_agency }}
</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("REG_PLACE")}}:</div>
<div class="flex pl-3">{{ profile.registration_place }}</div>
<div class="flex w-1/4 font-medium">{{$t("REG_PLACE")}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.registration_place }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{$t("REG_ADDR")}}:</div>
<div class="flex pl-3">{{ profile.registration_address }}</div>
<div class="flex w-1/4 font-medium">{{$t("REG_ADDR")}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.registration_address }}</div>
</div>
</div>
@ -61,7 +61,7 @@
<!-- BEGIN: Entrepreneur -->
<PreviewComponent v-else="accountType == 'business'" class="intro-y box flex flex-col">
<div class="flex flex-col sm:flex-row items-center p-5 border-b border-slate-200/60 dark:border-darkmode-400">
<h2 class="font-medium text-base mr-auto">Profile</h2>
<h2 class="font-medium text-base mr-auto">{{$t('PROFILE')}}</h2>
<div class="form-check form-switch w-full sm:w-auto sm:ml-auto mt-3 sm:mt-0 text-center">
<a href="javascript:;" @click.prevent="onEdit(accountType, profile)" class="btn btn-primary">
<EditIcon class="w-4 h-4 mr-3" /> {{ $t('EDIT') }}
@ -74,32 +74,32 @@
<div class="flex-1">
<!-- Begin first column -->
<div class="flex m-2">
<div class="flex font-medium">{{ $t('SURNAME')}}:</div>
<div class="flex pl-3">{{ profile.surname }}</div>
<div class="flex w-1/4 font-medium">{{ $t('SURNAME')}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.surname }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('NAME')}}:</div>
<div class="flex pl-3">{{ profile.name }}</div>
<div class="flex w-1/4 font-medium">{{ $t('NAME')}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('DOB')}}:</div>
<div class="flex pl-3">{{ formattedDate }}</div>
<div class="flex w-1/4 font-medium">{{ $t('DOB')}}:</div>
<div class="flex w-3/4 pl-3">{{ formattedDate }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('POB')}}:</div>
<div class="flex pl-3">{{ profile.birth_place }}</div>
<div class="flex w-1/4 font-medium">{{ $t('POB')}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.birth_place }}</div>
</div>
<div class="flex m-2 mt-0 md:m-2">
<div class="flex font-medium">{{ $t('PNAME')}}:</div>
<div class="flex pl-3">{{ profile.patronomic_name }}</div>
<div class="flex w-1/4 font-medium">{{ $t('PNAME')}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.patronomic_name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('CITIZENSHIP')}}:</div>
<div v-if="profile && profile.citizenship" class="flex pl-3">{{ profile.citizenship.name }}</div>
<div class="flex w-1/4 font-medium">{{ $t('CITIZENSHIP')}}:</div>
<div v-if="profile && profile.citizenship" class="flex w-3/4 pl-3">{{ profile.citizenship.name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('REG_ADDR')}}:</div>
<div class="flex pl-3">{{ profile.registration_address }}</div>
<div class="flex w-1/4 font-medium">{{ $t('REG_ADDR')}}:</div>
<div class="flex w-3/4 pl-3">{{ profile.registration_address }}</div>
</div>
</div>
<!-- End first column -->
@ -127,20 +127,20 @@
<div class="flex-1">
<!-- Begin column -->
<div class="flex m-2">
<div class="flex font-medium">{{ $t('ADDRESS')}}:</div>
<div class="flex pl-3">{{ contacts.address }}</div>
<div class="flex w-1/4 font-medium">{{ $t('ADDRESS')}}:</div>
<div class="flex w-3/4 pl-3">{{ contacts.address }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('PHONE')}}:</div>
<div class="flex pl-3">{{ contacts.phone }}</div>
<div class="flex w-1/4 font-medium">{{ $t('PHONE')}}:</div>
<div class="flex w-3/4 pl-3">{{ contacts.phone }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('FAX')}}:</div>
<div class="flex pl-3">{{ contacts.fax }}</div>
<div class="flex w-1/4 font-medium">{{ $t('FAX')}}:</div>
<div class="flex w-3/4 pl-3">{{ contacts.fax }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('EMAIL')}}:</div>
<div class="flex pl-3">{{ contacts.email }}</div>
<div class="flex w-1/4 font-medium">{{ $t('EMAIL')}}:</div>
<div class="flex w-3/4 pl-3">{{ contacts.email }}</div>
</div>
</div>
<!-- End column -->
@ -164,24 +164,24 @@
<div class="flex-1">
<!-- Begin column -->
<div class="flex m-2">
<div class="flex font-medium">{{ $t('BANK_NAME')}}:</div>
<div class="flex pl-3">{{ bankAccount.bank_name }}</div>
<div class="flex w-1/4 font-medium">{{ $t('BANK_NAME')}}:</div>
<div class="flex w-3/4 pl-3">{{ bankAccount.bank_name }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('COUNTRY')}}:</div>
<div class="flex pl-3">{{ bankAccount.country }}</div>
<div class="flex w-1/4 font-medium">{{ $t('COUNTRY')}}:</div>
<div class="flex w-3/4 pl-3">{{ bankAccount.country }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('ACC_NUMBER')}}:</div>
<div class="flex pl-3">{{ bankAccount.account_number }}</div>
<div class="flex w-1/4 font-medium">{{ $t('ACC_NUMBER')}}:</div>
<div class="flex w-3/4 pl-3">{{ bankAccount.account_number }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('ACC_DATE')}}:</div>
<div class="flex pl-3">{{ bankAccount.account_date }}</div>
<div class="flex w-1/4 font-medium">{{ $t('ACC_DATE')}}:</div>
<div class="flex w-3/4 pl-3">{{ bankAccount.account_date }}</div>
</div>
<div class="flex m-2">
<div class="flex font-medium">{{ $t('CURRENCY')}}:</div>
<div class="flex pl-3">{{ bankAccount.currency }}</div>
<div class="flex w-1/4 font-medium">{{ $t('CURRENCY')}}:</div>
<div class="flex w-3/4 pl-3">{{ bankAccount.currency }}</div>
</div>
</div>
<!-- End column -->
@ -216,6 +216,7 @@
</div>
<!-- End column -->
</div>
<span v-if="!legalNumber" class="pt-5 pl-2 text-danger">{{$t('LEG_WARN_INFO')}}</span>
</div>
</PreviewComponent>
<!-- END: Legalization -->
@ -259,7 +260,7 @@ const onEdit = (name, params) => {
};
const onLegalBtnTapped = async () => {
//console.log("onLegalBtnTapped");
//console.log("onLegalBtnTapped");
if (
!legalAppStatus.value ||
legalCanExtend.value
@ -284,7 +285,7 @@ const createApplication = async () => {
};
const prepareLegalBtnTitle = () => {
//console.log("prepareLegalBtnTitle: ", legalBtnTitle.value);
//console.log("prepareLegalBtnTitle: ", legalBtnTitle.value);
if (legalCanExtend.value) {
legalBtnTitle.value = "Extend";
@ -303,14 +304,14 @@ const prepareLegalBtnTitle = () => {
};
const fetchAccount = async () => {
//console.log("fetchAccount");
//console.log("fetchAccount");
try {
isLoading.value = true;
const response = await fetchWrapper.get(`${baseUrl}/account`);
const data = response.data;
//console.log("fetchAccount data: ", data);
//console.log("fetchAccount data: ", data);
legalAppStatus.value = data.legal_app_status;
legalExpiresAt.value = data.legal_expires_at;