diff --git a/public/static/images/common/Logo.svg b/public/static/images/common/Logo.svg index fa04f4d3..01e85313 100644 --- a/public/static/images/common/Logo.svg +++ b/public/static/images/common/Logo.svg @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/app/layout.js b/src/app/layout.js index a77f926c..6186f5ed 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -21,8 +21,8 @@ import GlobalLoadingProvider from './GlobalLoadingProvider' * 서버 컴포넌트에 한해서 개별로 설정할 수 있음 */ export const metadata = { - title: 'HANASYS設計', - description: 'HANASYS設計', + title: 'HANASYS DESIGN', + description: 'HANASYS DESIGN', } /** diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index aa11943e..cf38bd7b 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -498,6 +498,18 @@ export default function Estimate({}) { }) } + //Pricing 버튼클릭시 confirm 노출 + const handlePricingBtn = (showPriceCd) => { + swalFire({ + text: getMessage('estimate.detail.showPrice.pricingBtn.confirm'), + type: 'confirm', + icon: 'warning', + confirmFn: () => { + handlePricing(showPriceCd) + }, + }) + } + //Pricing 버튼 const handlePricing = async (showPriceCd) => { const param = { @@ -1075,7 +1087,7 @@ export default function Estimate({}) { item.showSaleTotPrice = '0' } - if (item.dispCableFlg === '1') { + if (item.dispCableFlg === '1' && item.itemTpCd !== 'M12') { dispCableFlgCnt++ setCableItem(item.itemId) } @@ -1808,9 +1820,10 @@ export default function Estimate({}) {