crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-23 04:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 bug: shippingLine undefined

Browse Source 
:%s
This commit is contained in:
lytrankieio123
2021-10-21 14:13:07 +07:00
parent 471d4e1aaf
commit e5f3952887
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/commerce/types/cart.ts
View File

@@ -122,7 +122,7 @@ export type CartCheckout = {
// Discounts that have been applied on the cart. // Discounts that have been applied on the cart.
discounts?: Discount[] discounts?: Discount[]
totalDiscount: number totalDiscount: number
shippingLine: { shippingLine?: {
priceWithTax: number priceWithTax: number
shippingMethod: ShippingMethod shippingMethod: ShippingMethod
} }

2
framework/vendure/api/operations/get-product.ts
View File

@@ -2,7 +2,7 @@ import { Product } from '@commerce/types/product'
import { OperationContext } from '@commerce/api/operations' import { OperationContext } from '@commerce/api/operations'
import { Provider, VendureConfig } from '../' import { Provider, VendureConfig } from '../'
import { GetProductQuery } from '../../schema' import { GetProductQuery } from '../../schema'
import { getProductQuery, getProductDetailQuery } from '../../utils/queries/get-product-query' import { getProductQuery } from '../../utils/queries/get-product-query'
export default function getProductOperation({ export default function getProductOperation({
commerce, commerce,

8
framework/vendure/utils/normalize.ts
View File

@@ -94,10 +94,10 @@ export function normalizeCartForCheckout(order: CartFragment): CartCheckout {
countryCode: order.shippingAddress?.countryCode || '', countryCode: order.shippingAddress?.countryCode || '',
phoneNumber: order.shippingAddress?.phoneNumber || '', phoneNumber: order.shippingAddress?.phoneNumber || '',
}, },
shippingLine: { shippingLine: order.shippingLines[0] ? {
priceWithTax: order.shippingLines[0].priceWithTax / 100, priceWithTax: order.shippingLines[0]?.priceWithTax / 100,
shippingMethod: order.shippingLines[0].shippingMethod as ShippingMethod shippingMethod: order.shippingLines[0]?.shippingMethod as ShippingMethod
}, }: undefined,
totalDiscount: order.discounts?.reduce((total, item) => total + item.amountWithTax, 0) / 100 || 0, totalDiscount: order.discounts?.reduce((total, item) => total + item.amountWithTax, 0) / 100 || 0,
discounts: order.discounts.map(item => { discounts: order.discounts.map(item => {
return { value: item.amountWithTax, description: item.description } return { value: item.amountWithTax, description: item.description }

2
src/components/modules/checkout/CheckoutBill/CheckoutBill.tsx
View File

@@ -49,7 +49,7 @@ const CheckoutBill = ({ data }: CheckoutBillProps) => {
</div> </div>
<div className={s.line}> <div className={s.line}>
Shipping Shipping
<div className={s.shipping}>{data?.shippingLine.priceWithTax || 0} {data?.currency?.code}</div> <div className={s.shipping}>{data?.shippingLine?.priceWithTax || 0} {data?.currency?.code}</div>
</div> </div>
<div className={s.line}> <div className={s.line}>
Estimated Total Estimated Total

6
src/components/modules/checkout/CheckoutInfo/CheckoutInfo.tsx
View File

@@ -91,8 +91,10 @@ const CheckoutInfo = ({ onViewCart, currency = "" }: CheckoutInfoProps) => {
} }
return '' return ''
case CheckoutStep.ShippingMethodInfo: case CheckoutStep.ShippingMethodInfo:
console.log('oder here: ', order?.shippingLine) if (order?.shippingLine) {
return `${order?.shippingLine.shippingMethod.name}, ${order?.shippingLine.priceWithTax ? `${order?.shippingLine.priceWithTax} ${currency}`: 'Free'}` || '' return `${order?.shippingLine.shippingMethod.name}, ${order?.shippingLine.priceWithTax ? `${order?.shippingLine.priceWithTax} ${currency}` : 'Free'}` || ''
}
return ''
default: default:
return "" return ""
} }