Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes: RecordCollectors - catching and translation messages #17228

Open
wants to merge 5 commits into
base: developer
Choose a base branch
from

Conversation

fabianfe-yetiforce
Copy link
Contributor

Description

The changes made affect the translation of feedback messages from RecordCollector APIs.

@fabianfe-yetiforce fabianfe-yetiforce added the ▶ in progress We’re currently working on this matter. label Aug 1, 2023
@fabianfe-yetiforce fabianfe-yetiforce added this to the YetiForce 7.0 milestone Aug 1, 2023
@fabianfe-yetiforce fabianfe-yetiforce added ✔ finished This pull request has been finished. and removed ▶ in progress We’re currently working on this matter. labels Aug 1, 2023
@@ -190,4 +190,4 @@ private function parseData(): void
unset($this->data['filings']);
$this->data = \App\Utils::flattenKeys($this->data, 'ucfirst');
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add empty line

* @var array
*/
protected array $validationMessages = [
// to fill messages
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

@@ -157,9 +157,12 @@
<span class="fa-solid fa-print mr-2"></span>
{\App\Language::translate('LBL_PRINT')}
</button>
{elseif isset($SEARCH_DATA['error'])}
{elseif isset($SEARCH_DATA['error']) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{elseif isset($SEARCH_DATA['error']) }
{elseif isset($SEARCH_DATA['error'])}

<div class="alert alert-danger m-4" role="alert">
<span class="mdi mdi-alert-circle-outline mr-2"></span>{$SEARCH_DATA['error']}
<span class="mdi mdi-alert-circle-outline mr-2"></span>
{foreach from=$SEARCH_DATA['error'] key=KEY item=VALUE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

encode

@rskrzypczak rskrzypczak added 🔧 AmendmentsRequired This pull request requires some amendments in order to be merged. and removed ✔ finished This pull request has been finished. labels Aug 2, 2023
@fabianfe-yetiforce fabianfe-yetiforce added ▶ in progress We’re currently working on this matter. ✔ finished This pull request has been finished. and removed ▶ in progress We’re currently working on this matter. 🔧 AmendmentsRequired This pull request requires some amendments in order to be merged. labels Aug 2, 2023
@@ -117,7 +117,7 @@ public function search(): array
{
$companyNumber = str_replace([' ', ',', '.', '-'], '', $this->request->getByType('companyNumber', 'Text'));

if (!$this->isActive() && empty($companyNumber)) {
if (empty($companyNumber) && !$this->isActive()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it be "||" instead of "&&"?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✔ finished This pull request has been finished.
Projects
YetiForceCRM
Awaiting triage
Development

Successfully merging this pull request may close these issues.

None yet

2 participants