From 553b0f62ebe2254b046a6c6091a3345a5ede7751 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 30 Sep 2024 10:02:13 +0700 Subject: update summary keranjang mobile porition --- src-migrate/pages/shop/cart/cart.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-migrate/pages/shop/cart/cart.module.css b/src-migrate/pages/shop/cart/cart.module.css index 806104be..b756fb15 100644 --- a/src-migrate/pages/shop/cart/cart.module.css +++ b/src-migrate/pages/shop/cart/cart.module.css @@ -19,7 +19,7 @@ } .summary-wrapper { - @apply w-full md:w-1/4 md:pl-6 mt-6 md:mt-0 bottom-0 md:sticky sticky bg-white; + @apply w-[85%] md:w-1/4 md:pl-6 mt-6 md:mt-0 bottom-8 md:sticky fixed bg-white; } .summary { -- cgit v1.2.3 From 0a5fdb5d712a23164d9da0758d4f88ab70ef1f2e Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Mon, 30 Sep 2024 17:43:38 +0700 Subject: update register kesalahan bisa ubah npwp --- src/lib/address/components/EditAddress.jsx | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx index ff6b1f12..53368947 100644 --- a/src/lib/address/components/EditAddress.jsx +++ b/src/lib/address/components/EditAddress.jsx @@ -45,7 +45,7 @@ const EditAddress = ({ id, defaultValues }) => { setValue('business_name', dataProfile.name); }; if (auth) loadProfile(); - }, [auth, setValue]); + }, [auth?.parentId]); useEffect(() => { const loadCities = async () => { @@ -111,30 +111,30 @@ const EditAddress = ({ id, defaultValues }) => { district_id: values.district, sub_district_id: values.subDistrict, }; + if (!auth.company) { + data.alamat_lengkap_text = values.street; + } const address = await editAddressApi({ id, data }); let dataAlamat; let isUpdated = true; - if (auth?.partnerId == id) { - dataAlamat = { - id_user: auth.partnerId, - company_type_id: values.companyType, - industry_id: values.industry, - tax_name: values.taxName, - alamat_lengkap_text: values.alamat_wajib_pajak, - street: values.street, - business_name: values.business_name, - name: values.business_name, - npwp: values.npwp, - }; - isUpdated = await odooApi( - 'PUT', - `/api/v1/partner/${auth.parentId}`, - dataAlamat - ); + if (auth.company) { + if (auth?.partnerId == id) { + dataAlamat = { + id_user: auth.partnerId, + alamat_lengkap_text: values.alamat_wajib_pajak, + street: values.street, + }; + console.log('dataAlamat', dataAlamat); + isUpdated = await odooApi( + 'PUT', + `/api/v1/partner/${auth.parentId}`, + dataAlamat + ); + } } // if (isUpdated?.id) { - if (address?.id && isUpdated?.id) { + if (address?.id && auth.company ? isUpdated?.id : true) { toast.success('Berhasil mengubah alamat'); router.back(); } else { -- cgit v1.2.3 From 50bf76a1bd5ff592a84cc49bd8ef95ac4def0fdc Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Tue, 1 Oct 2024 08:46:55 +0700 Subject: delete cosole log --- src-migrate/modules/page-content/index.tsx | 1 - src/lib/address/components/EditAddress.jsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src-migrate/modules/page-content/index.tsx b/src-migrate/modules/page-content/index.tsx index af597641..edecb855 100644 --- a/src-migrate/modules/page-content/index.tsx +++ b/src-migrate/modules/page-content/index.tsx @@ -20,7 +20,6 @@ const PageContent = ({ path }: Props) => { `src="${process.env.NEXT_PUBLIC_ODOO_API_HOST}/web/image` ); }, [data]); - console.log('parsedContent', parsedContent); if (isLoading) return ; return
; diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx index 53368947..182c8a31 100644 --- a/src/lib/address/components/EditAddress.jsx +++ b/src/lib/address/components/EditAddress.jsx @@ -124,7 +124,6 @@ const EditAddress = ({ id, defaultValues }) => { alamat_lengkap_text: values.alamat_wajib_pajak, street: values.street, }; - console.log('dataAlamat', dataAlamat); isUpdated = await odooApi( 'PUT', `/api/v1/partner/${auth.parentId}`, -- cgit v1.2.3 From fbdcd34fc1dd5fce8c56c972e4f0658661435459 Mon Sep 17 00:00:00 2001 From: trisusilo48 Date: Tue, 1 Oct 2024 13:55:00 +0700 Subject: optimize banner --- src/components/ui/HeroBanner.jsx | 14 +++++++++++++- src/components/ui/HeroBannerSecondary.jsx | 12 ++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/components/ui/HeroBanner.jsx b/src/components/ui/HeroBanner.jsx index 9a62465d..64838b85 100644 --- a/src/components/ui/HeroBanner.jsx +++ b/src/components/ui/HeroBanner.jsx @@ -39,16 +39,28 @@ const HeroBanner = () => { pagination: { dynamicBullets: false, clickable: true }, }; + const customLoader = ({ src }) => { + return src; // Loader yang mengembalikan URL gambar asli + }; + const BannerComponent = useMemo(() => { - return heroBanner.data?.map((banner, index) => ( + if (!heroBanner.data) return null; + + return heroBanner.data.map((banner, index) => ( {banner.name} diff --git a/src/components/ui/HeroBannerSecondary.jsx b/src/components/ui/HeroBannerSecondary.jsx index b1023990..a7b32a4a 100644 --- a/src/components/ui/HeroBannerSecondary.jsx +++ b/src/components/ui/HeroBannerSecondary.jsx @@ -18,18 +18,22 @@ const HeroBannerSecondary = () => { if (heroBannerSecondary.isLoading) return return ( - heroBannerSecondary.data && ( - + heroBannerSecondary.data && randomIndex !== null && ( + {heroBannerSecondary.data[randomIndex].name} ) - ) + ); } export default HeroBannerSecondary -- cgit v1.2.3 From 7618ecdfc094070abb711dc32c67085c2fb22a56 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 2 Oct 2024 09:15:41 +0700 Subject: comment login using google --- src/lib/auth/components/LoginDesktop.jsx | 4 ++-- src/lib/auth/components/LoginMobile.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/auth/components/LoginDesktop.jsx b/src/lib/auth/components/LoginDesktop.jsx index 9a68dc53..600392fb 100644 --- a/src/lib/auth/components/LoginDesktop.jsx +++ b/src/lib/auth/components/LoginDesktop.jsx @@ -109,7 +109,7 @@ const LoginDesktop = () => { {!isLoading ? 'Masuk' : 'Loading...'} -
+ {/*

ATAU

@@ -128,7 +128,7 @@ const LoginDesktop = () => { height={10} />

Masuk dengan Google

- + */}
Belum punya akun Indoteknik?{' '} diff --git a/src/lib/auth/components/LoginMobile.jsx b/src/lib/auth/components/LoginMobile.jsx index d2bf704f..40924fbe 100644 --- a/src/lib/auth/components/LoginMobile.jsx +++ b/src/lib/auth/components/LoginMobile.jsx @@ -117,7 +117,7 @@ const LoginMobile = () => { {!isLoading ? 'Masuk' : 'Loading...'} -
+ {/*

ATAU

@@ -136,7 +136,7 @@ const LoginMobile = () => { height={10} />

Masuk dengan Google

- + */}
Belum punya akun Indoteknik?{' '} -- cgit v1.2.3 From 2e6ce4c69cd15066fb6af35c2d7bf92d4316c9c9 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Wed, 2 Oct 2024 10:02:34 +0700 Subject: uncomment login using google --- src/lib/auth/components/LoginDesktop.jsx | 4 ++-- src/lib/auth/components/LoginMobile.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/auth/components/LoginDesktop.jsx b/src/lib/auth/components/LoginDesktop.jsx index 600392fb..9a68dc53 100644 --- a/src/lib/auth/components/LoginDesktop.jsx +++ b/src/lib/auth/components/LoginDesktop.jsx @@ -109,7 +109,7 @@ const LoginDesktop = () => { {!isLoading ? 'Masuk' : 'Loading...'} - {/*
+

ATAU

@@ -128,7 +128,7 @@ const LoginDesktop = () => { height={10} />

Masuk dengan Google

- */} +
Belum punya akun Indoteknik?{' '} diff --git a/src/lib/auth/components/LoginMobile.jsx b/src/lib/auth/components/LoginMobile.jsx index 40924fbe..d2bf704f 100644 --- a/src/lib/auth/components/LoginMobile.jsx +++ b/src/lib/auth/components/LoginMobile.jsx @@ -117,7 +117,7 @@ const LoginMobile = () => { {!isLoading ? 'Masuk' : 'Loading...'} - {/*
+

ATAU

@@ -136,7 +136,7 @@ const LoginMobile = () => { height={10} />

Masuk dengan Google

- */} +
Belum punya akun Indoteknik?{' '} -- cgit v1.2.3 From f8abd467d40ce9c98d0b10d436181fc2d9b69986 Mon Sep 17 00:00:00 2001 From: trisusilo48 Date: Wed, 2 Oct 2024 14:37:13 +0700 Subject: oprimize code --- .../components/elements/Navbar/NavbarDesktop.jsx | 30 +++++++++------------- src/lib/transaction/api/transactionsApi.js | 3 +++ src/pages/index.jsx | 16 +++++------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx index eebfbcd5..04cf76d1 100644 --- a/src/core/components/elements/Navbar/NavbarDesktop.jsx +++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx @@ -5,34 +5,28 @@ import { createSlug } from '@/core/utils/slug'; import whatsappUrl from '@/core/utils/whatsappUrl'; import IndoteknikLogo from '@/images/logo.png'; import Cardheader from '@/lib/cart/components/Cartheader'; -import Quotationheader from '../../../../../src/lib/quotation/components/Quotationheader.jsx'; import Category from '@/lib/category/components/Category'; -import { useProductCartContext } from '@/contexts/ProductCartContext'; +import useTransactions from '@/lib/transaction/hooks/useTransactions'; +import { + Menu, + MenuButton, + MenuItem, + MenuList, + useDisclosure +} from '@chakra-ui/react'; import { ChevronDownIcon, - DocumentCheckIcon, - HeartIcon, - ArrowUpRightIcon, + HeartIcon } from '@heroicons/react/24/outline'; import dynamic from 'next/dynamic'; -import Image from 'next/image'; +import { default as Image, default as NextImage } from 'next/image'; import { useRouter } from 'next/router'; import { useCallback, useEffect, useState } from 'react'; +import { useCartStore } from '~/modules/cart/stores/useCartStore'; +import Quotationheader from '../../../../../src/lib/quotation/components/Quotationheader.jsx'; import DesktopView from '../../views/DesktopView'; import Link from '../Link/Link'; import NavbarUserDropdown from './NavbarUserDropdown'; -import NextImage from 'next/image'; -import { - Button, - Menu, - MenuButton, - MenuItem, - MenuList, - useDisclosure, -} from '@chakra-ui/react'; -import style from './style/NavbarDesktop.module.css'; -import useTransactions from '@/lib/transaction/hooks/useTransactions'; -import { useCartStore } from '~/modules/cart/stores/useCartStore'; const Search = dynamic(() => import('./Search'), { ssr: false }); const TopBanner = dynamic(() => import('./TopBanner'), { ssr: false }); diff --git a/src/lib/transaction/api/transactionsApi.js b/src/lib/transaction/api/transactionsApi.js index f4e36e6f..5ea2b5b0 100644 --- a/src/lib/transaction/api/transactionsApi.js +++ b/src/lib/transaction/api/transactionsApi.js @@ -3,6 +3,9 @@ import { getAuth } from '@/core/utils/auth' const transactionsApi = async ({ query }) => { const auth = getAuth() + if (!auth) { + return null + } const dataTransactions = await odooApi( 'GET', `/api/v1/partner/${auth.partnerId}/sale_order?${query}` diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 6077c192..ac925b4e 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -1,21 +1,19 @@ -import dynamic from 'next/dynamic'; -import { useEffect, useRef, useState } from 'react'; import { HeroBannerSkeleton } from '@/components/skeleton/BannerSkeleton'; import { PopularProductSkeleton } from '@/components/skeleton/PopularProductSkeleton'; +import odooApi from '@/core/api/odooApi'; import Seo from '@/core/components/Seo'; import DelayRender from '@/core/components/elements/DelayRender/DelayRender'; import DesktopView from '@/core/components/views/DesktopView'; import MobileView from '@/core/components/views/MobileView'; import { FlashSaleSkeleton } from '@/lib/flashSale/skeleton/FlashSaleSkeleton'; -import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton'; import BannerPromoSkeleton from '@/lib/home/components/Skeleton/BannerPromoSkeleton'; -import PromotinProgram from '@/lib/promotinProgram/components/HomePage'; +import PreferredBrandSkeleton from '@/lib/home/components/Skeleton/PreferredBrandSkeleton'; +import dynamic from 'next/dynamic'; +import { useEffect, useRef, useState } from 'react'; +import { getAuth } from '~/libs/auth'; import PagePopupIformation from '~/modules/popup-information'; // need change to dynamic and ssr : false import CategoryPilihan from '../lib/home/components/CategoryPilihan'; -import odooApi from '@/core/api/odooApi'; -import { getAuth } from '~/libs/auth'; // import { getAuth } from '~/libs/auth'; -import useProductDetail from '~/modules/product-detail/stores/useProductDetail'; const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'),{ssr: false} @@ -55,14 +53,14 @@ const ProgramPromotion = dynamic(() => ); const BannerSection = dynamic(() => - import('@/lib/home/components/BannerSection'), {ssr: false} + import('@/lib/home/components/BannerSection') ); const CategoryHomeId = dynamic(() => import('@/lib/home/components/CategoryHomeId'), {ssr: false} ); const CategoryDynamic = dynamic(() => - import('@/lib/home/components/CategoryDynamic'), {ssr: false} + import('@/lib/home/components/CategoryDynamic'), {ssr : false} ); const CategoryDynamicMobile = dynamic(() => -- cgit v1.2.3