remove references to product and delivery

This commit is contained in:
Sebastian 2023-09-08 18:09:33 -03:00
parent 036f8a463f
commit b784144edf
No known key found for this signature in database
GPG Key ID: 173909D1A5F66069
9 changed files with 54 additions and 54 deletions

View File

@ -73,11 +73,11 @@ const cd: WalletContractData = {
country: "ar", country: "ar",
}, },
}, },
products: [], // products: [],
autoRefund: undefined, autoRefund: undefined,
summaryI18n: undefined, summaryI18n: undefined,
deliveryDate: undefined, // deliveryDate: undefined,
deliveryLocation: undefined, // deliveryLocation: undefined,
}; };
export const ShowingSimpleOrder = tests.createExample(ShowView, { export const ShowingSimpleOrder = tests.createExample(ShowView, {

View File

@ -259,7 +259,7 @@ export function ShowView({ contractTerms, hideHandler }: States.Show): VNode {
</span> </span>
</td> </td>
</tr> </tr>
<tr> {/* <tr>
<td> <td>
<i18n.Translate>Delivery date</i18n.Translate> <i18n.Translate>Delivery date</i18n.Translate>
</td> </td>
@ -291,7 +291,7 @@ export function ShowView({ contractTerms, hideHandler }: States.Show): VNode {
.map((p) => `${p.description} x ${p.quantity}`) .map((p) => `${p.description} x ${p.quantity}`)
.join(", ")} .join(", ")}
</td> </td>
</tr> </tr> */}
<tr> <tr>
<td> <td>
<i18n.Translate>Created at</i18n.Translate> <i18n.Translate>Created at</i18n.Translate>
@ -334,8 +334,8 @@ export function ShowView({ contractTerms, hideHandler }: States.Show): VNode {
!contractTerms.autoRefund !contractTerms.autoRefund
? Duration.getZero() ? Duration.getZero()
: Duration.fromTalerProtocolDuration( : Duration.fromTalerProtocolDuration(
contractTerms.autoRefund, contractTerms.autoRefund,
), ),
)} )}
format="dd MMMM yyyy, HH:mm" format="dd MMMM yyyy, HH:mm"
/> />

View File

@ -76,7 +76,7 @@ export function BaseView(state: SupportedStates): VNode {
...contractTerms, ...contractTerms,
orderId: contractTerms.order_id, orderId: contractTerms.order_id,
contractTermsHash: "", contractTermsHash: "",
products: contractTerms.products!, // products: contractTerms.products!,
}} }}
proposalId={state.payStatus.proposalId} proposalId={state.payStatus.proposalId}
/> />

View File

@ -49,7 +49,7 @@ export namespace State {
interface BaseInfo { interface BaseInfo {
merchantName: string; merchantName: string;
products: Product[] | undefined; // products: Product[] | undefined;
amount: AmountJson; amount: AmountJson;
// awaitingAmount: AmountJson; // awaitingAmount: AmountJson;
// granted: AmountJson; // granted: AmountJson;

View File

@ -106,7 +106,7 @@ export function useComponentState({
// granted: Amounts.parseOrThrow(info.response.refund.granted), // granted: Amounts.parseOrThrow(info.response.refund.granted),
// awaitingAmount: Amounts.parseOrThrow(refund.awaiting), // awaitingAmount: Amounts.parseOrThrow(refund.awaiting),
merchantName: purchase.info.merchant.name, merchantName: purchase.info.merchant.name,
products: purchase.info.products, // products: purchase.info.products,
error: undefined, error: undefined,
}; };

View File

@ -47,7 +47,7 @@ export const Ready = tests.createExample(ReadyView, {
// awaitingAmount: Amounts.parseOrThrow("USD:1"), // awaitingAmount: Amounts.parseOrThrow("USD:1"),
// granted: Amounts.parseOrThrow("USD:0"), // granted: Amounts.parseOrThrow("USD:0"),
merchantName: "the merchant", merchantName: "the merchant",
products: [], // products: [],
orderId: "abcdef", orderId: "abcdef",
}); });
@ -60,18 +60,18 @@ export const WithAProductList = tests.createExample(ReadyView, {
// awaitingAmount: Amounts.parseOrThrow("USD:1"), // awaitingAmount: Amounts.parseOrThrow("USD:1"),
// granted: Amounts.parseOrThrow("USD:0"), // granted: Amounts.parseOrThrow("USD:0"),
merchantName: "the merchant", merchantName: "the merchant",
products: [ // products: [
{ // {
description: "beer", // description: "beer",
image: beer, // image: beer,
quantity: 2, // quantity: 2,
}, // },
{ // {
description: "t-shirt", // description: "t-shirt",
price: "EUR:1", // price: "EUR:1",
quantity: 5, // quantity: 5,
}, // },
], // ],
orderId: "abcdef", orderId: "abcdef",
}); });

View File

