IDSolutions/forge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix transport personal payment fallback

Browse Source
This commit is contained in:
Jacob Schmidt 2026-05-25 13:59:12 -05:00
parent c0dd782103
commit 89e3f794dc
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arma/server/addons/transport/functions/fnc_initTransportService.sqf
View File

@ -188,6 +188,8 @@ GVAR(TransportServiceBase) = compileFinal createHashMapFromArray [
_result _result
}; };
private _personalSourceAttempted = false;
private _allowOrgFallback = false;
if !(isNil QEGVAR(bank,BankStore)) then { if !(isNil QEGVAR(bank,BankStore)) then {
private _account = EGVAR(bank,BankStore) call ["get", [_uid, ""]]; private _account = EGVAR(bank,BankStore) call ["get", [_uid, ""]];
if (_account isEqualTo createHashMap) then { if (_account isEqualTo createHashMap) then {
@ -195,28 +197,35 @@ GVAR(TransportServiceBase) = compileFinal createHashMapFromArray [
}; };
if (_account isNotEqualTo createHashMap) then { if (_account isNotEqualTo createHashMap) then {
private _source = ""; private _bankBalance = _account getOrDefault ["bank", 0];
if ((_account getOrDefault ["bank", 0]) >= _amount) then { private _cashBalance = _account getOrDefault ["cash", 0];
_source = "bank"; private _source = ["", "bank"] select (_bankBalance >= _amount);
} else { if (_source isEqualTo "" && { _cashBalance >= _amount }) then {
if ((_account getOrDefault ["cash", 0]) >= _amount) then { _source = "cash";
_source = "cash";
};
}; };
if (_source isNotEqualTo "") then { if (_source isNotEqualTo "") then {
_personalSourceAttempted = true;
private _charge = EGVAR(bank,BankStore) call ["chargeCheckout", [_uid, _source, _amount, true]]; private _charge = EGVAR(bank,BankStore) call ["chargeCheckout", [_uid, _source, _amount, true]];
if (_charge getOrDefault ["success", false]) exitWith { if (_charge getOrDefault ["success", false]) then {
EGVAR(bank,BankStore) call ["save", [_uid]]; EGVAR(bank,BankStore) call ["save", [_uid]];
_result set ["success", true]; _result set ["success", true];
_result set ["source", _source]; _result set ["source", _source];
_result set ["message", format ["%1 charged $%2 from your %3.", _label, [_amount] call EFUNC(common,formatNumber), _source]]; _result set ["message", format ["%1 charged $%2 from your %3.", _label, [_amount] call EFUNC(common,formatNumber), _source]];
} else {
_result set ["message", _charge getOrDefault ["message", format ["Unable to charge %1 from your %2.", _label, _source]]];
}; };
} else {
_allowOrgFallback = true;
}; };
} else {
_result set ["message", "Bank account could not be loaded for transport billing."];
}; };
} else {
_result set ["message", "Bank service is unavailable for transport billing."];
}; };
if !(isNil QEGVAR(economy,SEconomyStore)) then { if (!(_result getOrDefault ["success", false]) && { !_personalSourceAttempted } && { _allowOrgFallback } && { !(isNil QEGVAR(economy,SEconomyStore)) }) then {
private _orgCharge = EGVAR(economy,SEconomyStore) call ["chargeOrg", [_unit, _amount, _label, true]]; private _orgCharge = EGVAR(economy,SEconomyStore) call ["chargeOrg", [_unit, _amount, _label, true]];
if (_orgCharge getOrDefault ["success", false]) exitWith { if (_orgCharge getOrDefault ["success", false]) exitWith {
_result set ["success", true]; _result set ["success", true];