Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
ingos-integration
Commits
d3da4883
Commit
d3da4883
authored
8 years ago
by
Vladimir Kolmakov
Browse files
Options
Download
Email Patches
Plain Diff
fix checkPayment validator
parent
eca1de1f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
modules/ingos-web/src/main/java/com/cdek/ingos/web/app/EnumErrorCodes.java
+1
-0
.../src/main/java/com/cdek/ingos/web/app/EnumErrorCodes.java
modules/ingos-web/src/main/java/com/cdek/ingos/web/service/validator/PaymentCheckRequestValidator.java
+1
-1
...s/web/service/validator/PaymentCheckRequestValidator.java
modules/ingos-web/src/main/resources/exception-builder-messages.properties
+1
-0
.../src/main/resources/exception-builder-messages.properties
modules/ingos-web/src/test/resources/exception-builder-messages.properties
+1
-0
.../src/test/resources/exception-builder-messages.properties
with
4 additions
and
1 deletion
+4
-1
modules/ingos-web/src/main/java/com/cdek/ingos/web/app/EnumErrorCodes.java
View file @
d3da4883
...
...
@@ -4,6 +4,7 @@ import java.util.Properties;
public
enum
EnumErrorCodes
{
user_no_authed
(
"Пользователь не авторизован"
),
user_no_access_to_operation
(
"Недостаточно прав для выполнения данной операции"
),
no_input_params
(
"Не заданы входные параметры"
),
no_china_id
(
"Пользователь не связан с контрагентом. Возможно, синхронизация ещё не прошла, попробуйте повторить попытку позже"
),
no_contragent
(
"Контрагент не найден"
),
...
...
This diff is collapsed.
Click to expand it.
modules/ingos-web/src/main/java/com/cdek/ingos/web/service/validator/PaymentCheckRequestValidator.java
View file @
d3da4883
...
...
@@ -23,7 +23,7 @@ public class PaymentCheckRequestValidator extends AbstractRequestValidator<JSPay
public
void
validate
(
JSPaymentCheckRequest
request
)
{
String
contragentCode
=
validateAuth
(
request
);
if
(!
contragentCode
.
equals
(
ingosContragentCode
))
throw
exceptionBuilder
.
noUserAccess
Exception
I18n
(
EnumErrorCodes
.
check_payment_no_auth
.
name
());
throw
exceptionBuilder
.
validate
Exception
(
EnumErrorCodes
.
check_payment_no_auth
.
name
());
if
(
isNotSet
(
request
.
getOrderNumbersString
()))
throw
exceptionBuilder
.
validateException
(
EnumErrorCodes
.
no_input_params
.
name
());
}
...
...
This diff is collapsed.
Click to expand it.
modules/ingos-web/src/main/resources/exception-builder-messages.properties
View file @
d3da4883
...
...
@@ -11,6 +11,7 @@ user_no_authed=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043
check_payment_no_auth
=
\u
041D
\u0435\u0434\u
043E
\u0441\u0442\u0430\u0442\u
043E
\u0447\u
043D
\u
043E
\u
043F
\u0440\u0430\u0432
\u0434\u
043B
\u
044F
\u0432\u
044B
\u
043F
\u
043E
\u
043B
\u
043D
\u0435\u
043D
\u0438\u
044F
\u0434\u0430\u
043D
\u
043D
\u
043E
\u0439
\u
043E
\u
043F
\u0435\u0440\u0430\u0446\u0438\u0438
delete_order_back_ids_incorrect
=
\u
041D
\u0435\u
043A
\u
043E
\u0440\u0440\u0435\u
043A
\u0442\u
043D
\u
044B
\u0435
\u
043F
\u0430\u0440\u0430\u
043C
\u0435\u0442\u0440\u
044B
\u
043E
\u0431\u0440\u0430\u0442\u
043D
\u
043E
\u0439
\u
043D
\u0430\u
043A
\u
043B
\u0430\u0434\u
043D
\u
043E
\u0439
create_order_contragent_incorrect
=
\u
041D
\u0435\u
043A
\u
043E
\u0440\u0440\u0435\u
043A
\u0442\u
043D
\u
044B
\u0435
\u
043F
\u0430\u0440\u0430\u
043C
\u0435\u0442\u0440\u
044B
\u
043A
\u
043E
\u
043D
\u0442\u0440\u0430\u0433\u0435\u
043D
\u0442\u0430
user_no_access_to_operation
=
\u
041D
\u0435\u0434\u
043E
\u0441\u0442\u0430\u0442\u
043E
\u0447\u
043D
\u
043E
\u
043F
\u0440\u0430\u0432
\u0434\u
043B
\u
044F
\u0432\u
044B
\u
043F
\u
043E
\u
043B
\u
043D
\u0435\u
043D
\u0438\u
044F
\u0434\u0430\u
043D
\u
043D
\u
043E
\u0439
\u
043E
\u
043F
\u0435\u0440\u0430\u0446\u0438\u0438
create_order_no_address
=
\u
041D
\u0435
\u0437\u0430\u0434\u0430\u
043D
\u
043E
\u0434\u0438\u
043D
\u0438\u
043B
\u0438
\u
043D
\u0435\u0441\u
043A
\u
043E
\u
043B
\u
044C
\u
043A
\u
043E
\u0440\u0435\u
043A
\u0432\u0438\u0437\u0438\u0442\u
043E
\u0432
\u0430\u0434\u0440\u0435\u0441\u0430\:
\u0433\u
043E
\u0440\u
043E
\u0434
,
\u0443\u
043B
\u0438\u0446\u0430
,
\u0434\u
043E
\u
043C,
\u
043A
\u0432\u0430\u0440\u0442\u0438\u0440\u0430
no_china_id
=
\u
041F
\u
043E
\u
043B
\u
044C
\u0437\u
043E
\u0432\u0430\u0442\u0435\u
043B
\u
044C
\u
043D
\u0435
\u0441\u0432\u
044F
\u0437\u0430\u
043D
\u0441
\u
043A
\u
043E
\u
043D
\u0442\u0440\u0430\u0433\u0435\u
043D
\u0442\u
043E
\u
043C.
\u0412\u
043E
\u0437\u
043C
\u
043E
\u0436\u
043D
\u
043E,
\u0441\u0438\u
043D
\u0445\u0440\u
043E
\u
043D
\u0438\u0437\u0430\u0446\u0438\u
044F
\u0435\u0449\u0451
\u
043D
\u0435
\u
043F
\u0440\u
043E
\u0448\u
043B
\u0430
,
\u
043F
\u
043E
\u
043F
\u0440\u
043E
\u0431\u0443\u0439\u0442\u0435
\u
043F
\u
043E
\u0432\u0442\u
043E
\u0440\u0438\u0442\u
044C
\u
043F
\u
043E
\u
043F
\u
044B
\u0442\u
043A
\u0443
\u
043F
\u
043E
\u0437\u0436\u0435
create_order_active_already_exists
=
\u0410\u
043A
\u0442\u0438\u0432\u
043D
\u
044B
\u0435
\u0437\u0430\u
043A
\u0430\u0437\u
044B
\u0443\u0436\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u
044E
\u0442
,
\u
043D
\u0435\u
043B
\u
044C
\u0437\u
044F
\u0441\u
043E
\u0437\u0434\u0430\u0432\u0430\u0442\u
044C
\u
043D
\u
043E
\u0432\u
044B
\u0435
,
\u
043F
\u
043E
\u
043A
\u0430
\u
043D
\u0435
\u
043F
\u
043E
\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u
043D
\u0430
\u
043E
\u
043F
\u
043B
\u0430\u0442\u0430
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u
044E
\u0449\u0438\u0445
This diff is collapsed.
Click to expand it.
modules/ingos-web/src/test/resources/exception-builder-messages.properties
View file @
d3da4883
...
...
@@ -11,6 +11,7 @@ user_no_authed=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043
check_payment_no_auth
=
\u
041D
\u0435\u0434\u
043E
\u0441\u0442\u0430\u0442\u
043E
\u0447\u
043D
\u
043E
\u
043F
\u0440\u0430\u0432
\u0434\u
043B
\u
044F
\u0432\u
044B
\u
043F
\u
043E
\u
043B
\u
043D
\u0435\u
043D
\u0438\u
044F
\u0434\u0430\u
043D
\u
043D
\u
043E
\u0439
\u
043E
\u
043F
\u0435\u0440\u0430\u0446\u0438\u0438
delete_order_back_ids_incorrect
=
\u
041D
\u0435\u
043A
\u
043E
\u0440\u0440\u0435\u
043A
\u0442\u
043D
\u
044B
\u0435
\u
043F
\u0430\u0440\u0430\u
043C
\u0435\u0442\u0440\u
044B
\u
043E
\u0431\u0440\u0430\u0442\u
043D
\u
043E
\u0439
\u
043D
\u0430\u
043A
\u
043B
\u0430\u0434\u
043D
\u
043E
\u0439
create_order_contragent_incorrect
=
\u
041D
\u0435\u
043A
\u
043E
\u0440\u0440\u0435\u
043A
\u0442\u
043D
\u
044B
\u0435
\u
043F
\u0430\u0440\u0430\u
043C
\u0435\u0442\u0440\u
044B
\u
043A
\u
043E
\u
043D
\u0442\u0440\u0430\u0433\u0435\u
043D
\u0442\u0430
user_no_access_to_operation
=
\u
041D
\u0435\u0434\u
043E
\u0441\u0442\u0430\u0442\u
043E
\u0447\u
043D
\u
043E
\u
043F
\u0440\u0430\u0432
\u0434\u
043B
\u
044F
\u0432\u
044B
\u
043F
\u
043E
\u
043B
\u
043D
\u0435\u
043D
\u0438\u
044F
\u0434\u0430\u
043D
\u
043D
\u
043E
\u0439
\u
043E
\u
043F
\u0435\u0440\u0430\u0446\u0438\u0438
create_order_no_address
=
\u
041D
\u0435
\u0437\u0430\u0434\u0430\u
043D
\u
043E
\u0434\u0438\u
043D
\u0438\u
043B
\u0438
\u
043D
\u0435\u0441\u
043A
\u
043E
\u
043B
\u
044C
\u
043A
\u
043E
\u0440\u0435\u
043A
\u0432\u0438\u0437\u0438\u0442\u
043E
\u0432
\u0430\u0434\u0440\u0435\u0441\u0430\:
\u0433\u
043E
\u0440\u
043E
\u0434
,
\u0443\u
043B
\u0438\u0446\u0430
,
\u0434\u
043E
\u
043C,
\u
043A
\u0432\u0430\u0440\u0442\u0438\u0440\u0430
no_china_id
=
\u
041F
\u
043E
\u
043B
\u
044C
\u0437\u
043E
\u0432\u0430\u0442\u0435\u
043B
\u
044C
\u
043D
\u0435
\u0441\u0432\u
044F
\u0437\u0430\u
043D
\u0441
\u
043A
\u
043E
\u
043D
\u0442\u0440\u0430\u0433\u0435\u
043D
\u0442\u
043E
\u
043C.
\u0412\u
043E
\u0437\u
043C
\u
043E
\u0436\u
043D
\u
043E,
\u0441\u0438\u
043D
\u0445\u0440\u
043E
\u
043D
\u0438\u0437\u0430\u0446\u0438\u
044F
\u0435\u0449\u0451
\u
043D
\u0435
\u
043F
\u0440\u
043E
\u0448\u
043B
\u0430
,
\u
043F
\u
043E
\u
043F
\u0440\u
043E
\u0431\u0443\u0439\u0442\u0435
\u
043F
\u
043E
\u0432\u0442\u
043E
\u0440\u0438\u0442\u
044C
\u
043F
\u
043E
\u
043F
\u
044B
\u0442\u
043A
\u0443
\u
043F
\u
043E
\u0437\u0436\u0435
create_order_active_already_exists
=
\u0410\u
043A
\u0442\u0438\u0432\u
043D
\u
044B
\u0435
\u0437\u0430\u
043A
\u0430\u0437\u
044B
\u0443\u0436\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u
044E
\u0442
,
\u
043D
\u0435\u
043B
\u
044C
\u0437\u
044F
\u0441\u
043E
\u0437\u0434\u0430\u0432\u0430\u0442\u
044C
\u
043D
\u
043E
\u0432\u
044B
\u0435
,
\u
043F
\u
043E
\u
043A
\u0430
\u
043D
\u0435
\u
043F
\u
043E
\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u
043D
\u0430
\u
043E
\u
043F
\u
043B
\u0430\u0442\u0430
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u
044E
\u0449\u0438\u0445
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help