@ -104,11 +104,11 @@ export function ReadyView(state: State.Ready): VNode {
kind="positive" kind="positive"
/> */} /> */}
</section> </section>
{state.products && state.products.length ? ( {/* {state.products && state.products.length ? (
<section> <section>
<ProductList products={state.products} /> <ProductList products={state.products} />
</section> </section>
) : undefined} ) : undefined} */}
<section> <section>
<Button <Button
variant="contained" variant="contained"

View File

@ -378,9 +378,9 @@ export const PaymentWithDeliveryDate = tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12", amountRaw: "KUDOS:12",
info: { info: {
...exampleData.payment.info, ...exampleData.payment.info,
delivery_date: { // delivery_date: {
t_s: new Date().getTime() / 1000, // t_s: new Date().getTime() / 1000,
}, // },
}, },
}, },
}); });
@ -391,12 +391,12 @@ export const PaymentWithDeliveryAddr = tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12", amountRaw: "KUDOS:12",
info: { info: {
...exampleData.payment.info, ...exampleData.payment.info,
delivery_location: { // delivery_location: {
country: "Argentina", // country: "Argentina",
street: "Elm Street", // street: "Elm Street",
district: "CABA", // district: "CABA",
post_code: "1101", // post_code: "1101",
}, // },
}, },
}, },
}); });
@ -407,15 +407,15 @@ export const PaymentWithDeliveryFull = tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12", amountRaw: "KUDOS:12",
info: { info: {
...exampleData.payment.info, ...exampleData.payment.info,
delivery_date: { // delivery_date: {
t_s: new Date().getTime() / 1000, // t_s: new Date().getTime() / 1000,
}, // },
delivery_location: { // delivery_location: {
country: "Argentina", // country: "Argentina",
street: "Elm Street", // street: "Elm Street",
district: "CABA", // district: "CABA",
post_code: "1101", // post_code: "1101",
}, // },
}, },
}, },
}); });

View File

@ -237,8 +237,8 @@ function TransactionTemplate({
<Fragment> <Fragment>
<section style={{ padding: 8, textAlign: "center" }}> <section style={{ padding: 8, textAlign: "center" }}>
{transaction?.error && {transaction?.error &&
// FIXME: wallet core should stop sending this error on KYC // FIXME: wallet core should stop sending this error on KYC
transaction.error.code !== transaction.error.code !==
TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED ? ( TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED ? (
<ErrorAlertView <ErrorAlertView
error={alertFromError( error={alertFromError(
@ -464,7 +464,7 @@ export function TransactionView({
{/**FIXME: DD37 check if this holds */} {/**FIXME: DD37 check if this holds */}
{transaction.txState.major !== {transaction.txState.major !==
TransactionMajorState.Pending ? undefined : transaction TransactionMajorState.Pending ? undefined : transaction
.withdrawalDetails.type === WithdrawalType.ManualTransfer ? ( .withdrawalDetails.type === WithdrawalType.ManualTransfer ? (
//manual withdrawal //manual withdrawal
<BankDetailsByPaytoType <BankDetailsByPaytoType
@ -1475,10 +1475,10 @@ export function PurchaseDetails({
const total = Amounts.add(price.value, price.fee).amount; const total = Amounts.add(price.value, price.fee).amount;
const hasProducts = info.products && info.products.length > 0; // const hasProducts = info.products && info.products.length > 0;
const hasShipping = // const hasShipping =
info.delivery_date !== undefined || info.delivery_location !== undefined; // info.delivery_date !== undefined || info.delivery_location !== undefined;
const showLargePic = (): void => { const showLargePic = (): void => {
return; return;
@ -1558,7 +1558,7 @@ export function PurchaseDetails({
</tr> </tr>
</Fragment> </Fragment>
)} )}
{hasProducts && ( {/* {hasProducts && (
<tr> <tr>
<td colSpan={2}> <td colSpan={2}>
<PartCollapsible <PartCollapsible
@ -1586,8 +1586,8 @@ export function PurchaseDetails({
/> />
</td> </td>
</tr> </tr>
)} )} */}
{hasShipping && ( {/* {hasShipping && (
<tr> <tr>
<td colSpan={2}> <td colSpan={2}>
<PartCollapsible <PartCollapsible
@ -1602,7 +1602,7 @@ export function PurchaseDetails({
/> />
</td> </td>
</tr> </tr>
)} )} */}
<tr> <tr>
<td> <td>
<ShowFullContractTermPopup proposalId={proposalId} /> <ShowFullContractTermPopup proposalId={proposalId} />
@ -2008,7 +2008,7 @@ function ShowWithdrawalDetailForBankIntegrated({
/> />
)} )}
{!transaction.withdrawalDetails.confirmed && {!transaction.withdrawalDetails.confirmed &&
transaction.withdrawalDetails.bankConfirmationUrl ? ( transaction.withdrawalDetails.bankConfirmationUrl ? (
<InfoBox> <InfoBox>
<div style={{ display: "block" }}> <div style={{ display: "block" }}>
<i18n.Translate> <i18n.Translate>