tech/sendico
2
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases Wiki Activity

fx discovery fix #313

Merged
tech merged 1 commits from fx-ingestor-312 into main 2026-01-23 11:52:38 +00:00
Conversation 0 Commits 1 Files Changed 6 +19 -4
6 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/payments/orchestrator/internal/service/orchestrator/payment_plan_ledger.go
View File

@@ -229,6 +229,9 @@ func (p *paymentExecutor) ledgerTxForAction(ctx context.Context, payment *model.
if err != nil { if err != nil {
return rail.LedgerTx{}, err return rail.LedgerTx{}, err
} }
if action == model.RailOperationCredit && strings.TrimSpace(accountRef) != "" {
setLedgerAccountAttributes(payment, accountRef)
}
if action == model.RailOperationDebit && toRail == model.RailLedger { if action == model.RailOperationDebit && toRail == model.RailLedger {
toRail = model.RailUnspecified toRail = model.RailUnspecified
} }

5
ci/prod/compose/fx_ingestor.yml
View File

@@ -32,6 +32,11 @@ services:
MONGO_HOSTS_2: ${MONGO_HOSTS_2} MONGO_HOSTS_2: ${MONGO_HOSTS_2}
MONGO_PORTS_2: ${MONGO_PORTS_2} MONGO_PORTS_2: ${MONGO_PORTS_2}
FX_INGESTOR_METRICS_PORT: ${FX_INGESTOR_METRICS_PORT} FX_INGESTOR_METRICS_PORT: ${FX_INGESTOR_METRICS_PORT}
NATS_URL: ${FX_NATS_URL}
NATS_HOST: ${NATS_HOST}
NATS_PORT: ${NATS_PORT}
NATS_USER: ${NATS_USER}
NATS_PASSWORD: ${NATS_PASSWORD}
command: ["--config.file", "/app/config.yml"] command: ["--config.file", "/app/config.yml"]
ports: ports:
- "0.0.0.0:${FX_INGESTOR_METRICS_PORT}:${FX_INGESTOR_METRICS_PORT}" - "0.0.0.0:${FX_INGESTOR_METRICS_PORT}:${FX_INGESTOR_METRICS_PORT}"

2
ci/prod/scripts/deploy/fx.sh
View File

@@ -23,7 +23,7 @@ case "$SERVICE" in
COMPOSE_PROJECT="${FX_INGESTOR_COMPOSE_PROJECT:-sendico-fx-ingestor}" COMPOSE_PROJECT="${FX_INGESTOR_COMPOSE_PROJECT:-sendico-fx-ingestor}"
COMPOSE_FILE="fx_ingestor.yml" COMPOSE_FILE="fx_ingestor.yml"
SERVICE_NAMES="${FX_INGESTOR_SERVICE_NAME:-sendico_fx_ingestor}" SERVICE_NAMES="${FX_INGESTOR_SERVICE_NAME:-sendico_fx_ingestor}"
REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD) REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD NATS_USER NATS_PASSWORD FX_NATS_URL)
;; ;;
oracle) oracle)
: "${FX_ORACLE_DIR:?missing FX_ORACLE_DIR}" : "${FX_ORACLE_DIR:?missing FX_ORACLE_DIR}"

9
ci/scripts/fx/deploy.sh
View File

@@ -50,7 +50,14 @@ load_env_file ./.env.version
FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}" FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}" FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"
FX_NEEDS_NATS="${FX_NEEDS_NATS:-false}" FX_NEEDS_NATS="${FX_NEEDS_NATS:-}"
if [ -z "${FX_NEEDS_NATS}" ]; then
case "${FX_DEPLOY_TARGET}" in
ingestor|oracle) FX_NEEDS_NATS=true ;;
*) FX_NEEDS_NATS=false ;;
esac
fi
export FX_MONGO_USER="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" user)" export FX_MONGO_USER="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" user)"
export FX_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" password)" export FX_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" password)"

2
frontend/pshared/lib/provider/payment/quotation/quotation.dart
View File

@@ -38,7 +38,7 @@ class QuotationProvider extends ChangeNotifier {
WalletsController wallets, WalletsController wallets,
PaymentFlowProvider flow, PaymentFlowProvider flow,
RecipientsProvider recipients, RecipientsProvider recipients,
PaymentMethodsProvider _methods, PaymentMethodsProvider _,
) { ) {
_organizations = venue; _organizations = venue;
final intent = _intentBuilder.build( final intent = _intentBuilder.build(

2
frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart
View File

@@ -19,7 +19,7 @@ class OwnerField extends StatelessWidget {
@override @override
Widget build(BuildContext context) => DropdownButtonFormField<String?>( Widget build(BuildContext context) => DropdownButtonFormField<String?>(
value: value, initialValue: value,
decoration: getInputDecoration(context, AppLocalizations.of(context)!.assetOwner, true), decoration: getInputDecoration(context, AppLocalizations.of(context)!.assetOwner, true),
items: items, items: items,
onChanged: onChanged, onChanged: onChanged,