From 96e59b7af6895f82ac005d60b65084bd5ec2d01f Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Thu, 31 Aug 2023 16:47:34 +0700 Subject: change ui open newtab, g maps, top banner, profil --- src/lib/auth/components/CompanyProfile.jsx | 2 +- src/lib/checkout/components/Checkout.jsx | 752 +++++++++++++++-------------- src/lib/product/components/ProductCard.jsx | 2 +- 3 files changed, 403 insertions(+), 353 deletions(-) (limited to 'src/lib') diff --git a/src/lib/auth/components/CompanyProfile.jsx b/src/lib/auth/components/CompanyProfile.jsx index ff673953..2faede9b 100644 --- a/src/lib/auth/components/CompanyProfile.jsx +++ b/src/lib/auth/components/CompanyProfile.jsx @@ -93,7 +93,7 @@ const CompanyProfile = () => { />
-
Nama Usaha
+
Badan Usaha
{
)} -
+
{item.canApply && (
{ >

Tambah produk{' '} - {item.manufactureNames} senilai{' '} + {item.manufactureNames}{' '} + senilai{' '} {currencyFormat(item.minPurchaseAmount)} {' '} @@ -537,7 +540,8 @@ const Checkout = () => { >

Tambah produk{' '} - {item.manufactureNames} senilai{' '} + {item.manufactureNames}{' '} + senilai{' '} {currencyFormat(item.differenceToApply)} {' '} @@ -652,6 +656,29 @@ const Checkout = () => { + {selectedCarrierId == SELF_PICKUP_ID && ( +

+ +
+ )} + {selectedCarrierId == SELF_PICKUP_ID && } {selectedCarrierId != SELF_PICKUP_ID && ( <> @@ -884,393 +911,416 @@ const Checkout = () => { -
-
- {selectedCarrierId == SELF_PICKUP_ID && } - {selectedCarrierId != SELF_PICKUP_ID && ( - <> - - - - - )} - - - - - +
+ {selectedCarrierId == SELF_PICKUP_ID && ( + + )} + +
+ {' '} +
+ {selectedCarrierId == SELF_PICKUP_ID && } + {selectedCarrierId != SELF_PICKUP_ID && ( + <> + + + + + )} + + + + + -
-
Detail Pesanan
- - - - - - - - - - - {!products ? ( +
+
Detail Pesanan
+
Nama ProdukJumlahHargaSubtotal
+ - + + + + - ) : ( - products?.map((product) => ( - <> - - + + {!products ? ( + + + + ) : ( + products?.map((product) => ( + <> + + - - - - - {product.program && - product.program.items && - product.program.items.map((item) => ( - <> - - + + - - + + + {product.program && + product.program.items && + product.program.items.map((item) => ( + <> + + - - - - - ))} - - )) - )} - -
-
-
-
-
-
-
- 		Nama ProdukJumlahHargaSubtotal
-
- {product?.name} -
-
-
- {product?.parent?.name} -
-
- {product?.code}{' '} - {product?.attributes.length > 0 - ? `| ${product?.attributes.join(', ')}` - : ''} -
-
- Berat item : {product?.weight} Kg +
+
+
+
+
+
+
+
+
+ {product?.name}
- - 		- - - {product?.price?.discountPercentage > 0 && ( -
-
- {currencyFormat(product?.price?.price)} +
+
+ {product?.parent?.name}
-
- {product?.price?.discountPercentage}% +
+ {product?.code}{' '} + {product?.attributes.length > 0 + ? `| ${product?.attributes.join(', ')}` + : ''} +
+
+ Berat item : {product?.weight} Kg
- )} -
- {product.price.priceDiscount > 0 - ? currencyFormat(product?.price?.priceDiscount) - : 'Call For Price'} -
-
-
- {product.price.priceDiscount > 0 ? ( - currencyFormat(product?.price?.priceDiscount * product?.quantity) - ) : ( - - Call For Price{' '} - - )} -
-
-
- {item.name} +
+ + + {product?.price?.discountPercentage > 0 && ( +
+
+ {currencyFormat(product?.price?.price)}
-
-
- - {product.program.type.label} - -
-
{item.name}
+
+ {product?.price?.discountPercentage}%
-
- - - {item?.price?.discountPercentage > 0 && ( -
-
- {currencyFormat(product?.price?.price)} +
+ )} +
+ {product.price.priceDiscount > 0 + ? currencyFormat(product?.price?.priceDiscount) + : 'Call For Price'} +
+
+
+ {product.price.priceDiscount > 0 ? ( + currencyFormat(product?.price?.priceDiscount * product?.quantity) + ) : ( + + Call For Price{' '} + + )} +
+
+
+ {item.name} +
+
+
+ + {product.program.type.label} +
+
{item.name}
- )} -
- {item?.price.priceDiscount > 0 ? 'Gratis' : ''} -
- 		-
- {item.price.priceDiscount > 0 ? 'Gratis' : ''} -
-
-
-
- -
-
-
-
Ringkasan Pesanan
-
{products?.length} Barang
+ + + + + + {item?.price?.discountPercentage > 0 && ( +
+
+ {currencyFormat(product?.price?.price)} +
+
+ )} +
+ {item?.price.priceDiscount > 0 ? 'Gratis' : ''} +
+ + +
+ {item.price.priceDiscount > 0 ? 'Gratis' : ''} +
+ + + + + ))} + + )) + )} + +
+
+
+
+
+
Ringkasan Pesanan
+
{products?.length} Barang
+
-
- {!cartCheckout ? ( -
-
-
-
+
+ {!cartCheckout ? ( +
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+ ) : ( +
+
+
Total Belanja
+
{currencyFormat(cartCheckout?.totalPurchase)}
+
+
+
Diskon Produk
+
+ - {currencyFormat(cartCheckout?.totalDiscount)} +
+
+ {activeVoucher && ( +
+
Diskon Voucher
+
- {currencyFormat(discountVoucher)}
+
+ )} +
+
Subtotal
+
{currencyFormat(cartCheckout?.subtotal)}
+
+
+
PPN 11%
+
{currencyFormat(cartCheckout?.tax)}
+
+
+
+ Biaya Kirim +

{etdFix}

+
+
+ {currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000)} +
-
-
+ )} + +
+ {!cartCheckout ? ( +
+ {' '}
-
-
-
- ) : ( -
-
-
Total Belanja
-
{currencyFormat(cartCheckout?.totalPurchase)}
-
-
-
Diskon Produk
-
- - {currencyFormat(cartCheckout?.totalDiscount)} +
+
- {activeVoucher && ( -
-
Diskon Voucher
-
- {currencyFormat(discountVoucher)}
+ ) : ( +
+
Grand Total
+
+ {currencyFormat( + cartCheckout?.grandTotal + + Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000 + )}
- )} -
-
Subtotal
-
{currencyFormat(cartCheckout?.subtotal)}
-
-
-
PPN 11%
-
{currencyFormat(cartCheckout?.tax)}
-
-
- Biaya Kirim -

{etdFix}

-
-
- {currencyFormat(Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000)} + )} + +
+ +
+
+ {'>'} +
- )} -
- {!cartCheckout ? ( -
-
- {' '} -
-
-
-
-
+

+ Dengan melakukan pembelian melalui website Indoteknik, saya menyetujui{' '} + + Syarat & Ketentuan + {' '} + yang berlaku +

+ +
+ +
+ Purchase Order (Opsional)
- ) : ( -
-
Grand Total
-
- {currencyFormat( - cartCheckout?.grandTotal + - Math.round(parseInt(biayaKirim * 1.1) / 1000) * 1000 - )} + +
+
+ + +
+
+ +
- )} +

Ukuran dokumen PO Maksimal 5MB

-
+
-
+ {priceCheck && ( +
+ + *) Terdapat produk yang belum memiliki harga,{' '} + + Hubungi Kami untuk meminta harga. + - {activeVoucher ? ( -
-
- Hemat {currencyFormat(discountVoucher)} -
-
- Voucher berhasil digunakan -
-
- ) : ( - - Hemat belanja dengan promo - - )}
- {'>'} - -
- -

- Dengan melakukan pembelian melalui website Indoteknik, saya menyetujui{' '} - - Syarat & Ketentuan - {' '} - yang berlaku -

- -
- -
- Purchase Order (Opsional) -
- -
-
- - -
-
- - -
+ )}
-

Ukuran dokumen PO Maksimal 5MB

- -
- - - {priceCheck && ( -
- - *) Terdapat produk yang belum memiliki harga,{' '} - - Hubungi Kami untuk meminta harga. - - -
- )}
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx index 2c849bd6..abf462a1 100644 --- a/src/lib/product/components/ProductCard.jsx +++ b/src/lib/product/components/ProductCard.jsx @@ -44,7 +44,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => { width={13} height={5} /> - + {product?.flashSale?.tag != "false" || product?.flashSale?.tag != product?.flashSale?.tag ? product?.flashSale?.tag : 'FLASH SALE'}
-- cgit v1.2.3 From 643c1cc2203d05286b94e591f53560eec83e3f14 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 4 Sep 2023 11:05:29 +0700 Subject: layanan pelanggan & icon gear di ganti icon user --- src/lib/auth/components/Menu.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/auth/components/Menu.jsx b/src/lib/auth/components/Menu.jsx index 939a0d5f..f475db1f 100644 --- a/src/lib/auth/components/Menu.jsx +++ b/src/lib/auth/components/Menu.jsx @@ -1,6 +1,7 @@ import Link from '@/core/components/elements/Link/Link' import { useRouter } from 'next/router' import ImageNext from 'next/image' +import whatsappUrl from '@/core/utils/whatsappUrl' const Menu = () => { const router = useRouter() @@ -42,7 +43,7 @@ const Menu = () => {
Pusat Bantuan
- +

Layanan Pelanggan

-- cgit v1.2.3 From 009aab3dfc5a08f19c8e147f380dc6517b9f6fd1 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Tue, 5 Sep 2023 10:09:08 +0700 Subject: cr icon & uncomment login google --- src/lib/auth/components/LoginDesktop.jsx | 8 ++++---- src/lib/auth/components/LoginMobile.jsx | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/auth/components/LoginDesktop.jsx b/src/lib/auth/components/LoginDesktop.jsx index 838054cd..42fa8896 100644 --- a/src/lib/auth/components/LoginDesktop.jsx +++ b/src/lib/auth/components/LoginDesktop.jsx @@ -95,13 +95,13 @@ const LoginDesktop = () => { {!isLoading ? 'Masuk' : 'Loading...'} - {/*
+

ATAU

-
*/} +
- {/* */} +
Belum punya akun Indoteknik?{' '} diff --git a/src/lib/auth/components/LoginMobile.jsx b/src/lib/auth/components/LoginMobile.jsx index 2d6501cd..ed032295 100644 --- a/src/lib/auth/components/LoginMobile.jsx +++ b/src/lib/auth/components/LoginMobile.jsx @@ -13,10 +13,19 @@ import BottomPopup from '@/core/components/elements/Popup/BottomPopup' import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner' import odooApi from '@/core/api/odooApi' import { getAuth } from '@/core/utils/auth' +import PageContent from '@/lib/content/components/PageContent' const LoginMobile = () => { - const { handleSubmit, handleChangeInput, isLoading, isValid, alert, emailRef, passwordRef, handleGoogleSubmit } = - useLogin() + const { + handleSubmit, + handleChangeInput, + isLoading, + isValid, + alert, + emailRef, + passwordRef, + handleGoogleSubmit + } = useLogin() const router = useRouter() const [query, setQuery] = useState(router?.query?.next || '/') @@ -91,13 +100,13 @@ const LoginMobile = () => { {!isLoading ? 'Masuk' : 'Loading...'} - {/*
+

ATAU

-
*/} +
- {/* */} +
Belum punya akun Indoteknik?{' '} @@ -118,6 +127,9 @@ const LoginMobile = () => { Daftar
+ {/*
+ +
*/}
) -- cgit v1.2.3