Skip to content

Commit

Permalink
fix: updating vars in translations (#810)
Browse files Browse the repository at this point in the history
  • Loading branch information
deov31 authored Oct 24, 2023
1 parent b32c290 commit c086981
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function QuickAdd(props: AddToListContentProps) {
useEffect(() => {
let formFields: CustomFieldItems[] = []
loopRows(rows, (index) => {
formFields = [...formFields, ...getQuickAddRowFields(index)]
formFields = [...formFields, ...getQuickAddRowFields(index, b3Lang)]
})
setFormFields(formFields)
}, [rows])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,13 @@ function QuickorderTable({
fiterMoreInfo={[]}
startPicker={{
isEnabled: true,
label: b3Lang('ppurchasedProducts.from'),
label: b3Lang('purchasedProducts.from'),
defaultValue: search?.beginDateAt || '',
pickerKey: 'start',
}}
endPicker={{
isEnabled: true,
label: b3Lang('ppurchasedProducts.to'),
label: b3Lang('purchasedProducts.to'),
defaultValue: search?.endDateAt || '',
pickerKey: 'end',
}}
Expand All @@ -504,13 +504,13 @@ function QuickorderTable({
}}
startPicker={{
isEnabled: true,
label: b3Lang('ppurchasedProducts.from'),
label: b3Lang('purchasedProducts.from'),
defaultValue: distanceDay(90),
pickerKey: 'start',
}}
endPicker={{
isEnabled: true,
label: b3Lang('ppurchasedProducts.to'),
label: b3Lang('purchasedProducts.to'),
defaultValue: distanceDay(),
pickerKey: 'end',
}}
Expand Down
6 changes: 5 additions & 1 deletion apps/storefront/src/pages/quote/components/QuoteInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ function QuoteInfo({
flexDirection: isMobile ? 'column' : 'row',
}}
>
<QuoteInfoItem title="Contact" flag="info" info={contactInfo} />
<QuoteInfoItem
title={b3Lang('quoteDraft.contactInfo.contact')}
flag="info"
info={contactInfo}
/>

<QuoteInfoItem
title={b3Lang('global.quoteInfo.billing')}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ChangeEvent, KeyboardEvent, useContext } from 'react'
import { useB3Lang } from '@b3/lang'
import SearchIcon from '@mui/icons-material/Search'
import { Box, InputAdornment, TextField, Typography } from '@mui/material'

Expand Down Expand Up @@ -79,6 +80,7 @@ interface ProductListDialogProps {
const ProductTable = B3ProductList<ShoppingListProductItem>

export default function ProductListDialog(props: ProductListDialogProps) {
const b3Lang = useB3Lang()
const {
isOpen,
onCancel,
Expand All @@ -90,8 +92,8 @@ export default function ProductListDialog(props: ProductListDialogProps) {
onAddToListClick,
onChooseOptionsClick,
isLoading,
searchDialogTitle = 'Add to list',
addButtonText = 'Add to list',
searchDialogTitle = b3Lang('shoppingLists.title'),
addButtonText = b3Lang('shoppingLists.addButtonText'),
} = props

const [isMobile] = useMobile()
Expand Down Expand Up @@ -147,7 +149,7 @@ export default function ProductListDialog(props: ProductListDialogProps) {
showRightBtn={false}
loading={isLoading}
maxWidth="md"
leftSizeBtn="close"
leftSizeBtn={b3Lang('shoppingLists.close')}
>
<B3Sping isSpinning={isLoading}>
<Box
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function QuickAdd(props: AddToListContentProps) {
useEffect(() => {
let formFields: CustomFieldItems[] = []
loopRows(rows, (index) => {
formFields = [...formFields, ...getQuickAddRowFields(index)]
formFields = [...formFields, ...getQuickAddRowFields(index, b3Lang)]
})
setFormFields(formFields)
}, [rows])
Expand Down Expand Up @@ -86,7 +86,7 @@ export default function QuickAdd(props: AddToListContentProps) {
setError(`sku-${index}`, {
type: 'manual',
message: b3Lang('global.validate.required', {
label: 'SKU#',
label: b3Lang('purchasedProducts.quickAdd.sku'),
}),
})
isValid = false
Expand All @@ -96,7 +96,7 @@ export default function QuickAdd(props: AddToListContentProps) {
setError(`qty-${index}`, {
type: 'manual',
message: b3Lang('global.validate.required', {
label: 'Qty',
label: b3Lang('purchasedProducts.quickAdd.qty'),
}),
})
isValid = false
Expand Down
10 changes: 7 additions & 3 deletions apps/storefront/src/utils/b3Product/shared/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { LangFormatFunction } from '@b3/lang'
import format from 'date-fns/format'
import isEmpty from 'lodash-es/isEmpty'

Expand Down Expand Up @@ -569,10 +570,13 @@ export const getOptionRequestData = (
return requestData
}

export const getQuickAddRowFields = (name: string | number) => [
export const getQuickAddRowFields = (
name: string | number,
b3Lang: LangFormatFunction
) => [
{
name: `sku-${name}`,
label: 'SKU#',
label: b3Lang('purchasedProducts.quickAdd.sku') || 'SKU#',
required: false,
xs: 8,
variant: 'filled',
Expand All @@ -582,7 +586,7 @@ export const getQuickAddRowFields = (name: string | number) => [
},
{
name: `qty-${name}`,
label: 'Qty',
label: b3Lang('purchasedProducts.quickAdd.qty') || 'Qty',
required: false,
xs: 4,
variant: 'filled',
Expand Down

0 comments on commit c086981

Please sign in to comment.