taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

add delivery info in the parse contract terms and a function to get info from a proposalId

Browse Source
This commit is contained in:
Sebastian 2022-08-08 13:53:04 -03:00
parent 88bdcae030
commit 4409d8384b
No known key found for this signature in database
GPG Key ID: BE4FF68352439FC1
5 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/taler-wallet-core/src/db.ts
View File

@ -43,6 +43,7 @@ import {
AgeCommitmentProof,
PayCoinSelection,
PeerContractTerms,
Location,
} from "@gnu-taler/taler-util";
import { RetryInfo } from "./util/retries.js";
import { Event, IDBDatabase } from "@gnu-taler/idb-bridge";
@ -1170,6 +1171,8 @@ export interface WalletContractData {
wireInfoHash: string;
maxDepositFee: AmountJson;
minimumAge?: number;
deliveryDate: TalerProtocolTimestamp | undefined;
deliveryLocation: Location | undefined;
}
export enum AbortStatus {

4
packages/taler-wallet-core/src/operations/backup/import.ts
View File

@ -600,6 +600,8 @@ export async function importBackup(
merchant: parsedContractTerms.merchant,
products: parsedContractTerms.products,
summaryI18n: parsedContractTerms.summary_i18n,
deliveryDate: parsedContractTerms.delivery_date,
deliveryLocation: parsedContractTerms.delivery_location,
},
contractTermsRaw: backupProposal.contract_terms_raw,
};
@ -740,6 +742,8 @@ export async function importBackup(
merchant: parsedContractTerms.merchant,
products: parsedContractTerms.products,
summaryI18n: parsedContractTerms.summary_i18n,
deliveryDate: parsedContractTerms.delivery_date,
deliveryLocation: parsedContractTerms.delivery_location,
},
contractTermsRaw: backupPurchase.contract_terms_raw,
};

23
packages/taler-wallet-core/src/operations/pay.ts
View File

@ -662,6 +662,8 @@ export function extractContractData(
products: parsedContractTerms.products,
summaryI18n: parsedContractTerms.summary_i18n,
minimumAge: parsedContractTerms.minimum_age,
deliveryDate: parsedContractTerms.delivery_date,
deliveryLocation: parsedContractTerms.delivery_location,
};
}
@ -1318,6 +1320,27 @@ export async function checkPaymentByProposalId(
}
}
export async function getContractTermsDetails(
ws: InternalWalletState,
proposalId: string,
): Promise<WalletContractData> {
const proposal = await ws.db
.mktx((x) => ({ proposals: x.proposals }))
.runReadOnly(async (tx) => {
return tx.proposals.get(proposalId);
});
if (!proposal) {
throw Error(`proposal with id ${proposalId} not found`);
}
if (!proposal.download || !proposal.download.contractData) {
throw Error("proposal is in invalid state");
}
return proposal.download.contractData
}
/**
* Check if a payment for the given taler://pay/ URI is possible.
*

3
packages/taler-wallet-core/src/operations/transactions.ts
View File

@ -448,6 +448,9 @@ export async function getTransactions(
tipRecord.walletTipId,
),
merchantBaseUrl: tipRecord.merchantBaseUrl,
// merchant: {
// name: tipRecord.merchantBaseUrl,
// },
error: tipRecord.lastError,
});
});

6
packages/taler-wallet-core/src/wallet.ts
View File

@ -43,6 +43,7 @@ import {
codecForCreateDepositGroupRequest,
codecForDeleteTransactionRequest,
codecForForceRefreshRequest,
codecForGetContractTermsDetails,
codecForGetExchangeTosRequest,
codecForGetExchangeWithdrawalInfo,
codecForGetFeeForDeposit,
@ -142,6 +143,7 @@ import {
import { getMerchantInfo } from "./operations/merchants.js";
import {
confirmPay,
getContractTermsDetails,
preparePayForUri,
processDownloadProposal,
processPurchasePay,
@ -868,6 +870,10 @@ async function dispatchRequestInternal(
const req = codecForGetExchangeTosRequest().decode(payload);
return getExchangeTos(ws, req.exchangeBaseUrl, req.acceptedFormat);
}
case "getContractTermsDetails": {
const req = codecForGetContractTermsDetails().decode(payload);
return getContractTermsDetails(ws, req.proposalId);
}
case "retryPendingNow": {
await runPending(ws, true);
return {};