Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

farrah/fixed internal limit error #6607

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/javascript/app/pages/cashier/account_transfer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ const AccountTransfer = (() => {
const form_id_hash = `#${form_id}`;

const messages = {
parent : 'client_message',
error : 'no_account',
balance: 'not_enough_balance',
deposit: 'no_balance',
parent : 'client_message',
error : 'no_account',
balance : 'not_enough_balance',
deposit : 'no_balance',
transfer: 'transfer_not_allowed',
};

let el_transfer_from,
Expand Down Expand Up @@ -244,10 +245,12 @@ const AccountTransfer = (() => {
} else {
const req_transfer_between_accounts = BinarySocket.send({ transfer_between_accounts: 1 });
const get_account_status = BinarySocket.send({ get_account_status: 1 });
const req_get_limits = BinarySocket.send({ get_limits: 1 });

Promise.all([req_transfer_between_accounts, get_account_status]).then(() => {
Promise.all([req_transfer_between_accounts, get_account_status, req_get_limits]).then(() => {
const response_transfer = State.get(['response', 'transfer_between_accounts']);
const is_authenticated = State.getResponse('get_account_status.status').some(state => state === 'authenticated');
const response_internal_transfer_limits = State.getResponse('get_limits.daily_transfers.internal');

if (hasError(response_transfer)) {
return;
Expand All @@ -258,12 +261,20 @@ const AccountTransfer = (() => {
return;
}

populateAccounts(accounts);
setLimits(min_amount, is_authenticated).then(() => {
showForm({ is_authenticated });
populateHints();
});

const allowed_internal_transfer = response_internal_transfer_limits.allowed;
const available_internal_transfer = response_internal_transfer_limits.available;
if (available_internal_transfer === 0) {
setLoadingVisibility(0);
getElementById(messages.parent).setVisibility(1);
elementTextContent(getElementById('allowed_internal_transfer'), allowed_internal_transfer);
getElementById(messages.transfer).setVisibility(1);
} else {
populateAccounts(accounts);
setLimits(min_amount, is_authenticated).then(() => {
showForm({ is_authenticated });
populateHints();
});
}
});
}
});
Expand Down
6 changes: 5 additions & 1 deletion src/templates/app/cashier/account_transfer.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React from 'react';
import Loading from '../../_common/components/loading.jsx';

const Row = ({ id }) => (
Expand Down Expand Up @@ -35,6 +35,10 @@ const AccountTransfer = () => (
{it.L('Please [_1]deposit[_2] to your account.', `<a href='${it.url_for('cashier/forwardws?action=deposit')}'>`, '</a>')}
&nbsp;
</span>
<span className='invisible' id='transfer_not_allowed'>
{it.L('You can only perform up to [_1] transfers a day. Please try again tomorrow.', '<span id="allowed_internal_transfer"></span>')}
&nbsp;
</span>
</p>
</div>

Expand Down