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.

Sign up for GitHub

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

Jump to bottom

Added validation to currency update. #17256

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

Added validation to currency update. #17256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca71426
Added validation to currency update.
areksolek Aug 23, 2023
4cc67c5
Corrected commit
areksolek Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions layouts/basic/modules/Settings/CurrencyUpdate/Index.tpl
View file
Open in desktop
Expand Up @@ -16,27 +16,26 @@
<strong>{\App\Language::translate('LBL_WARNING', $QUALIFIED_MODULE)}</strong> {\App\Language::translate('MSG_NO_NET_CONN', $QUALIFIED_MODULE)}
</div>
{/if}
<form class="form-horizontal" method="post" action="index.php?module={$MODULENAME}&view=Index&parent=Settings">
<form class="form-horizontal js-currency-update" method="post" action="index.php?module={$MODULENAME}&view=Index&parent=Settings" data-js="container">
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
<form class="form-horizontal js-currency-update" method="post" action="index.php?module={$MODULENAME}&view=Index&parent=Settings" data-js="container">
<form class="form-horizontal js-currency-update_form" method="post" action="index.php?module={$MODULENAME}&view=Index&parent=Settings" data-js="container">

<table class="table table-bordered currencyTable">
<tr>
<th class="blockHeader" colspan="4">{\App\Language::translate('LBL_SELECT_BANK', $QUALIFIED_MODULE)}</th>
</tr>
<tr>
<td class="fieldLabel">
<span class="float-right"><strong>{\App\Language::translate('LBL_BANK', $QUALIFIED_MODULE)}:</strong></span>
<span class="float-right"><strong>{\App\Language::translate('LBL_BANK', $QUALIFIED_MODULE)}:</strong><span class="redColor">*</span></span>
</td>
<td class="fieldValue">
<div class="row">
<div class="col-md-5">
<select name="bank" id="bank" class="select2 form-control">
<select name="bank" id="bank" class="select2 form-control" required="true" data-validation-engine="validate[required]">
Copy link
Contributor

Choose a reason for hiding this comment

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

one required

<option value="0" {if !$ACTIVE_BANK}selected{/if}>{\App\Language::translate('LBL_SELECT_OPTION', $QUALIFIED_MODULE)}</option>
{foreach from=$BANK item=key}
<option value="{$key.id}" {if $key.active eq '1'}selected{/if} data-name="{$key.bank_name|escape}">{\App\Language::translate($key.bank_name, $QUALIFIED_MODULE)}</option>
{/foreach}
</select>
</div>
<div class="col-md-7 btn-toolbar justify-content-end">
{*<button class="btn btn-success float-right" name="save" type="submit"><strong>{\App\Language::translate('LBL_SET_DEFAULT_BANK', $QUALIFIED_MODULE)}</strong></button>*}
{if count($SUPPORTED_CURRENCIES) gt 0}
<button class="btn btn-info"
id="supportedCurrencies"
Expand Down Expand Up @@ -82,7 +81,7 @@
</tr>
<tr>
<td class="fieldLabel">
<span class="float-right"><strong>{\App\Language::translate('LBL_CAL_DATE', $QUALIFIED_MODULE)}:</strong></label>
<span class="float-right"><strong>{\App\Language::translate('LBL_CAL_DATE', $QUALIFIED_MODULE)}:</strong><span class="redColor">*</span></label>
</td>
<td class="fieldValue">
<div class="input-group">
Expand All @@ -91,9 +90,9 @@
<span class="fas fa-calendar-alt"></span>
</span>
</div>
<input id="datepicker" type="text" class="form-control dateField" name="duedate" data-date-format="{$USER_MODEL->get('date_format')}" value="{$DATE}" />
<input id="datepicker" type="text" class="form-control dateField" name="duedate" data-date-format="{$USER_MODEL->get('date_format')}" value="{$DATE}" data-validation-engine="validate[required]" />
<span class="input-group-append">
<button class="btn btn-success" name="download" value="download" type="submit">{\App\Language::translate('LBL_SHOW', $QUALIFIED_MODULE)}</button>
<button class="btn btn-success js-download" name="download" value="download" type="submit" data-js="click">{\App\Language::translate('LBL_SHOW', $QUALIFIED_MODULE)}</button>
</span>
</div>
</td>
Expand Down
12 changes: 10 additions & 2 deletions public_html/layouts/basic/modules/Settings/CurrencyUpdate/resources/Index.js
View file
Open in desktop
Expand Up @@ -120,11 +120,19 @@ jQuery.Class(
* Register events
*/
registerEvents: function () {
var container = jQuery('#currencyUpdateContainer');
let container = jQuery('#currencyUpdateContainer');
App.Fields.Date.register('#datepicker', false, {});
let form = container.find('.js-currency-update');
let bank = form.find('#bank');
container.on('click', '.js-download', function (e) {
Copy link
Contributor

Choose a reason for hiding this comment

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

remove

if (bank.val() === '0') {
bank.val('');
}
});
form.validationEngine(app.validationEngineOptions);
this.registerBankChange(container);
this.registerInfoButton(container);
this.registerAlertButton(container);
this.registerBankChange(container);
}
}
);