fix: update next.js version

[FEAT/FE][US#164] Expense Realization

See merge request mbugroup/lti-web-client!67

.gitignore

@@ -40,8 +40,5 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-# prettier
-.prettierrc
-
 # idea
 .idea

.gitlab-ci.yml

@@ -15,8 +15,24 @@ stages:
   script:
     - echo "Installing dependencies..."
     - npm ci --no-audit --no-fund
+    - echo "Build env used:"
+    - echo "NEXT_PUBLIC_LTI_URL=$NEXT_PUBLIC_LTI_URL"
+    - echo "NEXT_PUBLIC_SSO_LOGIN_URL=$NEXT_PUBLIC_SSO_LOGIN_URL"
+    - echo "NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL"
     - echo "Building Next.js static export..."
     - npx next build
+    - |
+      mkdir -p out
+      cat <<EOF > out/build-info.json
+      {
+        "commit": "$CI_COMMIT_SHORT_SHA",
+        "pipeline": "$CI_PIPELINE_ID",
+        "built_at": "$(date -u +"%Y-%m-%dT%H:%M:%SZ")",
+        "NEXT_PUBLIC_LTI_URL": "$NEXT_PUBLIC_LTI_URL",
+        "NEXT_PUBLIC_SSO_LOGIN_URL": "$NEXT_PUBLIC_SSO_LOGIN_URL",
+        "NEXT_PUBLIC_API_BASE_URL": "$NEXT_PUBLIC_API_BASE_URL"
+      }
+      EOF
   artifacts:
     name: 'out-$CI_COMMIT_SHORT_SHA'
     paths:
@@ -106,8 +122,11 @@ build:dev:
   environment:
     name: development
   variables:
-    NEXT_PUBLIC_API_BASE_URL: 'https://dev-api-lti.mbugroup.id'
-    NEXT_PUBLIC_SSO_LOGIN_URL: 'https://dev-api-sso.mbugroup.id'
+    # NEXT_PUBLIC_API_BASE_URL: 'https://dev-api-lti.mbugroup.id'
+    # NEXT_PUBLIC_SSO_LOGIN_URL: 'https://dev-api-sso.mbugroup.id'
+    NEXT_PUBLIC_LTI_URL: 'https://dev-lti-erp.mbugroup.id'
+    NEXT_PUBLIC_SSO_LOGIN_URL: 'https://dev-auth-erp.mbugroup.id'
+    NEXT_PUBLIC_API_BASE_URL: 'https://dev-api-lti.mbugroup.id/api'
 
 deploy:dev:
   <<: *deploy_template
@@ -121,6 +140,7 @@ deploy:dev:
   environment:
     name: development
     url: https://dev-lti-erp.mbugroup.id
+    
 # ====== PRODUCTION ======
 # build:production:
 #   <<: *build_template
@@ -142,5 +162,5 @@ deploy:dev:
 #     CLOUDFRONT_DISTRIBUTION_ID: "ddfd"
 #   environment:
 #     name: production
-# url: https://royalgoldcapital.com
+
 

.husky/pre-commit

@@ -1,3 +1,3 @@
 npm run format
 npm run lint
-npm run build
+npm run build

package-lock.json

@@ -8,14 +8,14 @@
       "name": "lti-web-client",
       "version": "0.1.0",
       "dependencies": {
+        "@react-pdf/renderer": "^4.3.1",
         "@tanstack/match-sorter-utils": "^8.19.4",
         "@tanstack/react-table": "^8.21.3",
         "axios": "^1.12.2",
         "clsx": "^2.1.1",
         "formik": "^2.4.6",
-        "inputmask": "^5.0.9",
         "moment": "^2.30.1",
-        "next": "15.5.3",
+        "next": "15.5.7",
         "react": "19.1.0",
         "react-day-picker": "^9.11.1",
         "react-dom": "19.1.0",
@@ -33,7 +33,6 @@
         "@eslint/eslintrc": "^3",
         "@iconify/react": "^6.0.2",
         "@tailwindcss/postcss": "^4",
-        "@types/inputmask": "^5.0.7",
         "@types/node": "^20",
         "@types/react": "^19",
         "@types/react-dom": "^19",
@@ -1083,9 +1082,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.3.tgz",
-      "integrity": "sha512-RSEDTRqyihYXygx/OJXwvVupfr9m04+0vH8vyy0HfZ7keRto6VX9BbEk0J2PUk0VGy6YhklJUSrgForov5F9pw==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.7.tgz",
+      "integrity": "sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
@@ -1099,9 +1098,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.3.tgz",
-      "integrity": "sha512-nzbHQo69+au9wJkGKTU9lP7PXv0d1J5ljFpvb+LnEomLtSbJkbZyEs6sbF3plQmiOB2l9OBtN2tNSvCH1nQ9Jg==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz",
+      "integrity": "sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==",
       "cpu": [
         "arm64"
       ],
@@ -1115,9 +1114,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.3.tgz",
-      "integrity": "sha512-w83w4SkOOhekJOcA5HBvHyGzgV1W/XvOfpkrxIse4uPWhYTTRwtGEM4v/jiXwNSJvfRvah0H8/uTLBKRXlef8g==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.7.tgz",
+      "integrity": "sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==",
       "cpu": [
         "x64"
       ],
@@ -1131,9 +1130,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.3.tgz",
-      "integrity": "sha512-+m7pfIs0/yvgVu26ieaKrifV8C8yiLe7jVp9SpcIzg7XmyyNE7toC1fy5IOQozmr6kWl/JONC51osih2RyoXRw==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.7.tgz",
+      "integrity": "sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==",
       "cpu": [
         "arm64"
       ],
@@ -1147,9 +1146,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.3.tgz",
-      "integrity": "sha512-u3PEIzuguSenoZviZJahNLgCexGFhso5mxWCrrIMdvpZn6lkME5vc/ADZG8UUk5K1uWRy4hqSFECrON6UKQBbQ==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.7.tgz",
+      "integrity": "sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==",
       "cpu": [
         "arm64"
       ],
@@ -1163,9 +1162,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.3.tgz",
-      "integrity": "sha512-lDtOOScYDZxI2BENN9m0pfVPJDSuUkAD1YXSvlJF0DKwZt0WlA7T7o3wrcEr4Q+iHYGzEaVuZcsIbCps4K27sA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz",
+      "integrity": "sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==",
       "cpu": [
         "x64"
       ],
@@ -1179,9 +1178,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.3.tgz",
-      "integrity": "sha512-9vWVUnsx9PrY2NwdVRJ4dUURAQ8Su0sLRPqcCCxtX5zIQUBES12eRVHq6b70bbfaVaxIDGJN2afHui0eDm+cLg==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz",
+      "integrity": "sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==",
       "cpu": [
         "x64"
       ],
@@ -1195,9 +1194,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.3.tgz",
-      "integrity": "sha512-1CU20FZzY9LFQigRi6jM45oJMU3KziA5/sSG+dXeVaTm661snQP6xu3ykGxxwU5sLG3sh14teO/IOEPVsQMRfA==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.7.tgz",
+      "integrity": "sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==",
       "cpu": [
         "arm64"
       ],
@@ -1211,9 +1210,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.3.tgz",
-      "integrity": "sha512-JMoLAq3n3y5tKXPQwCK5c+6tmwkuFDa2XAxz8Wm4+IVthdBZdZGh+lmiLUHg9f9IDwIQpUjp+ysd6OkYTyZRZw==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.7.tgz",
+      "integrity": "sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==",
       "cpu": [
         "x64"
       ],
@@ -1274,6 +1273,180 @@
         "node": ">=12.4.0"
       }
     },
+    "node_modules/@react-pdf/fns": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@react-pdf/fns/-/fns-3.1.2.tgz",
+      "integrity": "sha512-qTKGUf0iAMGg2+OsUcp9ffKnKi41RukM/zYIWMDJ4hRVYSr89Q7e3wSDW/Koqx3ea3Uy/z3h2y3wPX6Bdfxk6g==",
+      "license": "MIT"
+    },
+    "node_modules/@react-pdf/font": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@react-pdf/font/-/font-4.0.3.tgz",
+      "integrity": "sha512-N1qQDZr6phXYQOp033Hvm2nkUkx2LkszjGPbmRavs9VOYzi4sp31MaccMKptL24ii6UhBh/z9yPUhnuNe/qHwA==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/pdfkit": "^4.0.4",
+        "@react-pdf/types": "^2.9.1",
+        "fontkit": "^2.0.2",
+        "is-url": "^1.2.4"
+      }
+    },
+    "node_modules/@react-pdf/image": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@react-pdf/image/-/image-3.0.3.tgz",
+      "integrity": "sha512-lvP5ryzYM3wpbO9bvqLZYwEr5XBDX9jcaRICvtnoRqdJOo7PRrMnmB4MMScyb+Xw10mGeIubZAAomNAG5ONQZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/png-js": "^3.0.0",
+        "jay-peg": "^1.1.1"
+      }
+    },
+    "node_modules/@react-pdf/layout": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/layout/-/layout-4.4.1.tgz",
+      "integrity": "sha512-GVzdlWoZWldRDzlWj3SttRXmVDxg7YfraAohwy+o9gb9hrbDJaaAV6jV3pc630Evd3K46OAzk8EFu8EgPDuVuA==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/fns": "3.1.2",
+        "@react-pdf/image": "^3.0.3",
+        "@react-pdf/primitives": "^4.1.1",
+        "@react-pdf/stylesheet": "^6.1.1",
+        "@react-pdf/textkit": "^6.0.0",
+        "@react-pdf/types": "^2.9.1",
+        "emoji-regex-xs": "^1.0.0",
+        "queue": "^6.0.1",
+        "yoga-layout": "^3.2.1"
+      }
+    },
+    "node_modules/@react-pdf/pdfkit": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@react-pdf/pdfkit/-/pdfkit-4.0.4.tgz",
+      "integrity": "sha512-/nITLggsPlB66bVLnm0X7MNdKQxXelLGZG6zB5acF5cCgkFwmXHnLNyxYOUD4GMOMg1HOPShXDKWrwk2ZeHsvw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.20.13",
+        "@react-pdf/png-js": "^3.0.0",
+        "browserify-zlib": "^0.2.0",
+        "crypto-js": "^4.2.0",
+        "fontkit": "^2.0.2",
+        "jay-peg": "^1.1.1",
+        "linebreak": "^1.1.0",
+        "vite-compatible-readable-stream": "^3.6.1"
+      }
+    },
+    "node_modules/@react-pdf/png-js": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@react-pdf/png-js/-/png-js-3.0.0.tgz",
+      "integrity": "sha512-eSJnEItZ37WPt6Qv5pncQDxLJRK15eaRwPT+gZoujP548CodenOVp49GST8XJvKMFt9YqIBzGBV/j9AgrOQzVA==",
+      "license": "MIT",
+      "dependencies": {
+        "browserify-zlib": "^0.2.0"
+      }
+    },
+    "node_modules/@react-pdf/primitives": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/primitives/-/primitives-4.1.1.tgz",
+      "integrity": "sha512-IuhxYls1luJb7NUWy6q5avb1XrNaVj9bTNI40U9qGRuS6n7Hje/8H8Qi99Z9UKFV74bBP3DOf3L1wV2qZVgVrQ==",
+      "license": "MIT"
+    },
+    "node_modules/@react-pdf/reconciler": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@react-pdf/reconciler/-/reconciler-1.1.4.tgz",
+      "integrity": "sha512-oTQDiR/t4Z/Guxac88IavpU2UgN7eR0RMI9DRKvKnvPz2DUasGjXfChAdMqDNmJJxxV26mMy9xQOUV2UU5/okg==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "scheduler": "0.25.0-rc-603e6108-20241029"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@react-pdf/reconciler/node_modules/scheduler": {
+      "version": "0.25.0-rc-603e6108-20241029",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-603e6108-20241029.tgz",
+      "integrity": "sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA==",
+      "license": "MIT"
+    },
+    "node_modules/@react-pdf/render": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-4.3.1.tgz",
+      "integrity": "sha512-v1WAaAhQShQZGcBxfjkEThGCHVH9CSuitrZ1bIOLvB5iBKM14abYK5D6djKhWCwF6FTzYeT2WRjRMVgze/ND2A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.20.13",
+        "@react-pdf/fns": "3.1.2",
+        "@react-pdf/primitives": "^4.1.1",
+        "@react-pdf/textkit": "^6.0.0",
+        "@react-pdf/types": "^2.9.1",
+        "abs-svg-path": "^0.1.1",
+        "color-string": "^1.9.1",
+        "normalize-svg-path": "^1.1.0",
+        "parse-svg-path": "^0.1.2",
+        "svg-arc-to-cubic-bezier": "^3.2.0"
+      }
+    },
+    "node_modules/@react-pdf/renderer": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/renderer/-/renderer-4.3.1.tgz",
+      "integrity": "sha512-dPKHiwGTaOsKqNWCHPYYrx8CDfAGsUnV4tvRsEu0VPGxuot1AOq/M+YgfN/Pb+MeXCTe2/lv6NvA8haUtj3tsA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.20.13",
+        "@react-pdf/fns": "3.1.2",
+        "@react-pdf/font": "^4.0.3",
+        "@react-pdf/layout": "^4.4.1",
+        "@react-pdf/pdfkit": "^4.0.4",
+        "@react-pdf/primitives": "^4.1.1",
+        "@react-pdf/reconciler": "^1.1.4",
+        "@react-pdf/render": "^4.3.1",
+        "@react-pdf/types": "^2.9.1",
+        "events": "^3.3.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "queue": "^6.0.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@react-pdf/stylesheet": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/stylesheet/-/stylesheet-6.1.1.tgz",
+      "integrity": "sha512-Iyw0A3wRIeQLN4EkaKf8yF9MvdMxiZ8JjoyzLzDHSxnKYoOA4UGu84veCb8dT9N8MxY5x7a0BUv/avTe586Plg==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/fns": "3.1.2",
+        "@react-pdf/types": "^2.9.1",
+        "color-string": "^1.9.1",
+        "hsl-to-hex": "^1.0.0",
+        "media-engine": "^1.0.3",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "node_modules/@react-pdf/textkit": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@react-pdf/textkit/-/textkit-6.0.0.tgz",
+      "integrity": "sha512-fDt19KWaJRK/n2AaFoVm31hgGmpygmTV7LsHGJNGZkgzXcFyLsx+XUl63DTDPH3iqxj3xUX128t104GtOz8tTw==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/fns": "3.1.2",
+        "bidi-js": "^1.0.2",
+        "hyphen": "^1.6.4",
+        "unicode-properties": "^1.4.1"
+      }
+    },
+    "node_modules/@react-pdf/types": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.9.1.tgz",
+      "integrity": "sha512-5GoCgG0G5NMgpPuHbKG2xcVRQt7+E5pg3IyzVIIozKG3nLcnsXW4zy25vG1ZBQA0jmo39q34au/sOnL/0d1A4w==",
+      "license": "MIT",
+      "dependencies": {
+        "@react-pdf/font": "^4.0.3",
+        "@react-pdf/primitives": "^4.1.1",
+        "@react-pdf/stylesheet": "^6.1.1"
+      }
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -1647,13 +1820,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/inputmask": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@types/inputmask/-/inputmask-5.0.7.tgz",
-      "integrity": "sha512-uojbVPWzBQ/n/0jc/d16fLqmGasFIptbrLD2WrCPWArlk+5PgblOqH4EDkI3AoobXLAlOK5yF01V8jMmvMG5qg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -2269,6 +2435,12 @@
         "win32"
       ]
     },
+    "node_modules/abs-svg-path": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
+      "integrity": "sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==",
+      "license": "MIT"
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -2603,6 +2775,35 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/bidi-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
+      "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==",
+      "license": "MIT",
+      "dependencies": {
+        "require-from-string": "^2.0.2"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -2627,6 +2828,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/brotli": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+      "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.1.2"
+      }
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -2728,6 +2947,15 @@
       "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
       "license": "MIT"
     },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/clsx": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -2754,9 +2982,18 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
       "license": "MIT"
     },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -2813,6 +3050,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+      "license": "MIT"
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -3003,6 +3246,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/dfa": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+      "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
+      "license": "MIT"
+    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -3047,6 +3296,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/emoji-regex-xs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+      "license": "MIT"
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.18.3",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
@@ -3680,11 +3935,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-glob": {
@@ -3843,6 +4106,23 @@
         }
       }
     },
+    "node_modules/fontkit": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-2.0.4.tgz",
+      "integrity": "sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==",
+      "license": "MIT",
+      "dependencies": {
+        "@swc/helpers": "^0.5.12",
+        "brotli": "^1.3.2",
+        "clone": "^2.1.2",
+        "dfa": "^1.2.0",
+        "fast-deep-equal": "^3.1.3",
+        "restructure": "^3.0.0",
+        "tiny-inflate": "^1.0.3",
+        "unicode-properties": "^1.4.0",
+        "unicode-trie": "^2.0.0"
+      }
+    },
     "node_modules/for-each": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
@@ -4196,6 +4476,21 @@
         "react-is": "^16.7.0"
       }
     },
+    "node_modules/hsl-to-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-to-hex/-/hsl-to-hex-1.0.0.tgz",
+      "integrity": "sha512-K6GVpucS5wFf44X0h2bLVRDsycgJmf9FF2elg+CrqD8GcFU8c6vYhgXn8NjUkFCwj+xDFb70qgLbTUm6sxwPmA==",
+      "license": "MIT",
+      "dependencies": {
+        "hsl-to-rgb-for-reals": "^1.1.0"
+      }
+    },
+    "node_modules/hsl-to-rgb-for-reals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hsl-to-rgb-for-reals/-/hsl-to-rgb-for-reals-1.1.1.tgz",
+      "integrity": "sha512-LgOWAkrN0rFaQpfdWBQlv/VhkOxb5AsBjk6NQVx4yEzWS923T07X0M1Y0VNko2H52HeSpZrZNNMJ0aFqsdVzQg==",
+      "license": "ISC"
+    },
     "node_modules/husky": {
       "version": "9.1.7",
       "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
@@ -4212,6 +4507,12 @@
         "url": "https://github.com/sponsors/typicode"
       }
     },
+    "node_modules/hyphen": {
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/hyphen/-/hyphen-1.10.6.tgz",
+      "integrity": "sha512-fXHXcGFTXOvZTSkPJuGOQf5Lv5T/R2itiiCVPg9LxAje5D00O0pP83yJShFq5V89Ly//Gt6acj7z8pbBr34stw==",
+      "license": "ISC"
+    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4248,11 +4549,11 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inputmask": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/inputmask/-/inputmask-5.0.9.tgz",
-      "integrity": "sha512-s0lUfqcEbel+EQXtehXqwCJGShutgieOaIImFKC/r4reYNvX3foyrChl6LOEvaEgxEbesePIrw1Zi2jhZaDZbQ==",
-      "license": "MIT"
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
       "version": "1.1.0",
@@ -4630,6 +4931,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-url": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+      "license": "MIT"
+    },
     "node_modules/is-weakmap": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
@@ -4708,6 +5015,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/jay-peg": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jay-peg/-/jay-peg-1.1.1.tgz",
+      "integrity": "sha512-D62KEuBxz/ip2gQKOEhk/mx14o7eiFRaU+VNNSP4MOiIkwb/D6B3G1Mfas7C/Fit8EsSV2/IWjZElx/Gs6A4ww==",
+      "license": "MIT",
+      "dependencies": {
+        "restructure": "^3.0.0"
+      }
+    },
     "node_modules/jiti": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
@@ -4725,9 +5041,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5110,6 +5426,25 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/linebreak": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz",
+      "integrity": "sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "0.0.8",
+        "unicode-trie": "^2.0.0"
+      }
+    },
+    "node_modules/linebreak/node_modules/base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -5182,6 +5517,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/media-engine": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/media-engine/-/media-engine-1.0.3.tgz",
+      "integrity": "sha512-aa5tG6sDoK+k70B9iEX1NeyfT8ObCKhNDs6lJVpwF6r8vhUfuKMslIcirq6HIUYuuUYLefcEQOn9bSBOvawtwg==",
+      "license": "MIT"
+    },
     "node_modules/memoize-one": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
@@ -5313,12 +5654,12 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "15.5.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.5.3.tgz",
-      "integrity": "sha512-r/liNAx16SQj4D+XH/oI1dlpv9tdKJ6cONYPwwcCC46f2NjpaRWY+EKCzULfgQYV6YKXjHBchff2IZBSlZmJNw==",
+      "version": "15.5.7",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.5.7.tgz",
+      "integrity": "sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "15.5.3",
+        "@next/env": "15.5.7",
         "@swc/helpers": "0.5.15",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
@@ -5331,14 +5672,14 @@
         "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.5.3",
-        "@next/swc-darwin-x64": "15.5.3",
-        "@next/swc-linux-arm64-gnu": "15.5.3",
-        "@next/swc-linux-arm64-musl": "15.5.3",
-        "@next/swc-linux-x64-gnu": "15.5.3",
-        "@next/swc-linux-x64-musl": "15.5.3",
-        "@next/swc-win32-arm64-msvc": "15.5.3",
-        "@next/swc-win32-x64-msvc": "15.5.3",
+        "@next/swc-darwin-arm64": "15.5.7",
+        "@next/swc-darwin-x64": "15.5.7",
+        "@next/swc-linux-arm64-gnu": "15.5.7",
+        "@next/swc-linux-arm64-musl": "15.5.7",
+        "@next/swc-linux-x64-gnu": "15.5.7",
+        "@next/swc-linux-x64-musl": "15.5.7",
+        "@next/swc-win32-arm64-msvc": "15.5.7",
+        "@next/swc-win32-x64-msvc": "15.5.7",
         "sharp": "^0.34.3"
       },
       "peerDependencies": {
@@ -5392,6 +5733,15 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/normalize-svg-path": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz",
+      "integrity": "sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg==",
+      "license": "MIT",
+      "dependencies": {
+        "svg-arc-to-cubic-bezier": "^3.0.0"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5582,6 +5932,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "license": "(MIT AND Zlib)"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -5612,6 +5968,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/parse-svg-path": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
+      "integrity": "sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==",
+      "license": "MIT"
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -5705,6 +6067,12 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "license": "MIT"
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5764,6 +6132,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/queue": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
+      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "~2.0.3"
+      }
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -5970,6 +6347,15 @@
       "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
       "license": "MIT"
     },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.11",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
@@ -6009,6 +6395,12 @@
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
     },
+    "node_modules/restructure": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.2.tgz",
+      "integrity": "sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==",
+      "license": "MIT"
+    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -6064,6 +6456,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -6309,6 +6721,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz",
+      "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz",
+      "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==",
+      "license": "MIT"
+    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -6348,6 +6775,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "node_modules/string.prototype.includes": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
@@ -6538,6 +6974,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/svg-arc-to-cubic-bezier": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz",
+      "integrity": "sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==",
+      "license": "ISC"
+    },
     "node_modules/swr": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz",
@@ -6588,6 +7030,12 @@
       "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==",
       "license": "MIT"
     },
+    "node_modules/tiny-inflate": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+      "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+      "license": "MIT"
+    },
     "node_modules/tiny-warning": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
@@ -6836,6 +7284,32 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/unicode-properties": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+      "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.0",
+        "unicode-trie": "^2.0.0"
+      }
+    },
+    "node_modules/unicode-trie": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+      "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "^0.2.5",
+        "tiny-inflate": "^1.0.0"
+      }
+    },
+    "node_modules/unicode-trie/node_modules/pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+      "license": "MIT"
+    },
     "node_modules/unrs-resolver": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
@@ -6916,6 +7390,26 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/vite-compatible-readable-stream": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/vite-compatible-readable-stream/-/vite-compatible-readable-stream-3.6.1.tgz",
+      "integrity": "sha512-t20zYkrSf868+j/p31cRIGN28Phrjm3nRSLR2fyc2tiWi4cZGVdv68yNlwnIINTkMTmPoMiSlc0OadaO7DXZaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7053,6 +7547,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yoga-layout": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/yoga-layout/-/yoga-layout-3.2.1.tgz",
+      "integrity": "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ==",
+      "license": "MIT"
+    },
     "node_modules/yup": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/yup/-/yup-1.7.1.tgz",

package.json

@@ -11,14 +11,14 @@
     "format": "prettier --write ."
   },
   "dependencies": {
+    "@react-pdf/renderer": "^4.3.1",
     "@tanstack/match-sorter-utils": "^8.19.4",
     "@tanstack/react-table": "^8.21.3",
     "axios": "^1.12.2",
     "clsx": "^2.1.1",
     "formik": "^2.4.6",
-    "inputmask": "^5.0.9",
     "moment": "^2.30.1",
-    "next": "15.5.3",
+    "next": "15.5.7",
     "react": "19.1.0",
     "react-day-picker": "^9.11.1",
     "react-dom": "19.1.0",
@@ -36,7 +36,6 @@
     "@eslint/eslintrc": "^3",
     "@iconify/react": "^6.0.2",
     "@tailwindcss/postcss": "^4",
-    "@types/inputmask": "^5.0.7",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",

src/app/expense/detail/edit/page.tsx

@@ -34,13 +34,15 @@ const ExpenseEditPage = () => {
     return;
   }
 
-  const isExpenseRejectedOrApproved =
+  const isExpenseCanBeEdited =
     !isLoadingExpense &&
     isResponseSuccess(expense) &&
-    (expense.data.approval.action === 'REJECTED' ||
-      expense.data.approval.step_number === 5);
+    expense.data.latest_approval.step_number !== 5 &&
+    (expense.data.latest_approval.step_number === 1 ||
+      expense.data.latest_approval.step_number === 2 ||
+      expense.data.latest_approval.step_number === 3);
 
-  if (isExpenseRejectedOrApproved) {
+  if (!isLoadingExpense && !isExpenseCanBeEdited) {
     router.back();
     return;
   }

src/app/expense/realization/edit/page.tsx

@@ -0,0 +1,62 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+import ExpenseRealizationForm from '@/components/pages/expense/form/ExpenseRealizationForm';
+
+import { ExpenseApi } from '@/services/api/expense';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+
+const ExpenseRealizationEditPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const expenseId = searchParams.get('expenseId');
+
+  const { data: expense, isLoading: isLoadingExpense } = useSWR(
+    expenseId,
+    (id: number) => ExpenseApi.getSingle(id)
+  );
+
+  if (!expenseId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingExpense && (!expense || isResponseError(expense))) {
+    router.replace('/404');
+    return;
+  }
+
+  const isExpenseRealizationCanBeEdited =
+    !isLoadingExpense &&
+    isResponseSuccess(expense) &&
+    expense.data.latest_approval.action !== 'REJECTED' &&
+    (expense.data.latest_approval.step_number === 4 ||
+      expense.data.latest_approval.step_number === 5);
+
+  if (!isLoadingExpense && !isExpenseRealizationCanBeEdited) {
+    router.back();
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingExpense && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+
+      {!isLoadingExpense && isResponseSuccess(expense) && (
+        <ExpenseRealizationForm type='edit' initialValues={expense.data} />
+      )}
+    </div>
+  );
+};
+
+export default ExpenseRealizationEditPage;

src/app/expense/realization/page.tsx

@@ -0,0 +1,67 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+import ExpenseRealizationForm from '@/components/pages/expense/form/ExpenseRealizationForm';
+
+import { ExpenseApi } from '@/services/api/expense';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+
+const ExpenseRealization = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const expenseId = searchParams.get('expenseId');
+
+  const { data: expense, isLoading: isLoadingExpense } = useSWR(
+    expenseId,
+    (id: number) => ExpenseApi.getSingle(id)
+  );
+
+  if (!expenseId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingExpense && (!expense || isResponseError(expense))) {
+    router.replace('/404');
+    return;
+  }
+
+  const isExpenseCanBeRealized =
+    isResponseSuccess(expense) &&
+    expense.data.latest_approval.action !== 'REJECTED' &&
+    expense.data.latest_approval.step_number === 3;
+
+  if (isResponseSuccess(expense) && !isExpenseCanBeRealized) {
+    if (typeof window !== 'undefined') {
+      router.back();
+    }
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingExpense && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+
+      {!isLoadingExpense && isResponseSuccess(expense) && (
+        <ExpenseRealizationForm initialValues={expense.data} />
+      )}
+    </div>
+  );
+};
+
+export default ExpenseRealization;

src/app/marketing/add/delivery-orders/page.tsx

@@ -0,0 +1,54 @@
+'use client';
+
+import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { MarketingApi } from '@/services/api/marketing/marketing';
+import { useRouter, useSearchParams } from 'next/navigation';
+import toast from 'react-hot-toast';
+import useSWR from 'swr';
+
+const EditMarketingDelivery = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const soId = searchParams.get('marketingId');
+
+  const {
+    data: marketing,
+    isLoading: isLoading,
+    mutate: refreshMarketing,
+  } = useSWR(`get-so-${soId}`, () =>
+    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
+  );
+
+  if (!soId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoading && (!marketing || isResponseError(marketing))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4'>
+      {isLoading && <span className='loading loading-spinner loading-xl' />}
+      {!isLoading && isResponseSuccess(marketing) && (
+        <MarketingForm
+          formType='add_deliver'
+          initialValues={marketing.data}
+          afterSubmit={() => {
+            refreshMarketing();
+          }}
+        />
+      )}
+    </div>
+  );
+};
+export default EditMarketingDelivery;

src/app/marketing/add/sales-orders/page.tsx

@@ -1,9 +1,9 @@
-import SalesForm from '@/components/pages/marketing/sales-orders/form/SalesForm';
+import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
 
 const AddSalesOrder = () => {
   return (
     <div className='size-full p-4'>
-      <SalesForm />
+      <MarketingForm formType='add' />
     </div>
   );
 };

src/app/marketing/detail/delivery-orders/edit/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/marketing/detail/delivery-orders/edit/page.tsx

@@ -0,0 +1,62 @@
+'use client';
+
+import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { MarketingApi } from '@/services/api/marketing/marketing';
+import { useRouter, useSearchParams } from 'next/navigation';
+import toast from 'react-hot-toast';
+import useSWR from 'swr';
+
+const EditMarketingDelivery = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const soId = searchParams.get('marketingId');
+
+  const {
+    data: marketing,
+    isLoading: isLoading,
+    mutate: refreshMarketing,
+  } = useSWR(`get-so-${soId}`, () =>
+    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
+  );
+
+  if (!soId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoading && (!marketing || isResponseError(marketing))) {
+    router.replace('/404');
+    return;
+  }
+
+  if (
+    isResponseSuccess(marketing) &&
+    marketing.data.latest_approval.step_number != 3
+  ) {
+    toast.error('Data Marketing perlu dilakukan approval terlebih dahulu!');
+    router.back();
+  }
+
+  return (
+    <div className='w-full p-4'>
+      {isLoading && <span className='loading loading-spinner loading-xl' />}
+      {!isLoading && isResponseSuccess(marketing) && (
+        <MarketingForm
+          formType='edit_deliver'
+          initialValues={marketing.data}
+          afterSubmit={() => {
+            refreshMarketing();
+          }}
+        />
+      )}
+    </div>
+  );
+};
+export default EditMarketingDelivery;

src/app/marketing/detail/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/marketing/detail/page.tsx

@@ -1,20 +1,22 @@
 'use client';
 
-import SalesOrderDetail from '@/components/pages/marketing/sales-orders/detail/SalesOrderDetail';
+import MarketingDetail from '@/components/pages/marketing/detail/MarketingDetail';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { MarketingApi } from '@/services/api/marketing/marketing';
 import { useRouter, useSearchParams } from 'next/navigation';
 import useSWR from 'swr';
 
-const DetailSalesOrder = () => {
+const DetailMarketing = () => {
   const router = useRouter();
   const searchParams = useSearchParams();
 
-  const soId = searchParams.get('salesOrderId');
+  const soId = searchParams.get('marketingId');
 
-  const { data: marketing, isLoading: isLoading } = useSWR(soId, (id: number) =>
-    MarketingApi.getSingle(id)
-  );
+  const {
+    data: marketing,
+    isLoading: isLoading,
+    mutate: refreshMarketing,
+  } = useSWR(soId, (id: number) => MarketingApi.getSingle(id));
 
   if (!soId) {
     router.back();
@@ -35,10 +37,13 @@ const DetailSalesOrder = () => {
     <div className='w-full p-4'>
       {isLoading && <span className='loading loading-spinner loading-xl' />}
       {!isLoading && isResponseSuccess(marketing) && (
-        <SalesOrderDetail initialValues={marketing.data} />
+        <MarketingDetail
+          initialValues={marketing.data}
+          refresh={refreshMarketing}
+        />
       )}
     </div>
   );
 };
 
-export default DetailSalesOrder;
+export default DetailMarketing;

src/app/marketing/detail/sales-orders/edit/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/marketing/detail/sales-orders/edit/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import SalesForm from '@/components/pages/marketing/sales-orders/form/SalesForm';
+import MarketingForm from '@/components/pages/marketing/form/MarketingForm';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import { MarketingApi } from '@/services/api/marketing/marketing';
 import { useRouter, useSearchParams } from 'next/navigation';
@@ -10,10 +10,14 @@ const EditSalesOrder = () => {
   const router = useRouter();
   const searchParams = useSearchParams();
 
-  const soId = searchParams.get('salesOrderId');
+  const soId = searchParams.get('marketingId');
 
-  const { data: marketing, isLoading: isLoading } = useSWR(soId, (id: number) =>
-    MarketingApi.getSingle(id)
+  const {
+    data: marketing,
+    isLoading: isLoading,
+    mutate: refreshMarketing,
+  } = useSWR(`get-so-${soId}`, () =>
+    MarketingApi.getSingle(soId ? parseInt(soId) : 0)
   );
 
   if (!soId) {
@@ -34,7 +38,13 @@ const EditSalesOrder = () => {
     <div className='w-full p-4'>
       {isLoading && <span className='loading loading-spinner loading-xl' />}
       {!isLoading && isResponseSuccess(marketing) && (
-        <SalesForm formType='edit' initialValues={marketing.data} />
+        <MarketingForm
+          formType='edit'
+          initialValues={marketing.data}
+          afterSubmit={() => {
+            refreshMarketing();
+          }}
+        />
       )}
     </div>
   );

src/app/marketing/page.tsx

@@ -0,0 +1,10 @@
+import MarketingTable from '@/components/pages/marketing/MarketingTable';
+
+const Marketing = () => {
+  return (
+    <div className='w-full p-4'>
+      <MarketingTable />
+    </div>
+  );
+};
+export default Marketing;

src/app/marketing/sales-orders/page.tsx

@@ -1,10 +0,0 @@
-import SalesOrderTable from '@/components/pages/marketing/sales-orders/SalesOrderTable';
-
-const SalesOrder = () => {
-  return (
-    <div className='w-full p-4'>
-      <SalesOrderTable />
-    </div>
-  );
-};
-export default SalesOrder;

src/app/production/project-flock/chickin/add/page.tsx

@@ -11,10 +11,6 @@ const AddChickin = () => {
   return (
     <>
       <section className='w-full p-4'>
-        <FormHeader
-          title='Daftar Kandang Project Flock'
-          backUrl='/production/project-flock'
-        />
         <ProjectFlockChickinDetail projectFlockId={Number(projectFlockId)} />
       </section>
     </>

src/app/production/project-flock/chickin/detail/page.tsx

@@ -1,343 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import Card from '@/components/Card';
-import Modal, { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import ChickinForm from '@/components/pages/production/chickin/form/ChickinForm';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { ChickinApi } from '@/services/api/production/chickin';
-import { BaseApiResponse } from '@/types/api/api-general';
-import {
-  Chickin,
-  ChickinApprovalPayload,
-} from '@/types/api/production/chickin';
-import { Icon } from '@iconify/react';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useState } from 'react';
-import toast from 'react-hot-toast';
-import useSWR from 'swr';
-
-/**
- * TODO: Refactor code - pindahin detail ke reuseable component
- *       setelah implement approval and reject
- */
-
-const DetailChickin = () => {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const chickinId = searchParams.get('chickinId');
-  const [isApproveLoading, setIsApproveLoading] = useState(false);
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-
-  const confirmModal = useModal();
-  const deleteModal = useModal();
-  const chickinModal = useModal();
-  const {
-    data: chickin,
-    isLoading,
-    mutate: refreshChickin,
-  } = useSWR(chickinId, (id: number) => ChickinApi.getSingle(id));
-
-  const [isApprovedDisabled, setIsApprovedDisabled] = useState(
-    // chickin.data?.approval.step_number == 1 ? false : true
-    true
-  );
-  const [isRejectedDisabled, setIsRejectedDisabled] =
-    useState(!isApprovedDisabled);
-  const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
-    !isApprovedDisabled ? 'APPROVED' : 'REJECTED'
-  );
-
-  if (!chickinId) {
-    router.back();
-
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  if (!isLoading && (!chickin || isResponseError(chickin))) {
-    router.replace('/404');
-    return;
-  }
-
-  if (!isResponseSuccess(chickin)) {
-    return (
-      <div className='w-full flex flex-row justify-center items-center p-4'>
-        <span className='loading loading-spinner loading-xl' />
-      </div>
-    );
-  }
-
-  const confirmationModalClickHandler = async ({
-    action = 'APPROVED',
-  }: {
-    action: 'APPROVED' | 'REJECTED';
-  }) => {
-    if (chickin?.data.id === undefined) return;
-    setIsApproveLoading(true);
-    const approveChickinRes = await ChickinApi.customRequest<
-      BaseApiResponse<Chickin>,
-      ChickinApprovalPayload
-    >(`/approvals`, {
-      method: 'POST',
-      payload: {
-        action: action,
-        approvable_ids: [chickin.data.id],
-      },
-    });
-
-    if (isResponseSuccess(approveChickinRes)) {
-      if (refreshChickin) {
-        await refreshChickin();
-      }
-      toast.success(approveChickinRes.message as string);
-    }
-    if (isResponseError(approveChickinRes)) {
-      toast.error(approveChickinRes?.message as string);
-    }
-    confirmModal.closeModal();
-    setIsApproveLoading(false);
-  };
-
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsDeleteLoading(true);
-    const deleteProjectFlockRes = await ChickinApi.delete(
-      chickin.data?.id as number
-    );
-
-    if (isResponseSuccess(deleteProjectFlockRes)) {
-      toast.success(deleteProjectFlockRes?.message as string);
-      router.push('/production/chickin');
-    }
-    if (isResponseError(deleteProjectFlockRes)) {
-      toast.error(deleteProjectFlockRes?.message as string);
-    }
-    deleteModal.closeModal();
-    setIsDeleteLoading(false);
-  };
-
-  return (
-    <>
-      <div className='w-full p-4 flex flex-col justify-center gap-4'>
-        {isLoading && <span className='loading loading-spinner loading-xl' />}
-        {!isLoading && isResponseSuccess(chickin) && (
-          <>
-            {/* <div className='w-full flex flex-col sm:flex-row gap-2'>
-              <Button
-                variant='outline'
-                color='success'
-                onClick={(() => {
-                  if (chickin?.data.id) {
-                    setApprovalAction('APPROVED');
-                    confirmModal.openModal();
-                  }
-                })}
-                disabled={!chickin?.data.id || isApprovedDisabled}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='material-symbols:check' width={24} height={24} />
-                Approve
-              </Button>
-              <Button
-                variant='outline'
-                color='error'
-                onClick={() => {
-                  if (chickin?.data.id) {
-                    setApprovalAction('REJECTED');
-                    confirmModal.openModal();
-                  }
-                }}
-                disabled={!chickin?.data.id || isRejectedDisabled}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='mdi:times' width={24} height={24} />
-                Reject
-              </Button>
-            </div> */}
-            <Card
-              title='Informasi Umum'
-              variant='bordered'
-              className={{
-                wrapper: 'w-full',
-              }}
-            >
-              <div className='grid grid-cols-2 gap-4 mt-4'>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Flock</div>
-                  <div className='text-sm'>
-                    {
-                      chickin?.data?.project_flock_kandang?.project_flock?.flock
-                        ?.name
-                    }
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Area</div>
-                  <div className='text-sm'>
-                    {
-                      chickin.data.project_flock_kandang?.project_flock.area
-                        .name
-                    }
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Kategori</div>
-                  <div className='text-sm'>
-                    {chickin.data.project_flock_kandang?.project_flock.category}
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Lokasi</div>
-                  <div className='text-sm'>
-                    {
-                      chickin.data.project_flock_kandang?.project_flock.location
-                        .name
-                    }
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Periode</div>
-                  <div className='text-sm'>
-                    {chickin.data.project_flock_kandang?.project_flock.period}
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Kandang</div>
-                  <div className='text-sm'>
-                    {chickin.data.project_flock_kandang?.kandang.name}
-                  </div>
-                </div>
-              </div>
-            </Card>
-            <Card
-              title='Detail Chickin'
-              variant='bordered'
-              className={{
-                wrapper: 'w-full',
-              }}
-            >
-              <div className='grid grid-cols-2 gap-4 mt-4'>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Flock Kandang</div>
-                  <div className='text-sm'>
-                    {
-                      chickin?.data?.project_flock_kandang?.project_flock?.flock
-                        ?.name
-                    }{' '}
-                    - {chickin.data.project_flock_kandang?.kandang.name}
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Tanggal Chickin</div>
-                  <div className='text-sm'>
-                    {chickin.data.chick_in_date
-                      ? new Date(chickin.data.chick_in_date).toLocaleDateString(
-                          'id-ID'
-                        )
-                      : '-'}
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Jumlah (Ekor)</div>
-                  <div className='text-sm'>
-                    {chickin.data.quantity?.toLocaleString('id-ID')}
-                  </div>
-                </div>
-                <div className='flex flex-col gap-2'>
-                  <div className='font-semibold text-sm'>Catatan</div>
-                  <div className='text-sm'>{chickin.data.note}</div>
-                </div>
-              </div>
-            </Card>
-            <div className='w-full flex flex-col sm:flex-row gap-2'>
-              <Button
-                color='error'
-                onClick={() => {
-                  deleteModal.openModal();
-                }}
-              >
-                <Icon icon='mdi:times' width={24} height={24} />
-                Delete
-              </Button>
-              <Button
-                color='warning'
-                onClick={() => {
-                  chickinModal.openModal();
-                }}
-              >
-                <Icon icon='mdi:pencil-outline' width={24} height={24} />
-                Edit
-              </Button>
-            </div>
-          </>
-        )}
-      </div>
-
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${chickin?.data?.project_flock_kandang?.project_flock.flock?.name} - ${chickin?.data.project_flock_kandang?.kandang.name})?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isDeleteLoading,
-          onClick: confirmationModalDeleteClickHandler,
-        }}
-      />
-
-      <Modal ref={chickinModal.ref}>
-        <div className='flex flex-row justify-between items-center'>
-          <h1 className='text-xl font-semibold text-center mb-6'>
-            Chickin Kandang -{' '}
-            {chickin?.data?.project_flock_kandang &&
-              chickin?.data?.project_flock_kandang.kandang?.name}
-          </h1>
-          <Button
-            color='error'
-            variant='link'
-            onClick={chickinModal.closeModal}
-          >
-            <Icon
-              className='text-black'
-              icon='uil:times'
-              width={24}
-              height={24}
-            />
-          </Button>
-        </div>
-      </Modal>
-
-      <ConfirmationModal
-        ref={confirmModal.ref}
-        type={approvalAction == 'APPROVED' ? 'success' : 'error'}
-        text={`Apakah anda yakin ingin ${
-          approvalAction == 'APPROVED' ? 'approve' : 'reject'
-        } chickin berikut? (${
-          chickin?.data?.project_flock_kandang?.project_flock?.flock?.name
-        } - ${chickin?.data.project_flock_kandang?.kandang.name})?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: approvalAction == 'APPROVED' ? 'success' : 'error',
-          isLoading: isApproveLoading,
-          onClick: () => {
-            confirmationModalClickHandler({
-              action: approvalAction,
-            });
-          },
-        }}
-      />
-    </>
-  );
-};
-
-export default DetailChickin;

src/app/production/recording/add/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/production/recording/grading/add/page.tsx

@@ -0,0 +1,49 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
+import { RecordingApi } from '@/services/api/production';
+import { isResponseSuccess } from '@/lib/api-helper';
+
+const AddGrading = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const recordingId = searchParams.get('recording_id');
+
+  const { data: recording, isLoading: isLoadingRecording } = useSWR(
+    recordingId && recordingId !== 'new' ? [recordingId] : null,
+    ([id]) => RecordingApi.getSingle(parseInt(id))
+  );
+
+  if (
+    recordingId &&
+    recordingId !== 'new' &&
+    !isLoadingRecording &&
+    (!recording || !isResponseSuccess(recording))
+  ) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {recordingId && recordingId !== 'new' && isLoadingRecording && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {(!recordingId ||
+        recordingId === 'new' ||
+        (!isLoadingRecording && recording && isResponseSuccess(recording))) && (
+        <GradingForm
+          type='add'
+          initialValues={
+            isResponseSuccess(recording) ? recording.data?.eggs?.[0] : undefined
+          }
+        />
+      )}
+    </div>
+  );
+};
+
+export default AddGrading;

src/app/production/recording/grading/detail/edit/page.tsx

@@ -0,0 +1,53 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
+import { RecordingApi } from '@/services/api/production';
+import { isResponseSuccess } from '@/lib/api-helper';
+
+const EditGrading = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const recordingId = searchParams.get('recordingId');
+  const gradingId = searchParams.get('gradingId');
+
+  const { data: recording, isLoading: isLoadingRecording } = useSWR(
+    recordingId ? [recordingId] : null,
+    ([id]) => RecordingApi.getSingle(parseInt(id))
+  );
+
+  if (!recordingId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingRecording && (!recording || !isResponseSuccess(recording))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingRecording && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingRecording && recording && isResponseSuccess(recording) && (
+        <GradingForm
+          type='edit'
+          initialValues={recording.data.eggs?.find(
+            (egg) => egg.id === parseInt(gradingId || '0')
+          )}
+        />
+      )}
+    </div>
+  );
+};
+
+export default EditGrading;

src/app/production/recording/grading/detail/page.tsx

@@ -0,0 +1,52 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import GradingForm from '@/components/pages/production/recording/grading/form/GradingForm';
+import { RecordingApi } from '@/services/api/production';
+import { isResponseSuccess } from '@/lib/api-helper';
+
+const DetailGrading = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const gradingId = searchParams.get('gradingId');
+
+  const { data: grading, isLoading: isLoadingGrading } = useSWR(
+    gradingId ? [gradingId] : null,
+    ([id]) => RecordingApi.getSingle(parseInt(id))
+  );
+
+  if (!gradingId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingGrading && (!grading || !isResponseSuccess(grading))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingGrading && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingGrading && grading && isResponseSuccess(grading) && (
+        <GradingForm
+          type='detail'
+          initialValues={grading.data.eggs?.find(
+            (egg) => egg.id === parseInt(gradingId)
+          )}
+        />
+      )}
+    </div>
+  );
+};
+
+export default DetailGrading;

src/app/production/recording/grading/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/purchase/add/page.tsx

@@ -0,0 +1,11 @@
+import PurchaseRequestForm from '@/components/pages/purchase/form/request/PurchaseRequestForm';
+
+const AddPurchaseRequest = () => {
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      <PurchaseRequestForm />
+    </div>
+  );
+};
+
+export default AddPurchaseRequest;

src/app/purchase/detail/edit/page.tsx

@@ -0,0 +1,47 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import PurchaseRequestForm from '@/components/pages/purchase/form/request/PurchaseRequestForm';
+import { PurchaseApi } from '@/services/api/purchase';
+import { isResponseSuccess, isResponseError } from '@/lib/api-helper';
+
+const PurchaseEdit = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const purchaseId = searchParams.get('purchaseId');
+
+  const { data: purchase, isLoading: isLoadingPurchase } = useSWR(
+    purchaseId,
+    (id: number) => PurchaseApi.getSingle(id)
+  );
+
+  if (!purchaseId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingPurchase && (!purchase || isResponseError(purchase))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingPurchase && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingPurchase && isResponseSuccess(purchase) && (
+        <PurchaseRequestForm type='edit' initialValues={purchase.data} />
+      )}
+    </div>
+  );
+};
+
+export default PurchaseEdit;

src/app/purchase/detail/page.tsx

@@ -0,0 +1,54 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import PurchaseOrderDetail from '@/components/pages/purchase/order/PurchaseOrderDetail';
+import { PurchaseApi } from '@/services/api/purchase';
+import { isResponseSuccess, isResponseError } from '@/lib/api-helper';
+
+const PurchaseDetail = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const purchaseId = searchParams.get('purchaseId');
+
+  const {
+    data: purchase,
+    isLoading: isLoadingPurchase,
+    mutate: mutatePurchase,
+  } = useSWR(purchaseId, (id: number) => PurchaseApi.getSingle(id));
+
+  if (!purchaseId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingPurchase && (!purchase || isResponseError(purchase))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4'>
+      {isLoadingPurchase && (
+        <div className='w-full flex flex-row justify-center items-center'>
+          <span className='loading loading-spinner loading-xl' />
+        </div>
+      )}
+      {!isLoadingPurchase && isResponseSuccess(purchase) && (
+        <PurchaseOrderDetail
+          type='detail'
+          initialValues={purchase.data}
+          refetchData={mutatePurchase}
+        />
+      )}
+    </div>
+  );
+};
+
+export default PurchaseDetail;

src/app/purchase/layout.tsx

@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;

src/app/purchase/page.tsx

@@ -0,0 +1,11 @@
+import PurchaseTable from '@/components/pages/purchase/PurchaseTable';
+
+const Purchase = () => {
+  return (
+    <section className='w-full p-4'>
+      <PurchaseTable />
+    </section>
+  );
+};
+
+export default Purchase;

src/components/Card.tsx

@@ -1,8 +1,11 @@
 'use client';
 
-import { HTMLAttributes, ReactNode } from 'react';
+import { HTMLAttributes, ReactNode, useState } from 'react';
 
 import { cn } from '@/lib/helper';
+import Image from 'next/image';
+import Collapse from './Collapse';
+import { Icon } from '@iconify/react';
 
 export interface CardProps
   extends Omit<HTMLAttributes<HTMLDivElement>, 'className'> {
@@ -10,8 +13,13 @@ export interface CardProps
   subtitle?: string;
   image?: string;
   imageAlt?: string;
+  imageWidth?: number;
+  imageHeight?: number;
   actions?: ReactNode;
   footer?: ReactNode;
+  collapsible?: boolean;
+  defaultCollapsed?: boolean;
+  onCollapsedChange?: (collapsed: boolean) => void;
   className?: {
     wrapper?: string;
     image?: string;
@@ -20,6 +28,7 @@ export interface CardProps
     subtitle?: string;
     actions?: string;
     footer?: string;
+    collapsible?: string;
   };
   variant?: 'default' | 'compact' | 'bordered' | 'shadow' | 'image-full';
   size?: 'sm' | 'md' | 'lg';
@@ -30,14 +39,27 @@ const Card = ({
   subtitle,
   image,
   imageAlt,
+  imageWidth,
+  imageHeight,
   actions,
   footer,
+  collapsible,
+  defaultCollapsed = false,
+  onCollapsedChange,
   className,
   variant = 'default',
   size = 'md',
   children,
   ...props
 }: CardProps) => {
+  const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed);
+
+  const handleCollapsedChange = (open: boolean) => {
+    const collapsed = !open;
+    setIsCollapsed(collapsed);
+    onCollapsedChange?.(collapsed);
+  };
+
   const getCardClasses = () => {
     const baseClasses = 'card bg-base-100';
 
@@ -63,11 +85,31 @@ const Card = ({
     );
   };
 
+  const getImageDimensions = () => {
+    if (variant === 'image-full') {
+      return {
+        width: imageWidth || 128,
+        height: imageHeight || 128,
+      };
+    }
+
+    const cardWidths = {
+      sm: 256, // w-64
+      md: 384, // w-96
+      lg: 448, // w-[28rem]
+    };
+
+    return {
+      width: imageWidth || cardWidths[size],
+      height: imageHeight || 192,
+    };
+  };
+
   const getImageClasses = () => {
     if (variant === 'image-full') {
-      return cn('w-32 h-32 object-cover', className?.image);
+      return cn('object-cover', className?.image);
     }
-    return cn('h-48 object-cover', className?.image);
+    return cn('w-full object-cover', className?.image);
   };
 
   const getBodyClasses = () => {
@@ -102,45 +144,98 @@ const Card = ({
     return cn('border-t border-base-300 mt-4 pt-4', className?.footer);
   };
 
+  const renderCardContent = () => {
+    const hasContent = children || actions || footer;
+
+    const titleContent = (
+      <div className='group flex items-center !justify-between w-full'>
+        <div className='flex-1'>
+          {title && <h2 className={getTitleClasses()}>{title}</h2>}
+          {subtitle && <p className={getSubtitleClasses()}>{subtitle}</p>}
+        </div>
+        {collapsible && (
+          <button
+            onClick={() => handleCollapsedChange(!isCollapsed)}
+            className='btn btn-ghost btn-sm btn-circle'
+            aria-label={isCollapsed ? 'Expand content' : 'Collapse content'}
+          >
+            <Icon
+              icon={
+                isCollapsed
+                  ? 'material-symbols:expand-more'
+                  : 'material-symbols:expand-less'
+              }
+              width={20}
+            />
+          </button>
+        )}
+      </div>
+    );
+
+    const cardContent = (
+      <div className='space-y-4'>
+        {children}
+        {actions && <div className={getActionsClasses()}>{actions}</div>}
+        {footer && <div className={getFooterClasses()}>{footer}</div>}
+      </div>
+    );
+
+    return (
+      <>
+        {image && (
+          <figure>
+            <Image
+              src={image}
+              alt={imageAlt || title || 'Card image'}
+              width={getImageDimensions().width}
+              height={getImageDimensions().height}
+              className={getImageClasses()}
+            />
+          </figure>
+        )}
+        <div className={getBodyClasses()}>
+          {collapsible && hasContent ? (
+            <Collapse
+              variant='default'
+              bordered={false}
+              open={!isCollapsed}
+              onOpenChange={handleCollapsedChange}
+              title={titleContent}
+              titleClassName='w-full cursor-pointer'
+              contentClassName='p-0'
+              fullWidth={true}
+            >
+              {cardContent}
+            </Collapse>
+          ) : (
+            <>
+              {(title || subtitle) && (
+                <div className='mb-4'>
+                  {title && <h2 className={getTitleClasses()}>{title}</h2>}
+                  {subtitle && (
+                    <p className={getSubtitleClasses()}>{subtitle}</p>
+                  )}
+                </div>
+              )}
+              {hasContent && cardContent}
+            </>
+          )}
+        </div>
+      </>
+    );
+  };
+
   if (variant === 'image-full' && image) {
     return (
       <div className={getCardClasses()} {...props}>
-        <figure>
-          <img
-            src={image}
-            alt={imageAlt || title || 'Card image'}
-            className={getImageClasses()}
-          />
-        </figure>
-        <div className={getBodyClasses()}>
-          {title && <h2 className={getTitleClasses()}>{title}</h2>}
-          {subtitle && <p className={getSubtitleClasses()}>{subtitle}</p>}
-          {children}
-          {actions && <div className={getActionsClasses()}>{actions}</div>}
-        </div>
-        {footer && <div className={getFooterClasses()}>{footer}</div>}
+        {renderCardContent()}
       </div>
     );
   }
 
   return (
     <div className={getCardClasses()} {...props}>
-      {image && (
-        <figure>
-          <img
-            src={image}
-            alt={imageAlt || title || 'Card image'}
-            className={getImageClasses()}
-          />
-        </figure>
-      )}
-      <div className={getBodyClasses()}>
-        {title && <h2 className={getTitleClasses()}>{title}</h2>}
-        {subtitle && <p className={getSubtitleClasses()}>{subtitle}</p>}
-        {children}
-        {actions && <div className={getActionsClasses()}>{actions}</div>}
-      </div>
-      {footer && <div className={getFooterClasses()}>{footer}</div>}
+      {renderCardContent()}
     </div>
   );
 };

src/components/Collapse.tsx

@@ -26,6 +26,9 @@ export type CollapseProps = {
   disabled?: boolean;
   /** Allow only one open at a time by switching to radio input */
   asRadio?: boolean;
+  /** Force full width instead of auto-fit when collapsed
+   * (Khusus justify-between dan justify-end) */
+  fullWidth?: boolean;
   /** Extra classnames */
   className?: string;
   titleClassName?: string;
@@ -44,6 +47,7 @@ export const Collapse = ({
   bordered,
   disabled,
   asRadio = false,
+  fullWidth,
   className,
   titleClassName,
   contentClassName,
@@ -68,9 +72,9 @@ export const Collapse = ({
     'collapse',
     variant === 'arrow' && 'collapse-arrow',
     variant === 'plus' && 'collapse-plus',
-    bordered && 'border base-content/20 border-opacity-20 rounded',
+    bordered && 'border base-content/20 border-opacity-20 rounded-box',
     disabled && 'opacity-60 pointer-events-none',
-    !open && 'w-fit',
+    !fullWidth && !open && 'w-fit',
     className
   );
 

src/components/Modal.tsx

@@ -10,15 +10,19 @@ import {
 } from 'react';
 import { cn } from '@/lib/helper';
 
-export const useModal = () => {
+export const useModal = (isNestingModal = false) => {
   const ref = useRef<HTMLDialogElement>(null);
   const [open, setOpen] = useState(false);
 
   const openModal = useCallback(() => {
     if (!ref.current) return;
-    ref.current.show();
+    if (isNestingModal) {
+      ref.current.showModal();
+    } else {
+      ref.current.show();
+    }
     setOpen(true);
-  }, []);
+  }, [isNestingModal]);
 
   const closeModal = useCallback(() => {
     if (!ref.current) return;

src/components/Navbar.tsx

@@ -1,16 +1,38 @@
 'use client';
 
+import toast from 'react-hot-toast';
+import { useRouter } from 'next/navigation';
+
 import { Icon } from '@iconify/react';
 import Menu from '@/components/menu/Menu';
 import MenuItem from '@/components/menu/MenuItem';
 import Button from '@/components/Button';
 
+import { useAuth } from '@/services/hooks/useAuth';
+import { AuthApi } from '@/services/api/auth';
+import { isResponseError } from '@/lib/api-helper';
+
 interface NavbarProps {
   title: string;
   toggleSidebar?: () => void;
 }
 
 const Navbar = ({ title, toggleSidebar }: NavbarProps) => {
+  const { setUser } = useAuth();
+  const router = useRouter();
+
+  const logoutClickHandler = async () => {
+    const logoutRes = await AuthApi.logout();
+
+    if (isResponseError(logoutRes)) {
+      toast.error('Gagal logout! Coba lagi!');
+      return;
+    }
+
+    setUser(undefined);
+    router.replace(process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string);
+  };
+
   return (
     <div className='navbar px-4 bg-base-100 shadow-sm'>
       <div className='flex-1'>
@@ -42,8 +64,7 @@ const Navbar = ({ title, toggleSidebar }: NavbarProps) => {
           </div>
 
           <Menu className='dropdown-content w-52 mt-3 p-2 bg-base-100 shadow rounded-box menu-sm'>
-            <MenuItem title='Settings' href='#' />
-            <MenuItem title='Logout' href='#' />
+            <MenuItem title='Logout' onClick={logoutClickHandler} />
           </Menu>
         </div>
       </div>

src/components/helper/RequireAuth.tsx

@@ -6,147 +6,9 @@ import useSWRImmutable from 'swr/immutable';
 
 import { useAuth } from '@/services/hooks/useAuth';
 import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { GetMeResponse } from '@/types/api/api-general';
-
-// TODO: delete this later, DONT HARDCODE USER DATA
-const DUMMY_USER = {
-  id: 1,
-  email: 'admin@mbugroup.id',
-  npk: '0001',
-  name: 'Super Admin',
-  image: null,
-  created_at: '2025-09-30T03:24:20.899229Z',
-  updated_at: '2025-09-30T03:24:20.899229Z',
-  roles: [
-    {
-      id: 1,
-      key: 'mbu.super_admin',
-      name: 'MBU Administrator',
-      client: {
-        id: 1,
-        name: 'PT Mitra Berlian Unggas',
-        alias: 'MBU',
-      },
-      permissions: [
-        {
-          id: 1,
-          name: 'mbu:purchase:read',
-          action: 'read',
-          client: {
-            id: 1,
-            name: 'PT Mitra Berlian Unggas',
-            alias: 'MBU',
-          },
-        },
-        {
-          id: 2,
-          name: 'mbu:purchase:create',
-          action: 'create',
-          client: {
-            id: 1,
-            name: 'PT Mitra Berlian Unggas',
-            alias: 'MBU',
-          },
-        },
-        {
-          id: 3,
-          name: 'mbu:purchase:approve',
-          action: 'approve',
-          client: {
-            id: 1,
-            name: 'PT Mitra Berlian Unggas',
-            alias: 'MBU',
-          },
-        },
-      ],
-    },
-    {
-      id: 2,
-      key: 'lti.super_admin',
-      name: 'LTI Administrator',
-      client: {
-        id: 2,
-        name: 'PT Lumbung Telur Indonesia',
-        alias: 'LTI',
-      },
-      permissions: [
-        {
-          id: 4,
-          name: 'lti:purchase:read',
-          action: 'read',
-          client: {
-            id: 2,
-            name: 'PT Lumbung Telur Indonesia',
-            alias: 'LTI',
-          },
-        },
-        {
-          id: 5,
-          name: 'lti:purchase:create',
-          action: 'create',
-          client: {
-            id: 2,
-            name: 'PT Lumbung Telur Indonesia',
-            alias: 'LTI',
-          },
-        },
-        {
-          id: 6,
-          name: 'lti:purchase:approve',
-          action: 'approve',
-          client: {
-            id: 2,
-            name: 'PT Lumbung Telur Indonesia',
-            alias: 'LTI',
-          },
-        },
-      ],
-    },
-    {
-      id: 3,
-      key: 'manbu.super_admin',
-      name: 'MANBU Administrator',
-      client: {
-        id: 3,
-        name: 'PT Mandiri Berlian Unggas',
-        alias: 'MANBU',
-      },
-      permissions: [
-        {
-          id: 7,
-          name: 'manbu:purchase:read',
-          action: 'read',
-          client: {
-            id: 3,
-            name: 'PT Mandiri Berlian Unggas',
-            alias: 'MANBU',
-          },
-        },
-        {
-          id: 8,
-          name: 'manbu:purchase:create',
-          action: 'create',
-          client: {
-            id: 3,
-            name: 'PT Mandiri Berlian Unggas',
-            alias: 'MANBU',
-          },
-        },
-        {
-          id: 9,
-          name: 'manbu:purchase:approve',
-          action: 'approve',
-          client: {
-            id: 3,
-            name: 'PT Mandiri Berlian Unggas',
-            alias: 'MANBU',
-          },
-        },
-      ],
-    },
-  ],
-};
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { BaseApiResponse, GetMeResponse } from '@/types/api/api-general';
+import { AxiosError } from 'axios';
 
 interface RequireAuthProps {
   children?: ReactNode;
@@ -156,17 +18,20 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
   const router = useRouter();
   const { setUser, setIsLoadingUser } = useAuth();
 
-  const { data: userResponse, isLoading: isLoadingUserResponse } =
-    useSWRImmutable<GetMeResponse & { ok?: boolean }, unknown, SWRHttpKey>(
-      '/auth/sso/userinfo',
-      httpClientFetcher,
-      {
-        shouldRetryOnError: false,
-        revalidateOnFocus: false,
-        revalidateOnReconnect: false,
-        refreshInterval: 0,
-      }
-    );
+  const {
+    data: userResponse,
+    isLoading: isLoadingUserResponse,
+    error: userErrorResponse,
+  } = useSWRImmutable<
+    GetMeResponse & { ok?: boolean },
+    AxiosError<BaseApiResponse>,
+    SWRHttpKey
+  >('/sso/userinfo', httpClientFetcher, {
+    shouldRetryOnError: false,
+    revalidateOnFocus: false,
+    revalidateOnReconnect: false,
+    refreshInterval: 0,
+  });
 
   useEffect(() => {
     setIsLoadingUser(isLoadingUserResponse);
@@ -175,23 +40,25 @@ const RequireAuth = ({ children }: RequireAuthProps) => {
   useEffect(() => {
     if (isResponseSuccess(userResponse)) {
       setUser(userResponse.data);
-    } else {
-      // router.replace(process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string);
-      // TODO: remove this later, DONT HARDCODE USER DATA
-      setUser(DUMMY_USER);
+    } else if (
+      isResponseError(userErrorResponse?.response?.data) &&
+      typeof window !== 'undefined'
+    ) {
+      router.replace(
+        `${process.env.NEXT_PUBLIC_SSO_LOGIN_URL as string}?redirect_url=${window.location.href}`
+      );
     }
-  }, [userResponse, setIsLoadingUser, setUser]);
+  }, [userResponse, userErrorResponse, setIsLoadingUser, setUser]);
 
-  // TODO: uncomment this later
-  // if (isLoadingUserResponse && !userResponse) {
-  //   return (
-  //     <div className='w-full flex flex-row justify-center items-center p-4'>
-  //       <span className='loading loading-spinner loading-xl' />
-  //     </div>
-  //   );
-  // }
+  if (isLoadingUserResponse && !userResponse && !userErrorResponse) {
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
 
-  return <>{children}</>;
+  return <>{isResponseSuccess(userResponse) && children}</>;
 };
 
 export default RequireAuth;

src/components/helper/form/FormActions.tsx

@@ -9,6 +9,11 @@ interface FormActionsProps<T> {
   editUrl?: string;
   onDelete?: () => void;
   disableSubmit?: boolean;
+  onApprove?: () => void;
+  onReject?: () => void;
+  isApproveLoading?: boolean;
+  isRejectLoading?: boolean;
+  showApproveReject?: boolean;
 }
 
 export const FormActions = <T,>({
@@ -17,25 +22,32 @@ export const FormActions = <T,>({
   editUrl,
   onDelete,
   disableSubmit = false,
+  onApprove,
+  onReject,
+  isApproveLoading = false,
+  isRejectLoading = false,
+  showApproveReject = false,
 }: FormActionsProps<T>) => {
   return (
     <div className='flex flex-row justify-between gap-2 flex-wrap'>
-      {type !== 'add' && onDelete && (
+      {type !== 'add' && (
         <div className='flex flex-row justify-start gap-2'>
-          <Button
-            type='button'
-            color='error'
-            onClick={onDelete}
-            className='px-4'
-          >
-            <Icon
-              icon='material-symbols:delete-outline-rounded'
-              width={24}
-              height={24}
-              className='justify-start text-sm'
-            />
-            Delete
-          </Button>
+          {onDelete && (
+            <Button
+              type='button'
+              color='error'
+              onClick={onDelete}
+              className='px-4'
+            >
+              <Icon
+                icon='material-symbols:delete-outline-rounded'
+                width={24}
+                height={24}
+                className='justify-start text-sm'
+              />
+              Delete
+            </Button>
+          )}
           {type !== 'edit' && editUrl && (
             <Button
               type='button'
@@ -52,6 +64,46 @@ export const FormActions = <T,>({
               Edit
             </Button>
           )}
+          {type === 'detail' &&
+            showApproveReject &&
+            (onApprove || onReject) && (
+              <>
+                {onApprove && (
+                  <Button
+                    type='button'
+                    color='success'
+                    onClick={onApprove}
+                    className='px-4'
+                    isLoading={isApproveLoading}
+                  >
+                    <Icon
+                      icon='material-symbols:check-circle-outline'
+                      width={24}
+                      height={24}
+                      className='justify-start text-sm'
+                    />
+                    Approve
+                  </Button>
+                )}
+                {onReject && (
+                  <Button
+                    type='button'
+                    color='error'
+                    onClick={onReject}
+                    className='px-4'
+                    isLoading={isRejectLoading}
+                  >
+                    <Icon
+                      icon='material-symbols:cancel-outline'
+                      width={24}
+                      height={24}
+                      className='justify-start text-sm'
+                    />
+                    Reject
+                  </Button>
+                )}
+              </>
+            )}
         </div>
       )}
       {type !== 'detail' && (

src/components/input/DateInput.tsx

@@ -7,10 +7,10 @@ import {
   useState,
 } from 'react';
 import { cn, formatDate } from '@/lib/helper';
-import Modal, { useModal } from '@/components/Modal';
+import Modal, { useModal } from '../Modal';
 import { DateRange, DayPicker, Matcher } from 'react-day-picker';
 import 'react-day-picker/dist/style.css';
-import Button from '@/components/Button';
+import Button from '../Button';
 import { Icon } from '@iconify/react';
 
 export interface DateInputProps {
@@ -34,6 +34,7 @@ export interface DateInputProps {
   required?: boolean;
   isLoading?: boolean;
   isRange?: boolean;
+  isNestedModal?: boolean; // New prop to indicate if used inside another modal
   errorMessage?: string;
   onChange?: ChangeEventHandler<HTMLInputElement>;
   onBlur?: FocusEventHandler<HTMLInputElement>;
@@ -58,6 +59,7 @@ const DateInput = ({
   readOnly = false,
   isLoading = false,
   isRange = false,
+  isNestedModal = false,
 }: DateInputProps) => {
   const [internalError, setInternalError] = useState<string | null>(null);
   const [selected, setSelected] = useState<Date | undefined>();
@@ -74,11 +76,14 @@ const DateInput = ({
     ? new Date(max.split('/').reverse().join('-'))
     : undefined;
 
-  const calendarModal = useModal();
+  const calendarModal = useModal(isNestedModal);
 
   // --- Sync value props ---
   useEffect(() => {
-    if (!value) return;
+    if (!value) {
+      setDisplayValue('');
+      return;
+    }
     if (isRange && typeof value === 'object') {
       const from = value.from ? new Date(value.from) : undefined;
       const to = value.to ? new Date(value.to) : undefined;
@@ -210,7 +215,7 @@ const DateInput = ({
 
       <div
         className={cn(
-          'input h-12 px-4 py-2 text-base font-normal leading-6 w-full rounded transition-all duration-200 flex items-center border',
+          'input h-12 bg-inherit px-4 py-2 text-base font-normal leading-6 w-full rounded transition-all duration-200 flex items-center border',
           {
             'border-error': finalIsError,
             'border-success': externalValid && !finalIsError,
@@ -261,7 +266,7 @@ const DateInput = ({
         ref={calendarModal.ref}
         className={{
           modal: 'rounded',
-          modalBox: `w-fit min-h-${isRange ? '124' : '110'} flex flex-col`,
+          modalBox: `!max-w-max min-h-${isRange ? '124' : '110'} flex flex-col`,
         }}
         closeOnBackdrop
       >

src/components/input/DebouncedTextArea.tsx

@@ -0,0 +1,44 @@
+'use client';
+
+import { ChangeEvent, ChangeEventHandler, useEffect, useState } from 'react';
+import { useDebounce } from 'use-debounce';
+
+import TextArea, { TextAreaProps } from '@/components/input/TextArea';
+
+interface DebouncedTextAreaProps extends TextAreaProps {
+  delay?: number;
+}
+
+const DebouncedTextArea = (props: DebouncedTextAreaProps) => {
+  const { delay, onChange } = props;
+
+  const [internalChangeEvent, setInternalChangeEvent] =
+    useState<ChangeEvent<HTMLTextAreaElement>>();
+  const [internalValue, setInternalValue] = useState(props.value);
+
+  const [debouncedChangeEvent] = useDebounce(internalChangeEvent, delay ?? 300);
+  const [debouncedValue] = useDebounce(internalValue, delay ?? 300);
+
+  const internalChangeHandler: ChangeEventHandler<HTMLTextAreaElement> = (
+    e
+  ) => {
+    setInternalValue(e.target.value);
+    setInternalChangeEvent(e);
+  };
+
+  useEffect(() => {
+    if (debouncedChangeEvent) {
+      onChange?.(debouncedChangeEvent);
+    }
+  }, [debouncedValue]);
+
+  return (
+    <TextArea
+      {...props}
+      value={internalValue}
+      onChange={internalChangeHandler}
+    />
+  );
+};
+
+export default DebouncedTextArea;

src/components/input/NumberInput.tsx

@@ -49,8 +49,8 @@ const NumberInput = ({
       onValueChange={valueChangeHandler}
       decimalScale={decimalScale}
       allowNegative={allowNegative}
-      startAdornment={inputPrefix}
-      endAdornment={inputSuffix}
+      inputPrefix={inputPrefix}
+      inputSuffix={inputSuffix}
       {...restProps}
     />
   );

src/components/input/TextArea.tsx

@@ -83,7 +83,7 @@ const TextArea = ({
 
       <textarea
         className={cn(
-          'input h-auto px-4 py-2 text-base font-normal leading-6 w-full rounded outline-none! transition-all bg-white',
+          'textarea h-auto px-4 py-2 text-base font-normal leading-6 w-full rounded outline-none! transition-all bg-white',
           {
             'border-error': isError,
             'border-success!': isValid,

src/components/input/TextInput.tsx

@@ -31,6 +31,8 @@ export interface TextInputProps {
   errorMessage?: string;
   startAdornment?: ReactNode;
   endAdornment?: ReactNode;
+  inputPrefix?: ReactNode;
+  inputSuffix?: ReactNode;
   onChange?: ChangeEventHandler<HTMLInputElement>;
   onBlur?: FocusEventHandler<HTMLInputElement>;
 }
@@ -48,6 +50,8 @@ const TextInput = ({
   errorMessage,
   startAdornment,
   endAdornment,
+  inputPrefix,
+  inputSuffix,
   disabled = false,
   required = false,
   onChange,
@@ -85,39 +89,117 @@ const TextInput = ({
         </label>
       )}
 
-      <div
-        className={cn(
-          'input h-12 px-4 py-2 text-base font-normal leading-6 w-full rounded outline-none! transition-all duration-200',
-          {
-            'border-error': isError,
-            'border-success!': isValid,
-          },
-          className?.inputWrapper
-        )}
-      >
-        {startAdornment && startAdornment}
+      {inputPrefix || inputSuffix ? (
+        <div className='relative flex'>
+          {inputPrefix && (
+            <div
+              className={cn(
+                'inline-flex items-center px-4 py-2 border border-r-0 rounded-l-md transition-all duration-200',
+                {
+                  'bg-gray-100 border-gray-300': !disabled,
+                  'bg-gray-50 border-gray-200': disabled,
+                }
+              )}
+            >
+              {inputPrefix}
+            </div>
+          )}
 
-        <input
-          type={type}
-          id={name}
-          name={name}
-          placeholder={placeholder}
-          value={value}
-          onChange={onChange}
-          onBlur={onBlur}
-          disabled={disabled}
-          className={cn('grow', className?.input)}
-          readOnly={readOnly}
-        />
+          <div
+            className={cn(
+              'input h-12 text-base font-normal leading-6 flex-1 rounded-lg! outline-none! transition-all duration-200 flex items-center bg-white',
+              {
+                'border-error': isError,
+                'border-success!': isValid,
+                'rounded-l-none!': inputPrefix,
+                'rounded-r-none!': inputSuffix,
+                'input-disabled': disabled,
+                'cursor-not-allowed': disabled,
+                'bg-gray-50': disabled,
+              },
+              className?.inputWrapper
+            )}
+          >
+            {startAdornment && startAdornment}
 
-        {(isLoading || endAdornment) && (
-          <div className='flex flex-row gap-2'>
-            {isLoading && <span className='loading loading-spinner' />}
+            <input
+              type={type}
+              id={name}
+              name={name}
+              placeholder={placeholder}
+              value={value}
+              onChange={onChange}
+              onBlur={onBlur}
+              disabled={disabled}
+              className={cn(
+                'grow bg-transparent outline-none',
+                {
+                  'cursor-not-allowed': disabled,
+                  'text-gray-500': disabled,
+                },
+                className?.input
+              )}
+              readOnly={readOnly}
+            />
 
-            {endAdornment && endAdornment}
+            {(isLoading || endAdornment) && (
+              <div className='flex flex-row gap-2'>
+                {isLoading && <span className='loading loading-spinner' />}
+
+                {endAdornment && endAdornment}
+              </div>
+            )}
           </div>
-        )}
-      </div>
+
+          {inputSuffix && (
+            <div
+              className={cn(
+                'inline-flex items-center px-4 py-2 border border-l-0 rounded-r-md transition-all duration-200',
+                {
+                  'bg-gray-100 border-gray-300': !disabled,
+                  'bg-gray-50 border-gray-200': disabled,
+                }
+              )}
+            >
+              {inputSuffix}
+            </div>
+          )}
+        </div>
+      ) : (
+        <div
+          className={cn(
+            'input h-12 px-4 py-2 text-base font-normal leading-6 w-full rounded-lg! outline-none! transition-all duration-200 bg-white',
+            {
+              'border-error': isError,
+              'border-success!': isValid,
+            },
+            className?.inputWrapper
+          )}
+        >
+          {startAdornment && startAdornment}
+
+          <input
+            type={type}
+            id={name}
+            name={name}
+            placeholder={placeholder}
+            value={value}
+            onChange={onChange}
+            onBlur={onBlur}
+            disabled={disabled}
+            className={cn('grow', className?.input)}
+            readOnly={readOnly}
+          />
+
+          {(isLoading || endAdornment) && (
+            <div className='flex flex-row gap-2'>
+              {isLoading && <span className='loading loading-spinner' />}
+
+              {endAdornment && endAdornment}
+            </div>
+          )}
+        </div>
+      )}
 
       {!isError && bottomLabel && (
         <p className='w-full text-sm opacity-60'>{bottomLabel}</p>

src/components/modal/ConfirmationModalWithNotes.tsx

@@ -50,6 +50,7 @@ const ConfirmationModalWithNotes: React.FC<ConfirmationModalWithNotesProps> = ({
         ...primaryButton,
         onClick: () => {
           primaryButton?.onClick?.(notes);
+          setNotes('');
         },
       }}
       secondaryButton={secondaryButton}

src/components/pages/ApprovalSteps.tsx

@@ -18,6 +18,7 @@ import { useCallback, useMemo } from 'react';
 export type ApprovalStepStatus = 'APPROVED' | 'REJECTED' | 'WAITING' | 'IDLE';
 
 export type ApprovalStepLog = {
+  action: string;
   action_by?: string;
   date?: string;
   notes?: string | null;
@@ -65,28 +66,55 @@ const ApprovalSteps = ({ approvals }: ApprovalStepsProps) => {
                 position='right'
                 className={{
                   wrapper: 'md:tooltip-bottom',
+                  content: 'p-0 rounded overflow-hidden',
                 }}
                 content={
                   <>
                     {approval.logs && approval.logs.length > 0 && (
-                      <div className='flex flex-col gap-2'>
-                        {approval.logs?.map((approvalLog, logIdx) => (
-                          <div
-                            key={logIdx}
-                            className='flex flex-col text-base text-start'
-                          >
-                            {approvalLog.date && (
-                              <span>
-                                {formatDate(
-                                  approvalLog.date,
-                                  'YYYY-MM-DD, HH:mm:ss'
-                                )}
-                              </span>
-                            )}
-                            <span>Oleh: {approvalLog.action_by ?? '-'}</span>
-                            <span>Catatan: {approvalLog.notes ?? '-'}</span>
-                          </div>
-                        ))}
+                      <div className='flex flex-col gap-0'>
+                        {approval.logs?.map((approvalLog, logIdx) => {
+                          const action =
+                            approvalLog.action === 'CREATED'
+                              ? 'Dibuat'
+                              : approvalLog.action === 'UPDATED'
+                                ? 'Diperbarui'
+                                : approvalLog.action === 'APPROVED'
+                                  ? 'Disetujui'
+                                  : approvalLog.action === 'REJECTED'
+                                    ? 'Ditolak'
+                                    : '-';
+
+                          return (
+                            <div
+                              key={logIdx}
+                              className={cn(
+                                'p-2 flex flex-col text-base text-start',
+                                {
+                                  'bg-success text-success-content':
+                                    approvalLog.action === 'APPROVED',
+                                  'bg-error text-error-content':
+                                    approvalLog.action === 'REJECTED',
+                                  'bg-info text-info-content':
+                                    approvalLog.action === 'CREATED',
+                                  'bg-warning text-warning-content':
+                                    approvalLog.action === 'UPDATED',
+                                }
+                              )}
+                            >
+                              {approvalLog.date && (
+                                <span>
+                                  {formatDate(
+                                    approvalLog.date,
+                                    'YYYY-MM-DD, HH:mm:ss'
+                                  )}
+                                </span>
+                              )}
+                              <span>Aksi: {action}</span>
+                              <span>Oleh: {approvalLog.action_by ?? '-'}</span>
+                              <span>Catatan: {approvalLog.notes ?? '-'}</span>
+                            </div>
+                          );
+                        })}
                       </div>
                     )}
                   </>
@@ -130,6 +158,8 @@ export const formatGroupedApprovalsToApprovalSteps = (
       const lastStepNumber =
         groupedApprovals[groupedApprovals.length - 1]?.step_number;
 
+      const isLatestApprovalRejected = latestApproval.action === 'REJECTED';
+
       if (!approvalGroup && currentStepNumber <= lastStepNumber) {
         throw new Error(
           `Approval dengan ${approvalLineItem.step_name} tidak ditemukan!`
@@ -158,6 +188,7 @@ export const formatGroupedApprovalsToApprovalSteps = (
         if (approvalGroup.approvals) {
           switch (approvalGroup?.approvals[0]?.action) {
             case 'CREATED':
+            case 'UPDATED':
             case 'APPROVED':
               approvalStatus = 'APPROVED';
               break;
@@ -171,7 +202,10 @@ export const formatGroupedApprovalsToApprovalSteps = (
               break;
           }
         }
-      } else if (approvalGroup.step_number === latestApproval.step_number + 1) {
+      } else if (
+        approvalGroup.step_number === latestApproval.step_number + 1 &&
+        !isLatestApprovalRejected
+      ) {
         approvalStatus = 'WAITING';
       } else {
         approvalStatus = 'IDLE';
@@ -182,6 +216,7 @@ export const formatGroupedApprovalsToApprovalSteps = (
             action_by: approval.action_by.name,
             date: approval.action_at,
             notes: approval.notes,
+            action: approval.action,
           }))
         : [];
 
@@ -256,7 +291,7 @@ const useApprovalSteps = ({
   moduleName: string;
   moduleId: string;
   params?: {
-    page: number;
+    page?: number;
     limit: number;
     search?: string;
     group_step_number?: boolean;

src/components/pages/expense/ExpenseDetail.tsx

@@ -1,157 +1,45 @@
 'use client';
 
-import { useState } from 'react';
-import toast from 'react-hot-toast';
-import { useRouter } from 'next/navigation';
-import { useFormik } from 'formik';
+import { useMemo, useState } from 'react';
 
-import Link from 'next/link';
 import { Icon } from '@iconify/react';
 import Button from '@/components/Button';
-import { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
-import RealizationStatusBadge from '@/components/pages/expense/RealizationStatusBadge';
-import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge';
-import DropFileInput from '@/components/input/DropFileInput';
+import Tabs from '@/components/Tabs';
+import ExpenseRequestContent from '@/components/pages/expense/ExpenseRequestContent';
+import ExpenseRealizationContent from '@/components/pages/expense/ExpenseRealizationContent';
 
 import { Expense } from '@/types/api/expense';
-import { formatCurrency, formatDate } from '@/lib/helper';
-import { ExpenseApi } from '@/services/api/expense';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { ACCEPTED_FILE_TYPE } from '@/config/constant';
-import {
-  UploadRequestDocumentsFormSchema,
-  UploadRequestDocumentsFormValues,
-} from '@/components/pages/expense/form/ExpenseRequestForm.schema';
 
 interface ExpenseDetailProps {
   initialValues?: Expense;
 }
 
 const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
-  const router = useRouter();
+  const [activeTab, setActiveTab] = useState<string>('request');
 
-  // Modal hooks
-  const deleteModal = useModal();
-  const approveModal = useModal();
-  const rejectModal = useModal();
+  const expenseDetailTabs = useMemo(() => {
+    const validTabs = [
+      {
+        id: 'request',
+        label: 'Pengajuan',
+        content: <ExpenseRequestContent initialValues={initialValues} />,
+      },
+    ];
 
-  // Modal loading state
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-  const [isApproveLoading, setIsApproveLoading] = useState(false);
-  const [isRejectLoading, setIsRejectLoading] = useState(false);
-
-  const isLatestApprovalRejectedOrDone =
-    initialValues?.approval &&
-    (initialValues.approval.action === 'REJECTED' ||
-      initialValues.approval.step_number === 5);
-
-  const formik = useFormik<UploadRequestDocumentsFormValues>({
-    initialValues: {
-      request_documents: [],
-    },
-    validationSchema: UploadRequestDocumentsFormSchema,
-    onSubmit: async (values) => {
-      const addRequestDocumentsRes = await ExpenseApi.uploadRequestDocuments(
-        initialValues?.id as number,
-        values.request_documents
-      );
-
-      if (isResponseSuccess(addRequestDocumentsRes)) {
-        toast.success(addRequestDocumentsRes.message);
-        window.location.reload();
-      } else {
-        toast.error(String(addRequestDocumentsRes?.message));
-      }
-    },
-  });
-
-  const deleteExpenseClickHandler = () => {
-    deleteModal.openModal();
-  };
-
-  const approveClickHandler = () => {
-    approveModal.openModal();
-  };
-
-  const rejectClickHandler = () => {
-    rejectModal.openModal();
-  };
-
-  // Modal confirm click handler
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsDeleteLoading(true);
-
-    try {
-      await ExpenseApi.delete(initialValues?.id as number);
-
-      toast.success('Berhasil menghapus data biaya operasional!');
-      router.push('/expense');
-    } catch (error) {
-      toast.error('Gagal menghapus data biaya operasional!');
-    } finally {
-      deleteModal.closeModal();
-      setIsDeleteLoading(false);
-    }
-  };
-
-  const confirmationModalApproveClickHandler = async (notes: string) => {
-    setIsApproveLoading(true);
-
-    const approveResponse = await ExpenseApi.approve(
-      initialValues?.id as number,
-      notes
-    );
-
-    if (isResponseSuccess(approveResponse)) {
-      approveModal.closeModal();
-
-      toast.success('Berhasil approve pengajuan biaya operasional!');
-      router.push('/expense');
-    } else {
-      approveModal.closeModal();
-
-      toast.error('Gagal approve pengajuan biaya operasional!');
+    if (
+      initialValues?.latest_approval &&
+      initialValues?.latest_approval.step_number >= 4 &&
+      initialValues.latest_approval.action !== 'REJECTED'
+    ) {
+      validTabs.push({
+        id: 'realization',
+        label: 'Realisasi',
+        content: <ExpenseRealizationContent initialValues={initialValues} />,
+      });
     }
 
-    setIsApproveLoading(false);
-  };
-
-  const confirmationModalRejectClickHandler = async (notes: string) => {
-    setIsRejectLoading(true);
-
-    const rejectResponse = await ExpenseApi.reject(
-      initialValues?.id as number,
-      notes
-    );
-
-    if (isResponseSuccess(rejectResponse)) {
-      rejectModal.closeModal();
-
-      toast.success('Berhasil reject pengajuan biaya operasional!');
-      router.push('/expense');
-    } else {
-      rejectModal.closeModal();
-
-      toast.error('Gagal reject pengajuan biaya operasional!');
-    }
-
-    setIsRejectLoading(false);
-  };
-
-  const requestDocumentsChangeHandler = (val: File[]) => {
-    formik.setFieldTouched('request_documents', true);
-    formik.setFieldValue('request_documents', val);
-  };
-
-  const requestDocumentsDeleteHandler = (deletedFileIdx: number) => {
-    const newRequestDocuments = formik.values.request_documents;
-
-    newRequestDocuments?.splice(deletedFileIdx, 1);
-
-    formik.setFieldValue('request_documents', newRequestDocuments);
-  };
+    return validTabs;
+  }, [initialValues]);
 
   return (
     <>
@@ -171,335 +59,16 @@ const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
           </h1>
         </header>
 
-        <div className='w-full mt-4 flex flex-col gap-4'>
-          {/* TODO: apply RBAC */}
-          {!isLatestApprovalRejectedOrDone && (
-            <div className='w-full max-w-3xl mx-auto flex flex-row justify-end gap-2'>
-              <Button
-                variant='outline'
-                color='success'
-                onClick={approveClickHandler}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='material-symbols:check' width={24} height={24} />
-                Approve
-              </Button>
-
-              <Button
-                variant='outline'
-                color='error'
-                onClick={rejectClickHandler}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='material-symbols:close' width={24} height={24} />
-                Reject
-              </Button>
-
-              <Button
-                type='button'
-                color='warning'
-                href={`/expense/detail/edit/?expenseId=${initialValues?.id}`}
-                className='px-4 ml-2'
-              >
-                <Icon icon='mdi:pencil-outline' width={24} height={24} />
-                Edit
-              </Button>
-
-              <Button
-                type='button'
-                color='error'
-                onClick={deleteExpenseClickHandler}
-                className='px-4'
-              >
-                <Icon
-                  icon='material-symbols:delete-outline-rounded'
-                  width={24}
-                  height={24}
-                  className='justify-start text-sm'
-                />
-                Delete
-              </Button>
-            </div>
-          )}
-
-          {/* TODO: add and integrate ApprovalSteps component with API */}
-
-          <div className='overflow-x-auto w-full max-w-3xl mx-auto'>
-            <table className='table table-sm table-zebra'>
-              <tbody>
-                <tr>
-                  <th>Nomor PO</th>
-                  <th>:</th>
-                  <td>{initialValues?.po_number ?? '-'}</td>
-                </tr>
-                <tr>
-                  <th>Nomor Referensi</th>
-                  <th>:</th>
-                  <td>{initialValues?.reference_number}</td>
-                </tr>
-                <tr>
-                  <th>Lokasi</th>
-                  <th>:</th>
-                  <td>{initialValues?.location.name}</td>
-                </tr>
-                <tr>
-                  <th>Kandang</th>
-                  <th>:</th>
-                  <td>
-                    {initialValues?.kandangs
-                      .map((item) => item.name)
-                      .join(', ')}
-                  </td>
-                </tr>
-                <tr>
-                  <th>Vendor</th>
-                  <th>:</th>
-                  <td>{initialValues?.vendor.name}</td>
-                </tr>
-                <tr>
-                  <th>Tanggal Transaksi</th>
-                  <th>:</th>
-                  <td>
-                    {formatDate(
-                      initialValues?.transaction_date,
-                      'DD MMMM YYYY'
-                    )}
-                  </td>
-                </tr>
-                <tr>
-                  <th>Tanggal Realisasi</th>
-                  <th>:</th>
-                  <td>
-                    {initialValues?.realization_date
-                      ? formatDate(
-                          initialValues?.realization_date,
-                          'DD MMMM YYYY'
-                        )
-                      : '-'}
-                  </td>
-                </tr>
-                <tr>
-                  <th>Nama Pengaju</th>
-                  <th>:</th>
-                  <td>{initialValues?.created_user.name}</td>
-                </tr>
-                <tr>
-                  <th>Nominal Biaya</th>
-                  <th>:</th>
-                  <td>{formatCurrency(initialValues?.nominal ?? 0)}</td>
-                </tr>
-                <tr>
-                  <th>Nominal Sudah Bayar</th>
-                  <th>:</th>
-                  <td>{formatCurrency(initialValues?.paid ?? 0)}</td>
-                </tr>
-                <tr>
-                  <th>Nominal Sisa Bayar</th>
-                  <th>:</th>
-                  <td>{formatCurrency(initialValues?.remaining_cost ?? 0)}</td>
-                </tr>
-                <tr>
-                  <th>Status Pencairan</th>
-                  <th>:</th>
-                  <td>
-                    <RealizationStatusBadge
-                      approval={initialValues?.approval}
-                    />
-                  </td>
-                </tr>
-                <tr>
-                  <th>Status Biaya</th>
-                  <th>:</th>
-                  <td>
-                    <ExpenseStatusBadge approval={initialValues?.approval} />
-                  </td>
-                </tr>
-                <tr>
-                  <th>Dokumen Pengajuan</th>
-                  <th>:</th>
-                  <td>
-                    <div>
-                      {initialValues?.request_documents.length === 0 && '-'}
-
-                      {initialValues?.request_documents &&
-                        initialValues?.request_documents.length > 0 && (
-                          <ul className='list-disc'>
-                            {initialValues?.request_documents.map(
-                              (requestDocument, requestDocumentIdx) => (
-                                <li key={requestDocumentIdx}>
-                                  <Link
-                                    href={requestDocument.url}
-                                    target='_blank'
-                                    rel='noopener noreferrer'
-                                    className='text-blue-500 underline'
-                                  >
-                                    {requestDocument.name}{' '}
-                                    <Icon
-                                      icon='cuida:open-in-new-tab-outline'
-                                      width={12}
-                                      height={12}
-                                      className='inline'
-                                    />
-                                  </Link>
-                                </li>
-                              )
-                            )}
-                          </ul>
-                        )}
-                    </div>
-
-                    <div className='flex flex-col gap-2'>
-                      <DropFileInput
-                        name='request_documents'
-                        values={formik.values.request_documents}
-                        onChange={requestDocumentsChangeHandler}
-                        onDelete={requestDocumentsDeleteHandler}
-                        accept={{
-                          ...ACCEPTED_FILE_TYPE.PDF,
-                          ...ACCEPTED_FILE_TYPE.IMAGE,
-                        }}
-                        maxFiles={10}
-                        className={{
-                          wrapper: 'mt-2',
-                          inputWrapper: 'flex items-center',
-                        }}
-                      />
-
-                      {formik.values.request_documents &&
-                        formik.values.request_documents.length > 0 && (
-                          <Button
-                            onClick={formik.submitForm}
-                            disabled={formik.isSubmitting}
-                            isLoading={formik.isSubmitting}
-                            className='w-fit self-end'
-                          >
-                            <Icon icon='ic:round-plus' width={24} height={24} />
-                            Tambah
-                          </Button>
-                        )}
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-
-        <div className='w-full max-w-5xl mt-8 mx-auto'>
-          <h2 className='font-bold text-xl text-center'>
-            Rincian Pengajuan Biaya Operasional
-          </h2>
-
-          <div className='w-full mt-2 flex flex-col gap-4'>
-            {initialValues?.kandang_expenses.map(
-              (kandangExpense, kandangExpenseIdx) => {
-                let expenseGrandTotal = 0;
-
-                kandangExpense.expenses.forEach(
-                  (item) => (expenseGrandTotal += item.total_expense)
-                );
-
-                return (
-                  <div
-                    key={kandangExpenseIdx}
-                    className='overflow-x-auto w-full mx-auto'
-                  >
-                    <table className='table table-sm table-zebra'>
-                      <thead>
-                        <tr>
-                          <th
-                            colSpan={5}
-                            className='font-bold text-center text-base-content text-lg'
-                          >
-                            Biaya {kandangExpense.kandang.name}
-                          </th>
-                        </tr>
-                        <tr>
-                          <th>Nonstock</th>
-                          <th>Total Kuantitas</th>
-                          <th>Total Biaya</th>
-                          <th>Catatan</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {kandangExpense.expenses.map(
-                          (expenseItem, expenseIdx) => (
-                            <tr key={expenseIdx}>
-                              <td>{expenseItem.nonstock.name}</td>
-                              <td>{expenseItem.total_quantity}</td>
-                              <td>
-                                {formatCurrency(expenseItem.total_expense)}
-                              </td>
-                              <td className='w-xs'>
-                                {expenseItem.notes ?? '-'}
-                              </td>
-                            </tr>
-                          )
-                        )}
-                      </tbody>
-                      <tfoot>
-                        <tr className='border-y'>
-                          <th colSpan={2} className='text-right'>
-                            Total Biaya Keseluruhan:
-                          </th>
-                          <th colSpan={2}>
-                            {formatCurrency(expenseGrandTotal)}
-                          </th>
-                        </tr>
-                      </tfoot>
-                    </table>
-                  </div>
-                );
-              }
-            )}
-          </div>
-        </div>
+        <Tabs
+          activeTabId={activeTab}
+          onTabChange={setActiveTab}
+          tabs={expenseDetailTabs}
+          variant='lifted'
+          className={{
+            wrapper: 'max-w-5xl mx-auto mt-4',
+          }}
+        />
       </section>
-
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text='Apakah anda yakin ingin menghapus data transfer ke laying ini?'
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isDeleteLoading,
-          onClick: confirmationModalDeleteClickHandler,
-        }}
-      />
-
-      <ConfirmationModalWithNotes
-        ref={approveModal.ref}
-        type='success'
-        text='Apakah anda yakin ingin approve data transfer ke laying ini?'
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'success',
-          isLoading: isApproveLoading,
-          onClick: confirmationModalApproveClickHandler,
-        }}
-      />
-
-      <ConfirmationModalWithNotes
-        ref={rejectModal.ref}
-        type='error'
-        text='Apakah anda yakin ingin reject data transfer ke laying ini?'
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isRejectLoading,
-          onClick: confirmationModalRejectClickHandler,
-        }}
-      />
     </>
   );
 };

src/components/pages/expense/ExpenseRealizationContent.tsx

@@ -0,0 +1,327 @@
+import { useFormik } from 'formik';
+import toast from 'react-hot-toast';
+
+import Link from 'next/link';
+import { Icon } from '@iconify/react';
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import DropFileInput from '@/components/input/DropFileInput';
+
+import { Expense } from '@/types/api/expense';
+import { formatCurrency, formatDate } from '@/lib/helper';
+import {
+  UploadRequestDocumentsFormSchema,
+  UploadRequestDocumentsFormValues,
+} from '@/components/pages/expense/form/ExpenseRequestForm.schema';
+import { ExpenseApi } from '@/services/api/expense';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { ACCEPTED_FILE_TYPE } from '@/config/constant';
+
+interface ExpenseRealizationContentProps {
+  initialValues?: Expense;
+}
+
+const ExpenseRealizationContent = ({
+  initialValues,
+}: ExpenseRealizationContentProps) => {
+  const formik = useFormik<UploadRequestDocumentsFormValues>({
+    initialValues: {
+      documents: [],
+    },
+    validationSchema: UploadRequestDocumentsFormSchema,
+    onSubmit: async (values) => {
+      const addRealizationDocumentsRes =
+        await ExpenseApi.uploadRealizationDocuments(
+          initialValues?.id as number,
+          values.documents
+        );
+
+      if (isResponseSuccess(addRealizationDocumentsRes)) {
+        toast.success(addRealizationDocumentsRes.message);
+        window.location.reload();
+      } else {
+        toast.error(String(addRealizationDocumentsRes?.message));
+      }
+    },
+  });
+
+  const realizationDocumentsChangeHandler = (val: File[]) => {
+    formik.setFieldTouched('documents', true);
+    formik.setFieldValue('documents', val);
+  };
+
+  const realizationDocumentsDeleteHandler = (deletedFileIdx: number) => {
+    const newRealizationDocuments = formik.values.documents;
+
+    newRealizationDocuments?.splice(deletedFileIdx, 1);
+
+    formik.setFieldValue('documents', newRealizationDocuments);
+  };
+
+  return (
+    <div>
+      <div className='w-full max-w-5xl mx-auto flex flex-col sm:flex-row justify-end gap-2'>
+        <div className='w-full sm:w-fit sm:ml-2 flex flex-row gap-2 items-center'>
+          {/* TODO: apply RBAC */}
+          <Button
+            type='button'
+            color='warning'
+            href={`/expense/realization/edit/?expenseId=${initialValues?.id}`}
+            className='px-4 grow sm:grow-0'
+          >
+            <Icon icon='mdi:pencil-outline' width={24} height={24} />
+            Edit Realisasi
+          </Button>
+        </div>
+      </div>
+
+      <div className='overflow-x-auto w-full max-w-5xl mx-auto'>
+        <table className='table table-sm table-zebra'>
+          <tbody>
+            <tr>
+              <th>Tanggal Realisasi</th>
+              <th>:</th>
+              <td>
+                {initialValues?.realization_date
+                  ? formatDate(initialValues?.realization_date, 'DD MMMM YYYY')
+                  : '-'}
+              </td>
+            </tr>
+            <tr>
+              <th>Dokumen Realisasi</th>
+              <th>:</th>
+              <td>
+                <div>
+                  {!initialValues?.realization_docs ||
+                    (initialValues?.realization_docs &&
+                      initialValues?.realization_docs.length === 0 &&
+                      '-')}
+
+                  {initialValues?.realization_docs &&
+                    initialValues?.realization_docs.length > 0 && (
+                      <ul className='list-disc'>
+                        {initialValues?.realization_docs.map(
+                          (realizationDocument, realizationDocumentIdx) => (
+                            <li key={realizationDocumentIdx}>
+                              <Link
+                                href={realizationDocument.path}
+                                target='_blank'
+                                rel='noopener noreferrer'
+                                className='text-blue-500 underline'
+                              >
+                                {realizationDocument.path}{' '}
+                                <Icon
+                                  icon='cuida:open-in-new-tab-outline'
+                                  width={12}
+                                  height={12}
+                                  className='inline'
+                                />
+                              </Link>
+                            </li>
+                          )
+                        )}
+                      </ul>
+                    )}
+                </div>
+
+                <div className='flex flex-col gap-2'>
+                  <DropFileInput
+                    name='documents'
+                    values={formik.values.documents}
+                    onChange={realizationDocumentsChangeHandler}
+                    onDelete={realizationDocumentsDeleteHandler}
+                    accept={{
+                      ...ACCEPTED_FILE_TYPE.PDF,
+                      ...ACCEPTED_FILE_TYPE.IMAGE,
+                    }}
+                    maxFiles={10}
+                    className={{
+                      wrapper: 'mt-2',
+                      inputWrapper: 'flex items-center',
+                    }}
+                  />
+
+                  {formik.values.documents &&
+                    formik.values.documents.length > 0 && (
+                      <Button
+                        onClick={formik.submitForm}
+                        disabled={formik.isSubmitting}
+                        isLoading={formik.isSubmitting}
+                        className='w-fit self-end'
+                      >
+                        <Icon icon='ic:round-plus' width={24} height={24} />
+                        Tambah
+                      </Button>
+                    )}
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div className='w-full max-w-5xl mt-8 mx-auto'>
+        <div className='flex flex-row gap-4'>
+          <Card variant='bordered' size='sm' className={{ wrapper: 'grow' }}>
+            <div className='w-full flex flex-col gap-2'>
+              <h3 className='text-sm'>Nominal Pengajuan</h3>
+
+              <span className='text-xl'>
+                {formatCurrency(initialValues?.total_pengajuan as number)}
+              </span>
+
+              <span className='text-sm'>
+                Terbayar{' '}
+                {formatCurrency(initialValues?.total_realisasi as number)}
+              </span>
+            </div>
+          </Card>
+
+          <Card variant='bordered' size='sm' className={{ wrapper: 'grow' }}>
+            <div className='w-full flex flex-col gap-2'>
+              <h3 className='text-sm'>Nominal Realisasi</h3>
+
+              <span className='text-xl'>
+                {formatCurrency(initialValues?.total_realisasi as number)}
+              </span>
+
+              <span className='text-sm'>
+                Selisih{' '}
+                {formatCurrency(
+                  (initialValues?.total_realisasi as number) -
+                    (initialValues?.total_pengajuan as number)
+                )}
+              </span>
+            </div>
+          </Card>
+        </div>
+      </div>
+
+      <div className='w-full max-w-5xl mt-8 mx-auto'>
+        <h2 className='font-bold text-xl text-center'>
+          Rincian Pengajuan Biaya Operasional
+        </h2>
+
+        <div className='w-full mt-2 flex flex-col gap-4'>
+          {initialValues?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
+            let expenseGrandTotal = 0;
+
+            kandangExpense.pengajuans?.forEach(
+              (item) => (expenseGrandTotal += item.total_price)
+            );
+
+            return (
+              <div
+                key={kandangExpenseIdx}
+                className='overflow-x-auto w-full mx-auto'
+              >
+                <table className='table table-sm table-zebra'>
+                  <thead>
+                    <tr>
+                      <th
+                        colSpan={5}
+                        className='font-bold text-center text-base-content text-lg'
+                      >
+                        Biaya {kandangExpense.name}
+                      </th>
+                    </tr>
+                    <tr>
+                      <th>Nonstock</th>
+                      <th>Total Kuantitas</th>
+                      <th>Total Biaya</th>
+                      <th>Catatan</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {kandangExpense.pengajuans?.map(
+                      (pengajuanItem, pengajuanIdx) => (
+                        <tr key={pengajuanIdx}>
+                          <td>{pengajuanItem.nonstock.name}</td>
+                          <td>{pengajuanItem.qty}</td>
+                          <td>{formatCurrency(pengajuanItem.total_price)}</td>
+                          <td className='w-xs'>{pengajuanItem.note ?? '-'}</td>
+                        </tr>
+                      )
+                    )}
+                  </tbody>
+                  <tfoot>
+                    <tr className='border-y'>
+                      <th colSpan={2} className='text-right'>
+                        Total Biaya Keseluruhan:
+                      </th>
+                      <th colSpan={2}>{formatCurrency(expenseGrandTotal)}</th>
+                    </tr>
+                  </tfoot>
+                </table>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+
+      <div className='w-full max-w-5xl mt-8 mx-auto'>
+        <h2 className='font-bold text-xl text-center'>
+          Rincian Realisasi Biaya Operasional
+        </h2>
+
+        <div className='w-full mt-2 flex flex-col gap-4'>
+          {initialValues?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
+            let expenseGrandTotal = 0;
+
+            kandangExpense.realisasi?.forEach(
+              (item) => (expenseGrandTotal += item.total_price)
+            );
+
+            return (
+              <div
+                key={kandangExpenseIdx}
+                className='overflow-x-auto w-full mx-auto'
+              >
+                <table className='table table-sm table-zebra'>
+                  <thead>
+                    <tr>
+                      <th
+                        colSpan={5}
+                        className='font-bold text-center text-base-content text-lg'
+                      >
+                        Biaya {kandangExpense.name}
+                      </th>
+                    </tr>
+                    <tr>
+                      <th>Nonstock</th>
+                      <th>Total Kuantitas</th>
+                      <th>Total Biaya</th>
+                      <th>Catatan</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {kandangExpense.realisasi?.map(
+                      (realisasiItem, realisasiIdx) => (
+                        <tr key={realisasiIdx}>
+                          <td>{realisasiItem.nonstock.name}</td>
+                          <td>{realisasiItem.qty}</td>
+                          <td>{formatCurrency(realisasiItem.total_price)}</td>
+                          <td className='w-xs'>{realisasiItem.note ?? '-'}</td>
+                        </tr>
+                      )
+                    )}
+                  </tbody>
+                  <tfoot>
+                    <tr className='border-y'>
+                      <th colSpan={2} className='text-right'>
+                        Total Biaya Keseluruhan:
+                      </th>
+                      <th colSpan={2}>{formatCurrency(expenseGrandTotal)}</th>
+                    </tr>
+                  </tfoot>
+                </table>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ExpenseRealizationContent;

src/components/pages/expense/ExpenseRequestContent.tsx

@@ -0,0 +1,655 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import { useFormik } from 'formik';
+import useSWR from 'swr';
+import toast from 'react-hot-toast';
+
+import { Icon } from '@iconify/react';
+import Link from 'next/link';
+import Button from '@/components/Button';
+import RealizationStatusBadge from '@/components/pages/expense/RealizationStatusBadge';
+import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge';
+import DropFileInput from '@/components/input/DropFileInput';
+import ApprovalSteps, {
+  useApprovalSteps,
+} from '@/components/pages/ApprovalSteps';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
+import ExpensePDFPreviewButton from '@/components/pages/expense//pdf/ExpensePDFButton';
+
+import { Expense } from '@/types/api/expense';
+import { formatCurrency, formatDate } from '@/lib/helper';
+import {
+  UploadRequestDocumentsFormSchema,
+  UploadRequestDocumentsFormValues,
+} from '@/components/pages/expense/form/ExpenseRequestForm.schema';
+import { ACCEPTED_FILE_TYPE } from '@/config/constant';
+import { ExpenseApi } from '@/services/api/expense';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { EXPENSE_REQUEST_APPROVAL_LINE } from '@/config/approval-line';
+import { BaseApiResponse } from '@/types/api/api-general';
+
+interface ExpenseRequestContentProps {
+  initialValues?: Expense;
+}
+
+const ExpenseRequestContent = ({
+  initialValues,
+}: ExpenseRequestContentProps) => {
+  const router = useRouter();
+
+  const { approvals: approvalHistory, isLoading: isLoadingApprovalHistory } =
+    useApprovalSteps({
+      latestApproval: initialValues?.latest_approval,
+      approvalLines: EXPENSE_REQUEST_APPROVAL_LINE,
+      moduleName: 'EXPENSES',
+      moduleId: initialValues?.id.toString() ?? '',
+      params: {
+        page: 1,
+        limit: 100,
+      },
+    });
+
+  const isLatestApprovalRejected =
+    initialValues?.latest_approval.action === 'REJECTED';
+
+  const isLatestApprovalRejectedOrDone =
+    isLatestApprovalRejected ||
+    initialValues?.latest_approval.step_number === 5;
+
+  const isCurrentApprovalOnManager =
+    !isLatestApprovalRejected &&
+    initialValues?.latest_approval.step_number === 1;
+
+  const isCurrentApprovalOnFinance =
+    !isLatestApprovalRejected &&
+    initialValues?.latest_approval.step_number === 2;
+
+  const isCurrentApprovalOnRealization =
+    !isLatestApprovalRejected &&
+    initialValues?.latest_approval.step_number === 4;
+
+  const showEditButton =
+    initialValues?.latest_approval.step_number !== 5 &&
+    (initialValues?.latest_approval.step_number === 1 ||
+      initialValues?.latest_approval.step_number === 2 ||
+      initialValues?.latest_approval.step_number === 3);
+
+  const showRejectButton =
+    !isLatestApprovalRejected &&
+    (initialValues?.latest_approval.step_number === 1 ||
+      initialValues?.latest_approval.step_number === 2);
+
+  const isExpenseCanBeRealized =
+    !isLatestApprovalRejected &&
+    initialValues?.latest_approval.step_number === 3;
+
+  // Modal hooks
+  const deleteModal = useModal();
+  const completeModal = useModal();
+  const approveModal = useModal();
+  const rejectModal = useModal();
+
+  // Modal loading state
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [isCompleteLoading, setIsCompleteLoading] = useState(false);
+  const [isApproveLoading, setIsApproveLoading] = useState(false);
+  const [isRejectLoading, setIsRejectLoading] = useState(false);
+
+  const formik = useFormik<UploadRequestDocumentsFormValues>({
+    initialValues: {
+      documents: [],
+    },
+    validationSchema: UploadRequestDocumentsFormSchema,
+    onSubmit: async (values) => {
+      const addRequestDocumentsRes = await ExpenseApi.uploadRequestDocuments(
+        initialValues?.id as number,
+        values.documents
+      );
+
+      if (isResponseSuccess(addRequestDocumentsRes)) {
+        toast.success(addRequestDocumentsRes.message);
+        window.location.reload();
+      } else {
+        toast.error(String(addRequestDocumentsRes?.message));
+      }
+    },
+  });
+
+  const deleteExpenseClickHandler = () => {
+    deleteModal.openModal();
+  };
+
+  const completeExpenseClickHandler = () => {
+    completeModal.openModal();
+  };
+
+  const approveClickHandler = () => {
+    approveModal.openModal();
+  };
+
+  const rejectClickHandler = () => {
+    rejectModal.openModal();
+  };
+
+  // Modal confirm click handler
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    try {
+      await ExpenseApi.delete(initialValues?.id as number);
+
+      toast.success('Berhasil menghapus data biaya operasional!');
+      router.push('/expense');
+    } catch (error) {
+      toast.error('Gagal menghapus data biaya operasional!');
+    } finally {
+      deleteModal.closeModal();
+      setIsDeleteLoading(false);
+    }
+  };
+
+  const confirmationModalCompleteClickHandler = async () => {
+    setIsCompleteLoading(true);
+
+    const completeRes = await ExpenseApi.complete(initialValues?.id as number);
+
+    if (isResponseSuccess(completeRes)) {
+      toast.success(completeRes.message);
+      router.push('/expense');
+    } else {
+      toast.error(completeRes?.message as string);
+    }
+
+    completeModal.closeModal();
+    setIsCompleteLoading(false);
+  };
+
+  const confirmationModalApproveClickHandler = async (notes: string) => {
+    setIsApproveLoading(true);
+
+    let approveResponse: BaseApiResponse<Expense> | undefined = undefined;
+
+    if (isCurrentApprovalOnManager) {
+      approveResponse = await ExpenseApi.approveManager(
+        initialValues.id,
+        notes
+      );
+    }
+
+    if (isCurrentApprovalOnFinance) {
+      approveResponse = await ExpenseApi.approveFinance(
+        initialValues.id,
+        notes
+      );
+    }
+
+    if (isResponseSuccess(approveResponse)) {
+      approveModal.closeModal();
+
+      toast.success(approveResponse?.message);
+      router.push('/expense');
+    } else {
+      approveModal.closeModal();
+
+      toast.error(approveResponse?.message as string);
+    }
+
+    setIsApproveLoading(false);
+  };
+
+  const confirmationModalRejectClickHandler = async (notes: string) => {
+    setIsRejectLoading(true);
+
+    let rejectResponse: BaseApiResponse<Expense> | undefined = undefined;
+
+    if (isCurrentApprovalOnManager) {
+      rejectResponse = await ExpenseApi.rejectManager(initialValues.id, notes);
+    }
+
+    if (isCurrentApprovalOnFinance) {
+      rejectResponse = await ExpenseApi.rejectFinance(initialValues.id, notes);
+    }
+
+    if (isResponseSuccess(rejectResponse)) {
+      rejectModal.closeModal();
+
+      toast.success(rejectResponse.message);
+      router.push('/expense');
+    } else {
+      rejectModal.closeModal();
+
+      toast.error(rejectResponse?.message as string);
+    }
+
+    setIsRejectLoading(false);
+  };
+
+  const requestDocumentsChangeHandler = (val: File[]) => {
+    formik.setFieldTouched('documents', true);
+    formik.setFieldValue('documents', val);
+  };
+
+  const requestDocumentsDeleteHandler = (deletedFileIdx: number) => {
+    const newRequestDocuments = formik.values.documents;
+
+    newRequestDocuments?.splice(deletedFileIdx, 1);
+
+    formik.setFieldValue('documents', newRequestDocuments);
+  };
+
+  return (
+    <>
+      <div>
+        {initialValues && !isLoadingApprovalHistory && approvalHistory && (
+          <div className='w-full max-w-5xl my-4 mx-auto'>
+            <ApprovalSteps approvals={approvalHistory} />
+          </div>
+        )}
+
+        <div className='w-full mt-4 flex flex-col gap-4'>
+          {/* TODO: apply RBAC */}
+
+          <div className='w-full max-w-5xl mx-auto flex flex-col sm:flex-row justify-end gap-2'>
+            {isCurrentApprovalOnManager && (
+              <Button
+                variant='outline'
+                color='info'
+                onClick={approveClickHandler}
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='lucide-lab:farm' width={24} height={24} />
+                Approve Manager
+              </Button>
+            )}
+
+            {isCurrentApprovalOnFinance && (
+              <Button
+                variant='outline'
+                color='success'
+                onClick={approveClickHandler}
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='tdesign:money' width={24} height={24} />
+                Approve Finance
+              </Button>
+            )}
+
+            {isCurrentApprovalOnRealization && (
+              <Button
+                variant='outline'
+                color='success'
+                onClick={completeExpenseClickHandler}
+                className='w-full sm:w-fit'
+              >
+                <Icon
+                  icon='material-symbols:done-all-rounded'
+                  width={24}
+                  height={24}
+                />
+                Selesai
+              </Button>
+            )}
+
+            {showRejectButton && (
+              <Button
+                variant='outline'
+                color='error'
+                onClick={rejectClickHandler}
+                className='w-full:w-fit'
+              >
+                <Icon icon='material-symbols:close' width={24} height={24} />
+                Reject
+              </Button>
+            )}
+
+            {isExpenseCanBeRealized && (
+              <Button
+                variant='outline'
+                color='info'
+                href={`/expense/realization/?expenseId=${initialValues?.id}`}
+                className='w-full sm:w-fit'
+              >
+                <Icon
+                  icon='material-symbols:money-bag-rounded'
+                  width={24}
+                  height={24}
+                />
+                Realisasi
+              </Button>
+            )}
+
+            <div className='w-full sm:w-fit sm:ml-2 flex flex-row gap-2 items-center'>
+              {showEditButton && (
+                <Button
+                  type='button'
+                  color='warning'
+                  href={`/expense/detail/edit/?expenseId=${initialValues?.id}`}
+                  className='px-4 grow sm:grow-0'
+                >
+                  <Icon icon='mdi:pencil-outline' width={24} height={24} />
+                  Edit
+                </Button>
+              )}
+
+              <Button
+                type='button'
+                color='error'
+                onClick={deleteExpenseClickHandler}
+                className='px-4 grow sm:grow-0'
+              >
+                <Icon
+                  icon='material-symbols:delete-outline-rounded'
+                  width={24}
+                  height={24}
+                  className='justify-start text-sm'
+                />
+                Delete
+              </Button>
+            </div>
+          </div>
+
+          <div className='overflow-x-auto w-full max-w-5xl mx-auto'>
+            <table className='table table-sm table-zebra'>
+              <tbody>
+                <tr>
+                  <th>Nomor PO</th>
+                  <th>:</th>
+                  <td>
+                    {!initialValues?.po_number && '-'}
+                    {initialValues?.po_number && (
+                      <ExpensePDFPreviewButton expense={initialValues} />
+                    )}
+                  </td>
+                </tr>
+                <tr>
+                  <th>Nomor Referensi</th>
+                  <th>:</th>
+                  <td>{initialValues?.reference_number}</td>
+                </tr>
+                <tr>
+                  <th>Kategori</th>
+                  <th>:</th>
+                  <td>
+                    {initialValues?.category === 'BOP'
+                      ? 'Biaya Operasional'
+                      : 'Non Biaya Operasional'}
+                  </td>
+                </tr>
+                <tr>
+                  <th>Lokasi</th>
+                  <th>:</th>
+                  <td>{initialValues?.location.name}</td>
+                </tr>
+                <tr>
+                  <th>Kandang</th>
+                  <th>:</th>
+                  <td>
+                    {initialValues?.kandangs
+                      .map((item) => item.name)
+                      .join(', ')}
+                  </td>
+                </tr>
+                <tr>
+                  <th>Vendor</th>
+                  <th>:</th>
+                  <td>{initialValues?.supplier.name}</td>
+                </tr>
+                <tr>
+                  <th>Tanggal Transaksi</th>
+                  <th>:</th>
+                  <td>
+                    {formatDate(initialValues?.expense_date, 'DD MMMM YYYY')}
+                  </td>
+                </tr>
+                <tr>
+                  <th>Tanggal Realisasi</th>
+                  <th>:</th>
+                  <td>
+                    {initialValues?.realization_date
+                      ? formatDate(
+                          initialValues?.realization_date,
+                          'DD MMMM YYYY'
+                        )
+                      : '-'}
+                  </td>
+                </tr>
+                <tr>
+                  <th>Nama Pengaju</th>
+                  <th>:</th>
+                  <td>{initialValues?.created_user.name}</td>
+                </tr>
+                <tr>
+                  <th>Nominal Biaya</th>
+                  <th>:</th>
+                  <td>{formatCurrency(initialValues?.grand_total ?? 0)}</td>
+                </tr>
+                <tr>
+                  <th>Status Pencairan</th>
+                  <th>:</th>
+                  <td>
+                    <RealizationStatusBadge
+                      approval={initialValues?.latest_approval}
+                    />
+                  </td>
+                </tr>
+                <tr>
+                  <th>Status Biaya</th>
+                  <th>:</th>
+                  <td>
+                    <ExpenseStatusBadge
+                      approval={initialValues?.latest_approval}
+                    />
+                  </td>
+                </tr>
+                <tr>
+                  <th>Dokumen Pengajuan</th>
+                  <th>:</th>
+                  <td>
+                    <div>
+                      {!initialValues?.documents ||
+                        (initialValues?.documents &&
+                          initialValues?.documents.length === 0 &&
+                          '-')}
+
+                      {initialValues?.documents &&
+                        initialValues?.documents.length > 0 && (
+                          <ul className='list-disc'>
+                            {initialValues?.documents.map(
+                              (requestDocument, requestDocumentIdx) => (
+                                <li key={requestDocumentIdx}>
+                                  <Link
+                                    href={requestDocument.path}
+                                    target='_blank'
+                                    rel='noopener noreferrer'
+                                    className='text-blue-500 underline'
+                                  >
+                                    {requestDocument.path}{' '}
+                                    <Icon
+                                      icon='cuida:open-in-new-tab-outline'
+                                      width={12}
+                                      height={12}
+                                      className='inline'
+                                    />
+                                  </Link>
+                                </li>
+                              )
+                            )}
+                          </ul>
+                        )}
+                    </div>
+
+                    <div className='flex flex-col gap-2'>
+                      <DropFileInput
+                        name='documents'
+                        values={formik.values.documents}
+                        onChange={requestDocumentsChangeHandler}
+                        onDelete={requestDocumentsDeleteHandler}
+                        accept={{
+                          ...ACCEPTED_FILE_TYPE.PDF,
+                          ...ACCEPTED_FILE_TYPE.IMAGE,
+                        }}
+                        maxFiles={10}
+                        className={{
+                          wrapper: 'mt-2',
+                          inputWrapper: 'flex items-center',
+                        }}
+                      />
+
+                      {formik.values.documents &&
+                        formik.values.documents.length > 0 && (
+                          <Button
+                            onClick={formik.submitForm}
+                            disabled={formik.isSubmitting}
+                            isLoading={formik.isSubmitting}
+                            className='w-fit self-end'
+                          >
+                            <Icon icon='ic:round-plus' width={24} height={24} />
+                            Tambah
+                          </Button>
+                        )}
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div className='w-full max-w-5xl mt-8 mx-auto'>
+          <h2 className='font-bold text-xl text-center'>
+            Rincian Pengajuan Biaya Operasional
+          </h2>
+
+          <div className='w-full mt-2 flex flex-col gap-4'>
+            {initialValues?.kandangs.map(
+              (kandangExpense, kandangExpenseIdx) => {
+                let expenseGrandTotal = 0;
+
+                kandangExpense.pengajuans?.forEach(
+                  (item) => (expenseGrandTotal += item.total_price)
+                );
+
+                return (
+                  <div
+                    key={kandangExpenseIdx}
+                    className='overflow-x-auto w-full mx-auto'
+                  >
+                    <table className='table table-sm table-zebra'>
+                      <thead>
+                        <tr>
+                          <th
+                            colSpan={5}
+                            className='font-bold text-center text-base-content text-lg'
+                          >
+                            Biaya {kandangExpense.name}
+                          </th>
+                        </tr>
+                        <tr>
+                          <th>Nonstock</th>
+                          <th>Total Kuantitas</th>
+                          <th>Total Biaya</th>
+                          <th>Catatan</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        {kandangExpense.pengajuans?.map(
+                          (pengajuanItem, pengajuanIdx) => (
+                            <tr key={pengajuanIdx}>
+                              <td>{pengajuanItem.nonstock.name}</td>
+                              <td>{pengajuanItem.qty}</td>
+                              <td>
+                                {formatCurrency(pengajuanItem.total_price)}
+                              </td>
+                              <td className='w-xs'>
+                                {pengajuanItem.note ?? '-'}
+                              </td>
+                            </tr>
+                          )
+                        )}
+                      </tbody>
+                      <tfoot>
+                        <tr className='border-y'>
+                          <th colSpan={2} className='text-right'>
+                            Total Biaya Keseluruhan:
+                          </th>
+                          <th colSpan={2}>
+                            {formatCurrency(expenseGrandTotal)}
+                          </th>
+                        </tr>
+                      </tfoot>
+                    </table>
+                  </div>
+                );
+              }
+            )}
+          </div>
+        </div>
+      </div>
+
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text='Apakah anda yakin ingin menghapus data biaya operasional ini?'
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isDeleteLoading,
+          onClick: confirmationModalDeleteClickHandler,
+        }}
+      />
+
+      <ConfirmationModal
+        ref={completeModal.ref}
+        type='success'
+        text='Apakah anda yakin ingin menyelesaikan biaya operasional ini?'
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'success',
+          isLoading: isCompleteLoading,
+          onClick: confirmationModalCompleteClickHandler,
+        }}
+      />
+
+      <ConfirmationModalWithNotes
+        ref={approveModal.ref}
+        type='success'
+        text='Apakah anda yakin ingin approve data biaya operasional ini?'
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'success',
+          isLoading: isApproveLoading,
+          onClick: confirmationModalApproveClickHandler,
+        }}
+      />
+
+      <ConfirmationModalWithNotes
+        ref={rejectModal.ref}
+        type='error'
+        text='Apakah anda yakin ingin reject data biaya operasional ini?'
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isRejectLoading,
+          onClick: confirmationModalRejectClickHandler,
+        }}
+      />
+    </>
+  );
+};
+
+export default ExpenseRequestContent;

src/components/pages/expense/ExpensesTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { ChangeEventHandler, useEffect, useState } from 'react';
+import { ChangeEventHandler, useEffect, useMemo, useState } from 'react';
 import useSWR from 'swr';
 import {
   CellContext,
@@ -31,13 +31,14 @@ import DateInput from '@/components/input/DateInput';
 
 import { Expense } from '@/types/api/expense';
 import { ExpenseApi } from '@/services/api/expense';
-import { cn, formatCurrency } from '@/lib/helper';
+import { cn, formatCurrency, formatDate } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { ROWS_OPTIONS } from '@/config/constant';
 import { LocationApi, SupplierApi } from '@/services/api/master-data';
 import { Location } from '@/types/api/master-data/location';
 import { Supplier } from '@/types/api/master-data/supplier';
+import { BaseApiResponse } from '@/types/api/api-general';
 
 const RowOptionsMenu = ({
   type = 'dropdown',
@@ -53,66 +54,57 @@ const RowOptionsMenu = ({
   deleteClickHandler: () => void;
 }) => {
   const showEditButton =
-    props.row.original.approval.action !== 'REJECTED' &&
-    props.row.original.approval.step_number !== 5 &&
-    props.row.original.approval.action !== 'APPROVED';
-
-  const showDeleteButton = showEditButton;
+    props.row.original.latest_approval.step_number !== 5 &&
+    (props.row.original.latest_approval.step_number === 1 ||
+      props.row.original.latest_approval.step_number === 2 ||
+      props.row.original.latest_approval.step_number === 3);
 
   // TODO: apply RBAC
-  const showApproveButton = showEditButton;
-  const showRejectButton = showEditButton;
+  const showRealizationButton =
+    props.row.original.latest_approval.action !== 'REJECTED' &&
+    props.row.original.latest_approval.step_number === 3;
 
   return (
     <RowOptionsMenuWrapper type={type}>
-      <Button
-        href={`/expense/detail/?expenseId=${props.row.original.id}`}
-        variant='ghost'
-        color='primary'
-        className='justify-start text-sm'
-      >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
-        Detail
-      </Button>
-
-      {showEditButton && (
+      <div className='w-full max-h-40 overflow-auto flex flex-col gap-1'>
         <Button
-          href={`/expense/detail/edit/?expenseId=${props.row.original.id}`}
+          href={`/expense/detail/?expenseId=${props.row.original.id}`}
           variant='ghost'
-          color='warning'
+          color='primary'
           className='justify-start text-sm'
         >
-          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
-          Edit
+          <Icon icon='mdi:eye-outline' width={16} height={16} />
+          Detail
         </Button>
-      )}
 
-      {/* TODO: apply RBAC */}
-      {showApproveButton && (
-        <Button
-          variant='ghost'
-          color='success'
-          onClick={approveClickHandler}
-          className='justify-start text-sm'
-        >
-          <Icon icon='material-symbols:check' width={24} height={24} />
-          Approve
-        </Button>
-      )}
+        {showEditButton && (
+          <Button
+            href={`/expense/detail/edit/?expenseId=${props.row.original.id}`}
+            variant='ghost'
+            color='warning'
+            className='justify-start text-sm'
+          >
+            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+            Edit
+          </Button>
+        )}
 
-      {showRejectButton && (
-        <Button
-          variant='ghost'
-          color='error'
-          onClick={rejectClickHandler}
-          className='justify-start text-sm'
-        >
-          <Icon icon='material-symbols:close' width={24} height={24} />
-          Reject
-        </Button>
-      )}
+        {showRealizationButton && (
+          <Button
+            href={`/expense/realization/?expenseId=${props.row.original.id}`}
+            variant='ghost'
+            color='info'
+            className='justify-start text-sm text-info focus-visible:text-info-content hover:text-info-content'
+          >
+            <Icon
+              icon='material-symbols:money-bag-rounded'
+              width={16}
+              height={16}
+            />
+            Realisasi
+          </Button>
+        )}
 
-      {showDeleteButton && (
         <Button
           onClick={deleteClickHandler}
           variant='ghost'
@@ -127,7 +119,7 @@ const RowOptionsMenu = ({
           />
           Delete
         </Button>
-      )}
+      </div>
     </RowOptionsMenuWrapper>
   );
 };
@@ -178,6 +170,7 @@ const ExpensesTable = () => {
     undefined
   );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [isCompleteLoading, setIsCompleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
   const [isRejectLoading, setIsRejectLoading] = useState(false);
 
@@ -187,6 +180,57 @@ const ExpensesTable = () => {
     parseInt(item)
   );
 
+  const isAllSelectedRowLatestApprovalOnManager = useMemo(() => {
+    return selectedRowIds.every((rowId) => {
+      if (!isResponseSuccess(expenses)) return false;
+
+      const expenseItem = expenses.data.find((item) => item.id === rowId);
+
+      const isLatestApprovalRejected =
+        expenseItem?.latest_approval.action === 'REJECTED';
+
+      const isCurrentApprovalOnManager =
+        !isLatestApprovalRejected &&
+        expenseItem?.latest_approval.step_number === 1;
+
+      return isCurrentApprovalOnManager;
+    });
+  }, [expenses, selectedRowIds]);
+
+  const isAllSelectedRowLatestApprovalOnFinance = useMemo(() => {
+    return selectedRowIds.every((rowId) => {
+      if (!isResponseSuccess(expenses)) return false;
+
+      const expenseItem = expenses.data.find((item) => item.id === rowId);
+
+      const isLatestApprovalRejected =
+        expenseItem?.latest_approval.action === 'REJECTED';
+
+      const isCurrentApprovalOnFinance =
+        !isLatestApprovalRejected &&
+        expenseItem?.latest_approval.step_number === 2;
+
+      return isCurrentApprovalOnFinance;
+    });
+  }, [expenses, selectedRowIds]);
+
+  const isAllSelectedRowLatestApprovalOnRealization = useMemo(() => {
+    return selectedRowIds.every((rowId) => {
+      if (!isResponseSuccess(expenses)) return false;
+
+      const expenseItem = expenses.data.find((item) => item.id === rowId);
+
+      const isLatestApprovalRejected =
+        expenseItem?.latest_approval.action === 'REJECTED';
+
+      const isCurrentApprovalOnRealization =
+        !isLatestApprovalRejected &&
+        expenseItem?.latest_approval.step_number === 4;
+
+      return isCurrentApprovalOnRealization;
+    });
+  }, [expenses, selectedRowIds]);
+
   const expensesColumns: ColumnDef<Expense>[] = [
     {
       id: 'select',
@@ -202,7 +246,8 @@ const ExpensesTable = () => {
       ),
       cell: ({ row }) => {
         const isCheckboxDisabled =
-          !row.getCanSelect() || row.original.approval.action === 'REJECTED';
+          !row.getCanSelect() ||
+          row.original.latest_approval.action === 'REJECTED';
 
         return (
           <div>
@@ -218,61 +263,52 @@ const ExpensesTable = () => {
       },
     },
     {
-      accessorKey: 'transaction_date',
+      accessorKey: 'expense_date',
       header: 'Tanggal Pengajuan',
+      cell: (props) =>
+        props.row.original.expense_date
+          ? formatDate(props.row.original.expense_date, 'DD MMM YYYY')
+          : '-',
     },
     {
       accessorKey: 'realization_date',
       header: 'Tanggal Realisasi',
-      cell: (props) => props.getValue() ?? '-',
+      cell: (props) =>
+        props.row.original.realization_date
+          ? formatDate(props.row.original.realization_date, 'DD MMM YYYY')
+          : '-',
     },
     {
       accessorKey: 'location',
       header: 'Lokasi',
-      cell: (props) => props.row.original.location.name ?? '-',
+      cell: (props) => props.row.original.location?.name ?? '-',
     },
     {
       accessorFn: (row) => row.created_user.name ?? '-',
       header: 'Nama Pengaju',
     },
     {
-      accessorFn: (row) => row.vendor.name ?? '-',
+      accessorFn: (row) => row.supplier.name ?? '-',
       header: 'Vendor',
     },
     {
-      accessorKey: 'nominal',
+      accessorKey: 'grand_total',
       header: 'Nominal',
       cell: (props) =>
-        props.row.original.nominal
-          ? `Rp${formatCurrency(props.row.original.nominal)}`
-          : '-',
-    },
-    {
-      accessorKey: 'paid',
-      header: 'Sudah Bayar',
-      cell: (props) =>
-        props.row.original.paid
-          ? `Rp${formatCurrency(props.row.original.paid)}`
-          : '-',
-    },
-    {
-      accessorKey: 'remaining_cost',
-      header: 'Sisa Bayar',
-      cell: (props) =>
-        props.row.original.remaining_cost
-          ? `Rp${formatCurrency(props.row.original.remaining_cost)}`
+        props.row.original.grand_total
+          ? formatCurrency(props.row.original.grand_total)
           : '-',
     },
     {
       header: 'Status Pencairan',
       cell: (props) => (
-        <RealizationStatusBadge approval={props.row.original.approval} />
+        <RealizationStatusBadge approval={props.row.original.latest_approval} />
       ),
     },
     {
       header: 'Status BOP',
       cell: (props) => (
-        <ExpenseStatusBadge approval={props.row.original.approval} />
+        <ExpenseStatusBadge approval={props.row.original.latest_approval} />
       ),
     },
     {
@@ -283,7 +319,7 @@ const ExpensesTable = () => {
         const currentRowRelativeIndex =
           currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
 
-        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 3;
 
         const approveClickHandler = () => {
           setSelectedExpense(props.row.original);
@@ -314,7 +350,7 @@ const ExpensesTable = () => {
 
         return (
           <>
-            {currentPageSize > 2 && (
+            {currentPageSize > 3 && (
               <RowDropdownOptions isLast2Rows={isLast2Rows}>
                 <RowOptionsMenu
                   type='dropdown'
@@ -326,10 +362,10 @@ const ExpensesTable = () => {
               </RowDropdownOptions>
             )}
 
-            {currentPageSize <= 2 && (
+            {currentPageSize <= 3 && (
               <RowCollapseOptions>
                 <RowOptionsMenu
-                  type='dropdown'
+                  type='collapse'
                   props={props}
                   approveClickHandler={approveClickHandler}
                   rejectClickHandler={rejectClickHandler}
@@ -346,9 +382,20 @@ const ExpensesTable = () => {
   const tableEnableRowSelectionHandler: (row: Row<Expense>) => boolean = (
     row
   ) => {
-    return row.original.approval.action !== 'REJECTED';
+    return (
+      row.original.latest_approval.action !== 'REJECTED' &&
+      row.original.latest_approval.step_number !== 5
+    );
   };
 
+  // const bulkApproveClickHandler = () => {
+  //   approveModal.openModal();
+  // };
+
+  // const bulkRejectClickHandler = () => {
+  //   rejectModal.openModal();
+  // };
+
   const bulkApproveClickHandler = () => {
     approveModal.openModal();
   };
@@ -371,17 +418,26 @@ const ExpensesTable = () => {
   const confirmationModalApproveClickHandler = async (notes: string) => {
     setIsApproveLoading(true);
 
-    const bulkApproveResponse = await ExpenseApi.bulkApprove(
-      selectedRowIds,
-      notes
-    );
+    let bulkApproveResponse: BaseApiResponse<Expense> | undefined = undefined;
+
+    if (isAllSelectedRowLatestApprovalOnManager) {
+      bulkApproveResponse = await ExpenseApi.bulkApproveManager(
+        selectedRowIds,
+        notes
+      );
+    } else if (isAllSelectedRowLatestApprovalOnFinance) {
+      bulkApproveResponse = await ExpenseApi.bulkApproveFinance(
+        selectedRowIds,
+        notes
+      );
+    }
 
     if (isResponseSuccess(bulkApproveResponse)) {
       refreshExpenses();
       approveModal.closeModal();
 
       toast.success(
-        `Berhasil approve ${selectedRowIds.length} data transfer ke laying!`
+        `Berhasil approve ${selectedRowIds.length} data biaya operasional!`
       );
 
       setRowSelection({});
@@ -389,7 +445,7 @@ const ExpensesTable = () => {
       approveModal.closeModal();
 
       toast.error(
-        `Gagal approve ${selectedRowIds.length} data transfer ke laying!`
+        `Gagal approve ${selectedRowIds.length} data biaya operasional!`
       );
     }
 
@@ -399,24 +455,33 @@ const ExpensesTable = () => {
   const confirmationModalRejectClickHandler = async (notes: string) => {
     setIsRejectLoading(true);
 
-    const bulkRejectResponse = await ExpenseApi.bulkReject(
-      selectedRowIds,
-      notes
-    );
+    let bulkRejectResponse: BaseApiResponse<Expense> | undefined = undefined;
+
+    if (isAllSelectedRowLatestApprovalOnManager) {
+      bulkRejectResponse = await ExpenseApi.bulkRejectManager(
+        selectedRowIds,
+        notes
+      );
+    } else if (isAllSelectedRowLatestApprovalOnFinance) {
+      bulkRejectResponse = await ExpenseApi.bulkRejectFinance(
+        selectedRowIds,
+        notes
+      );
+    }
 
     if (isResponseSuccess(bulkRejectResponse)) {
       refreshExpenses();
       rejectModal.closeModal();
 
       toast.success(
-        `Berhasil reject ${selectedRowIds.length} data transfer ke laying!`
+        `Berhasil reject ${selectedRowIds.length} data biaya operasional!`
       );
       setRowSelection({});
     } else {
       rejectModal.closeModal();
 
       toast.error(
-        `Gagal reject ${selectedRowIds.length} data transfer ke laying!`
+        `Gagal reject ${selectedRowIds.length} data biaya operasional!`
       );
     }
 
@@ -506,27 +571,36 @@ const ExpensesTable = () => {
 
                 {selectedRowIds.length > 0 && (
                   <>
-                    {/* TODO: apply RBAC */}
+                    <Button
+                      variant='outline'
+                      color='info'
+                      onClick={bulkApproveClickHandler}
+                      disabled={!isAllSelectedRowLatestApprovalOnManager}
+                      className='w-full sm:w-fit'
+                    >
+                      <Icon icon='lucide-lab:farm' width={24} height={24} />
+                      Approve Manager
+                    </Button>
+
                     <Button
                       variant='outline'
                       color='success'
                       onClick={bulkApproveClickHandler}
-                      disabled={selectedRowIds.length === 0}
+                      disabled={!isAllSelectedRowLatestApprovalOnFinance}
                       className='w-full sm:w-fit'
                     >
-                      <Icon
-                        icon='material-symbols:check'
-                        width={24}
-                        height={24}
-                      />
-                      Approve
+                      <Icon icon='tdesign:money' width={24} height={24} />
+                      Approve Finance
                     </Button>
 
                     <Button
                       variant='outline'
                       color='error'
                       onClick={bulkRejectClickHandler}
-                      disabled={selectedRowIds.length === 0}
+                      disabled={
+                        !isAllSelectedRowLatestApprovalOnManager &&
+                        !isAllSelectedRowLatestApprovalOnFinance
+                      }
                       className='w-full sm:w-fit'
                     >
                       <Icon
@@ -666,7 +740,7 @@ const ExpensesTable = () => {
       <ConfirmationModalWithNotes
         ref={approveModal.ref}
         type='success'
-        text={`Apakah anda yakin ingin approve data biaya operasional ini (${selectedRowIds.length} data)?`}
+        text='Apakah anda yakin ingin approve data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
         }}
@@ -681,7 +755,7 @@ const ExpensesTable = () => {
       <ConfirmationModalWithNotes
         ref={rejectModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin reject data biaya operasional ini (${selectedRowIds.length} data)?`}
+        text='Apakah anda yakin ingin reject data biaya operasional ini?'
         secondaryButton={{
           text: 'Tidak',
         }}

src/components/pages/expense/form/ExpenseRealizationForm.schema.ts

@@ -0,0 +1,181 @@
+import * as Yup from 'yup';
+import { Expense } from '@/types/api/expense';
+import { formatDate } from '@/lib/helper';
+
+type ExpenseRealizationFormSchemaType = {
+  category?: {
+    value: 'BOP' | 'NON-BOP';
+    label: 'BOP' | 'NON-BOP';
+  };
+  location?: {
+    value: number;
+    label: string;
+  };
+  realization_date?: string;
+  kandangs?: { id: number; name: string }[];
+  supplier?: {
+    value: number;
+    label: string;
+  };
+  existing_documents?: { name: string; url: string }[];
+  documents?: File[];
+  realizations: {
+    kandang_id: number;
+    cost_items: {
+      nonstock?: {
+        value: number;
+        label: string;
+      };
+      quantity?: number;
+      total_cost?: number;
+      notes?: string;
+    }[];
+  }[];
+};
+
+export const ExpenseRealizationFormSchema: Yup.ObjectSchema<ExpenseRealizationFormSchemaType> =
+  Yup.object({
+    category: Yup.object({
+      value: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
+      label: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
+    }).required('Kategori wajib diisi!'),
+
+    location: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).required('Lokasi wajib diisi!'),
+
+    realization_date: Yup.string().required('Tanggal transaksi wajib diisi!'),
+    kandangs: Yup.array()
+      .of(
+        Yup.object({
+          id: Yup.number().required('Kandang wajib dipilih!'),
+          name: Yup.string().required('Kandang wajib dipilih!'),
+        })
+      )
+      .min(1, 'Kandang wajib dipilih!')
+      .required('Kandang wajib dipilih!'),
+
+    supplier: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).required('Vendor wajib diisi!'),
+
+    existing_documents: Yup.array().of(
+      Yup.object({
+        name: Yup.string().required(),
+        url: Yup.string().required(),
+      })
+    ),
+
+    documents: Yup.array().of(Yup.mixed<File>().required()).optional(),
+
+    realizations: Yup.array()
+      .of(
+        Yup.object({
+          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').required(),
+          cost_items: Yup.array()
+            .of(
+              Yup.object({
+                nonstock: Yup.object({
+                  value: Yup.number().min(1).required(),
+                  label: Yup.string().required(),
+                }).required('Nonstock wajib diisi!'),
+                quantity: Yup.number().required('Total kuantitas wajib diisi!'),
+                total_cost: Yup.number().required('Total biaya wajib diisi!'),
+                notes: Yup.string(),
+              })
+            )
+            .min(1, 'Kandang harus memiliki setidaknya 1 biaya!')
+            .required('Biaya kandang wajib diisi!'),
+        })
+      )
+      .min(1, 'Biaya kandang wajib diisi!')
+      .required('Biaya kandang wajib diisi!'),
+  });
+
+export const UpdateExpenseRealizationFormSchema = ExpenseRealizationFormSchema;
+
+export const UploadRealizationDocumentsFormSchema = Yup.object({
+  realization_documents: Yup.array()
+    .of(Yup.mixed<File>().required())
+    .required(),
+});
+
+export type ExpenseRealizationFormValues = Yup.InferType<
+  typeof ExpenseRealizationFormSchema
+>;
+
+export type UploadRealizationDocumentsFormValues = Yup.InferType<
+  typeof UploadRealizationDocumentsFormSchema
+>;
+
+export const getExpenseRealizationFormInitialValues = (
+  initialValues?: Expense
+): ExpenseRealizationFormValues => {
+  return {
+    category: initialValues?.category
+      ? {
+          value: initialValues.category,
+          label: initialValues.category,
+        }
+      : undefined,
+    location: initialValues?.location
+      ? {
+          value: initialValues.location.id,
+          label: initialValues.location.name,
+        }
+      : undefined,
+    realization_date: initialValues?.realization_date
+      ? formatDate(initialValues?.realization_date, 'YYYY-MM-DD')
+      : undefined,
+    kandangs: initialValues?.kandangs.map((kandang) => ({
+      id: kandang.kandang_id,
+      name: kandang.name,
+    })),
+    supplier: initialValues?.supplier
+      ? {
+          value: initialValues.supplier.id,
+          label: initialValues.supplier.name,
+        }
+      : undefined,
+    existing_documents: initialValues?.realization_docs?.map((doc) => ({
+      name: doc.path,
+      url: doc.path,
+    })),
+    documents: [],
+    realizations: initialValues?.kandangs
+      ? initialValues.kandangs.map((kandangExpense) => {
+          const costItemsInitialValue = kandangExpense.realisasi
+            ? kandangExpense.realisasi.map((realisasiItem, realisasiIdx) => {
+                return {
+                  nonstock: {
+                    value: kandangExpense.pengajuans?.[realisasiIdx]
+                      .id as number,
+                    label: realisasiItem.nonstock.name,
+                  },
+                  quantity: realisasiItem.qty,
+                  total_cost: realisasiItem.total_price,
+                  notes: realisasiItem.note,
+                };
+              })
+            : kandangExpense.pengajuans
+              ? kandangExpense.pengajuans.map((expenseItem) => ({
+                  nonstock: {
+                    value: expenseItem.id,
+                    label: expenseItem.nonstock.name,
+                  },
+                  quantity: expenseItem.qty,
+                  total_cost: expenseItem.total_price,
+                  notes: expenseItem.note,
+                }))
+              : [];
+
+          return {
+            kandang_id: kandangExpense.kandang_id,
+            cost_items: costItemsInitialValue,
+          };
+        })
+      : [],
+  };
+};

src/components/pages/expense/form/ExpenseRealizationForm.tsx

@@ -0,0 +1,410 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import { useFormik } from 'formik';
+import toast from 'react-hot-toast';
+
+import Link from 'next/link';
+import { Icon } from '@iconify/react';
+import Button from '@/components/Button';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import DateInput from '@/components/input/DateInput';
+import DropFileInput from '@/components/input/DropFileInput';
+import ExpenseKandangsTable from '@/components/pages/expense/form/ExpenseKandangsTable';
+import ExpenseRealizationKandangDetailExpense from '@/components/pages/expense/form/ExpenseRealizationKandangDetailExpense';
+
+import {
+  CreateExpenseRealizationPayload,
+  Expense,
+  UpdateExpenseRealizationPayload,
+} from '@/types/api/expense';
+import {
+  ExpenseRealizationFormSchema,
+  ExpenseRealizationFormValues,
+  getExpenseRealizationFormInitialValues,
+  UpdateExpenseRealizationFormSchema,
+} from '@/components/pages/expense/form/ExpenseRealizationForm.schema';
+import { ExpenseApi } from '@/services/api/expense';
+import { isResponseError } from '@/lib/api-helper';
+import { LocationApi, SupplierApi } from '@/services/api/master-data';
+import { Supplier } from '@/types/api/master-data/supplier';
+import { ACCEPTED_FILE_TYPE } from '@/config/constant';
+import { cn } from '@/lib/helper';
+
+interface ExpenseRealizationFormProps {
+  type?: 'add' | 'edit' | 'detail';
+  initialValues?: Expense;
+}
+
+const ExpenseRealizationForm = ({
+  type = 'add',
+  initialValues,
+}: ExpenseRealizationFormProps) => {
+  const router = useRouter();
+
+  const [expenseFormErrorMessage, setExpenseFormErrorMessage] = useState('');
+
+  const createExpenseHandler = useCallback(
+    async (payload: CreateExpenseRealizationPayload) => {
+      const createExpenseRes = await ExpenseApi.createRealization(
+        initialValues?.id as number,
+        ExpenseApi.convertExpenseRealizationPayloadToFormData(payload)
+      );
+
+      if (isResponseError(createExpenseRes)) {
+        setExpenseFormErrorMessage(createExpenseRes.message);
+        return;
+      }
+
+      toast.success(createExpenseRes?.message as string);
+      router.push('/expense');
+    },
+    [router]
+  );
+
+  const updateExpenseHandler = useCallback(
+    async (expenseId: number, payload: UpdateExpenseRealizationPayload) => {
+      const updateExpenseRes = await ExpenseApi.updateRealization(
+        expenseId,
+        ExpenseApi.convertExpenseRealizationPayloadToFormData(payload)
+      );
+
+      if (updateExpenseRes?.status === 'error') {
+        setExpenseFormErrorMessage(updateExpenseRes.message);
+        return;
+      }
+
+      toast.success(updateExpenseRes?.message as string);
+      router.refresh();
+      router.push('/expense');
+    },
+    [router]
+  );
+
+  const formik = useFormik<ExpenseRealizationFormValues>({
+    initialValues: getExpenseRealizationFormInitialValues(initialValues),
+    validationSchema:
+      type === 'edit'
+        ? UpdateExpenseRealizationFormSchema
+        : ExpenseRealizationFormSchema,
+    onSubmit: async (values) => {
+      setExpenseFormErrorMessage('');
+
+      const realizations: CreateExpenseRealizationPayload['realizations'] = [];
+
+      values.realizations.forEach((realization) => {
+        realization.cost_items.forEach((costItem) => {
+          const unitPrice =
+            parseFloat(String(costItem.total_cost)) /
+            parseFloat(String(costItem.quantity));
+
+          const realizationItem = {
+            expense_nonstock_id: costItem.nonstock?.value as number,
+            qty: parseFloat(String(costItem.quantity)) as number,
+            unit_price: unitPrice,
+            total_price: parseFloat(String(costItem.total_cost)) as number,
+            notes: costItem.notes ?? '',
+          };
+
+          realizations.push(realizationItem);
+        });
+      });
+
+      const expensePayload: CreateExpenseRealizationPayload = {
+        realization_date: values.realization_date as string,
+        documents: values.documents as File[],
+        realizations,
+      };
+
+      switch (type) {
+        case 'add':
+          await createExpenseHandler(expensePayload);
+          break;
+
+        case 'edit':
+          await updateExpenseHandler(
+            initialValues?.id as number,
+            expensePayload
+          );
+          break;
+      }
+    },
+  });
+
+  const { setValues: formikSetValues } = formik;
+
+  const {
+    setInputValue: setLocationInputValue,
+    options: locationOptions,
+    isLoadingOptions: isLoadingLocationOptions,
+  } = useSelect<Location>(LocationApi.basePath, 'id', 'name');
+
+  const {
+    setInputValue: setVendorInputValue,
+    options: vendorOptions,
+    isLoadingOptions: isLoadingVendorOptions,
+  } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
+
+  const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
+    formik.setFieldTouched('location', true);
+    formik.setFieldValue('location', val);
+
+    formik.setFieldValue('kandangs', []);
+    formik.setFieldValue('realizations', []);
+  };
+
+  const kandangsChangeHandler = (kandangs: { id: number; name: string }[]) => {
+    formik.setFieldTouched('kandangs', true);
+    formik.setFieldValue('kandangs', kandangs);
+
+    const newRealizations = [...(formik.values.realizations ?? [])];
+
+    // add new realizations
+    kandangs.forEach((kandangItem) => {
+      const isKandangExistInRealization = newRealizations.find(
+        (realizationItem) => realizationItem.kandang_id === kandangItem.id
+      );
+
+      if (isKandangExistInRealization) return;
+
+      newRealizations.push({
+        kandang_id: kandangItem.id,
+        cost_items: [
+          {
+            nonstock: undefined,
+            quantity: undefined,
+            total_cost: undefined,
+            notes: '',
+          },
+        ],
+      });
+    });
+
+    // prune realizations
+    const kandangIds = new Set(kandangs.map((kandang) => kandang.id));
+    const deletedRealizationsIdx: number[] = [];
+
+    newRealizations.forEach((realization, idx) => {
+      const isRealizationValid = kandangIds.has(realization.kandang_id);
+
+      if (!isRealizationValid) {
+        deletedRealizationsIdx.push(idx);
+      }
+    });
+
+    deletedRealizationsIdx.forEach((deletedRealizationIdx) => {
+      newRealizations.splice(deletedRealizationIdx, 1);
+    });
+
+    formik.setFieldValue('realizations', newRealizations);
+  };
+
+  const vendorChangeHandler = (val: OptionType | OptionType[] | null) => {
+    formik.setFieldTouched('vendor', true);
+    formik.setFieldValue('vendor', val);
+  };
+
+  const realizationDocumentsChangeHandler = (val: File[]) => {
+    formik.setFieldTouched('documents', true);
+    formik.setFieldValue('documents', val);
+  };
+
+  const realizationDocumentsDeleteHandler = (deletedFileIdx: number) => {
+    const newRequestDocuments = formik.values.documents;
+
+    newRequestDocuments?.splice(deletedFileIdx, 1);
+
+    formik.setFieldValue('documents', newRequestDocuments);
+  };
+
+  useEffect(() => {
+    formikSetValues(getExpenseRealizationFormInitialValues(initialValues));
+  }, [formikSetValues, getExpenseRealizationFormInitialValues, initialValues]);
+
+  return (
+    <section className='w-full max-w-5xl'>
+      <header className='flex flex-col gap-4'>
+        <Button
+          href='/expense'
+          variant='link'
+          className='w-fit p-0 text-primary'
+        >
+          <Icon icon='uil:arrow-left' width={24} height={24} />
+          Kembali
+        </Button>
+
+        <h1 className='text-2xl font-bold text-center'>
+          Realisasi Biaya Operasional
+        </h1>
+      </header>
+
+      <form
+        onSubmit={formik.handleSubmit}
+        onReset={formik.handleReset}
+        className='w-full mt-8 flex flex-col gap-6'
+      >
+        <div className='grid grid-cols-12 gap-4'>
+          <SelectInput
+            label='Lokasi'
+            required
+            placeholder='Pilih Lokasi'
+            value={formik.values.location}
+            onChange={locationChangeHandler}
+            options={locationOptions}
+            isLoading={isLoadingLocationOptions}
+            onInputChange={setLocationInputValue}
+            isDisabled
+            className={{ wrapper: 'col-span-12 sm:col-span-6' }}
+          />
+
+          <DateInput
+            name='realization_date'
+            label='Tanggal Realisasi'
+            required
+            value={formik.values.realization_date}
+            onChange={formik.handleChange}
+            className={{
+              wrapper: 'col-span-12 sm:col-span-6',
+            }}
+          />
+
+          <ExpenseKandangsTable
+            type='detail'
+            locationId={formik.values.location?.value}
+            selectedKandangs={formik.values.kandangs ?? []}
+            onChange={kandangsChangeHandler}
+            className={{
+              wrapper: 'w-full col-span-12',
+            }}
+          />
+
+          <SelectInput
+            label='Vendor'
+            required
+            placeholder='Pilih Vendor'
+            value={formik.values.supplier}
+            onChange={vendorChangeHandler}
+            options={vendorOptions}
+            isLoading={isLoadingVendorOptions}
+            onInputChange={setVendorInputValue}
+            isDisabled
+            className={{ wrapper: 'col-span-12' }}
+          />
+
+          <DropFileInput
+            label='Dokumen Realisasi'
+            name='documents'
+            values={formik.values.documents}
+            onChange={realizationDocumentsChangeHandler}
+            onDelete={realizationDocumentsDeleteHandler}
+            accept={{
+              ...ACCEPTED_FILE_TYPE.PDF,
+              ...ACCEPTED_FILE_TYPE.IMAGE,
+            }}
+            className={{
+              wrapper: 'col-span-12',
+              inputWrapper: 'h-12 flex items-center',
+            }}
+          />
+
+          {formik.values.existing_documents &&
+            formik.values.existing_documents.length > 0 && (
+              <div className='w-full col-span-12'>
+                <ul className='pl-4 list-disc'>
+                  {formik.values.existing_documents.map(
+                    (existingDocument, existingDocumentIdx) => (
+                      <li key={existingDocumentIdx}>
+                        <Link
+                          href={existingDocument.url}
+                          target='_blank'
+                          rel='noopener noreferrer'
+                          className='text-blue-500 underline'
+                        >
+                          {existingDocument.name}{' '}
+                          <Icon
+                            icon='cuida:open-in-new-tab-outline'
+                            width={12}
+                            height={12}
+                            className='inline'
+                          />
+                        </Link>
+                      </li>
+                    )
+                  )}
+                </ul>
+              </div>
+            )}
+
+          <ExpenseRealizationKandangDetailExpense
+            formik={formik}
+            className={{
+              wrapper: 'col-span-12',
+            }}
+          />
+        </div>
+
+        {expenseFormErrorMessage && (
+          <div role='alert' className='alert alert-error w-full'>
+            <Icon
+              icon='material-symbols:error-outline'
+              width={24}
+              height={24}
+            />
+            <span>{expenseFormErrorMessage}</span>
+          </div>
+        )}
+
+        <div className='flex flex-row justify-between gap-2 flex-wrap'>
+          {type !== 'add' && (
+            <div className='flex flex-row justify-start gap-2'>
+              {type !== 'edit' && (
+                <Button
+                  type='button'
+                  color='warning'
+                  href={`/expense/detail/edit/?expenseId=${initialValues?.id}`}
+                  className='px-4'
+                >
+                  <Icon
+                    icon='material-symbols:edit-outline'
+                    width={24}
+                    height={24}
+                    className='justify-start text-sm'
+                  />
+                  Edit
+                </Button>
+              )}
+            </div>
+          )}
+
+          {type !== 'detail' && (
+            <div
+              className={cn('flex flex-row justify-end gap-2', {
+                'w-full': type === 'add',
+              })}
+            >
+              <Button type='reset' color='warning' className='px-4'>
+                Reset
+              </Button>
+
+              <Button
+                type='submit'
+                color='primary'
+                isLoading={formik.isSubmitting}
+                disabled={!formik.isValid || formik.isSubmitting}
+                className='px-4'
+              >
+                Submit
+              </Button>
+            </div>
+          )}
+        </div>
+      </form>
+    </section>
+  );
+};
+
+export default ExpenseRealizationForm;

src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx

@@ -0,0 +1,224 @@
+'use client';
+
+import { FormikContextType } from 'formik';
+
+import Card from '@/components/Card';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import NumberInput from '@/components/input/NumberInput';
+import TextInput from '@/components/input/TextInput';
+
+import { ExpenseRealizationFormValues } from '@/components/pages/expense/form/ExpenseRealizationForm.schema';
+import { cn } from '@/lib/helper';
+import { NonstockApi } from '@/services/api/master-data';
+import { Nonstock } from '@/types/api/master-data/nonstock';
+
+interface ExpenseRealizationKandangDetailExpenseProps {
+  type?: 'add' | 'edit' | 'detail';
+  formik: FormikContextType<ExpenseRealizationFormValues>;
+  className?: {
+    wrapper?: string;
+  };
+}
+
+const ExpenseRealizationKandangDetailExpense: React.FC<
+  ExpenseRealizationKandangDetailExpenseProps
+> = ({ type, formik, className }) => {
+  const {
+    setInputValue: setNonstockInputValue,
+    options: nonstockOptions,
+    isLoadingOptions: isLoadingNonstockOptions,
+  } = useSelect<Nonstock>(NonstockApi.basePath, 'id', 'name');
+
+  const nonstockChangeHandler = (
+    kandangExpenseIdx: number,
+    costItemIdx: number,
+    val: OptionType | OptionType[] | null
+  ) => {
+    formik.setFieldTouched(
+      `realizations[${kandangExpenseIdx}].cost_items[${costItemIdx}].nonstock`,
+      true
+    );
+    formik.setFieldValue(
+      `realizations[${kandangExpenseIdx}].cost_items[${costItemIdx}].nonstock`,
+      val
+    );
+  };
+
+  const isExpenseRepeaterInputError = (
+    column: 'nonstock' | 'quantity' | 'total_cost' | 'notes',
+    kandangExpenseIdx: number,
+    expenseIdx: number
+  ) => {
+    return (
+      formik.touched.realizations?.[kandangExpenseIdx]?.cost_items?.[
+        expenseIdx
+      ]?.[column] &&
+      Boolean(
+        formik.errors.realizations?.[kandangExpenseIdx] instanceof Object &&
+          formik.errors.realizations?.[kandangExpenseIdx].cost_items?.[
+            expenseIdx
+          ] instanceof Object &&
+          formik.errors.realizations?.[kandangExpenseIdx].cost_items?.[
+            expenseIdx
+          ]?.[column]
+      )
+    );
+  };
+
+  return (
+    <Card
+      className={{
+        wrapper: cn('w-full', className?.wrapper),
+        body: 'p-4 shadow',
+      }}
+    >
+      <div className='mb-4 text-center'>
+        <h4 className='font-bold text-xl'>
+          Rincian Realisasi Biaya Operasional
+        </h4>
+      </div>
+
+      <div className='w-full flex flex-col gap-6'>
+        {formik.values.realizations.length === 0 && (
+          <div>
+            <p className='text-sm text-gray-400 text-center'>
+              Pilih kandang terlebih dahulu!
+            </p>
+          </div>
+        )}
+
+        {formik.values.realizations.map((kandangExpense, kandangExpenseIdx) => {
+          const kandangName = formik.values.kandangs?.find(
+            (kandang) => kandang.id === kandangExpense.kandang_id
+          );
+
+          return (
+            kandangName?.name && (
+              <div
+                key={`kandangExpense-${kandangExpenseIdx}`}
+                className='w-full flex flex-col gap-4'
+              >
+                <div>
+                  <h5 className='mb-2 text-lg font-bold text-center'>
+                    Biaya {kandangName?.name}
+                  </h5>
+
+                  <div className='overflow-x-auto'>
+                    <table className='table'>
+                      <thead>
+                        <tr>
+                          <th>Nonstock</th>
+                          <th>Total Kuantitas</th>
+                          <th>Total Biaya</th>
+                          <th>Catatan</th>
+                        </tr>
+                      </thead>
+
+                      <tbody>
+                        {kandangExpense.cost_items.map(
+                          (expenseItem, expenseIdx) => (
+                            <tr key={`expense-${expenseIdx}`}>
+                              <td className='p-2'>
+                                <SelectInput
+                                  placeholder='Pilih Nonstock'
+                                  value={expenseItem.nonstock}
+                                  onChange={(val) => {
+                                    nonstockChangeHandler(
+                                      kandangExpenseIdx,
+                                      expenseIdx,
+                                      val
+                                    );
+                                  }}
+                                  options={nonstockOptions}
+                                  isLoading={isLoadingNonstockOptions}
+                                  onInputChange={setNonstockInputValue}
+                                  className={{ wrapper: 'min-w-48' }}
+                                  isDisabled
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <NumberInput
+                                  required
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
+                                  placeholder='Masukkan Total Kuantitas'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].quantity ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'quantity',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <NumberInput
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].total_cost`}
+                                  placeholder='Masukkan Total Biaya'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].total_cost ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'total_cost',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  inputPrefix={
+                                    <span className='text-gray-600 font-medium'>
+                                      Rp
+                                    </span>
+                                  }
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
+
+                              <td className='p-2'>
+                                <TextInput
+                                  name={`realizations[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
+                                  placeholder='Tuliskan catatan'
+                                  value={
+                                    formik.values.realizations[
+                                      kandangExpenseIdx
+                                    ].cost_items[expenseIdx].notes ?? ''
+                                  }
+                                  onChange={formik.handleChange}
+                                  onBlur={formik.handleBlur}
+                                  isError={isExpenseRepeaterInputError(
+                                    'notes',
+                                    kandangExpenseIdx,
+                                    expenseIdx
+                                  )}
+                                  className={{ wrapper: 'min-w-24' }}
+                                />
+                              </td>
+                            </tr>
+                          )
+                        )}
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
+            )
+          );
+        })}
+      </div>
+    </Card>
+  );
+};
+
+export default ExpenseRealizationKandangDetailExpense;

src/components/pages/expense/form/ExpenseRequestForm.schema.ts

@@ -3,27 +3,32 @@ import { Expense } from '@/types/api/expense';
 import { formatDate } from '@/lib/helper';
 
 type ExpenseFormSchemaType = {
+  category?: {
+    value: 'BOP' | 'NON-BOP';
+    label: 'BOP' | 'NON-BOP';
+  };
   location?: {
     value: number;
     label: string;
   };
   transaction_date?: string;
   kandangs?: { id: number; name: string }[];
-  vendor?: {
+  supplier?: {
     value: number;
     label: string;
   };
-  existing_documents?: { name: string; url: string }[];
-  request_documents?: File[];
-  kandangExpenses: {
-    kandangId: number;
-    expenses: {
+  existing_documents?: { id: number; name: string; url: string }[];
+  deleted_documents?: number[];
+  documents?: File[];
+  cost_per_kandangs: {
+    kandang_id: number;
+    cost_items: {
       nonstock?: {
         value: number;
         label: string;
       };
-      totalQuantity?: number;
-      totalExpense?: number;
+      quantity?: number;
+      total_cost?: number;
       notes?: string;
     }[];
   }[];
@@ -31,6 +36,11 @@ type ExpenseFormSchemaType = {
 
 export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
   Yup.object({
+    category: Yup.object({
+      value: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
+      label: Yup.string().oneOf(['BOP', 'NON-BOP']).required(),
+    }).required('Kategori wajib diisi!'),
+
     location: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
@@ -47,35 +57,36 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
       .min(1, 'Kandang wajib dipilih!')
       .required('Kandang wajib dipilih!'),
 
-    vendor: Yup.object({
+    supplier: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
     }).required('Vendor wajib diisi!'),
 
     existing_documents: Yup.array().of(
       Yup.object({
+        id: Yup.number().required(),
         name: Yup.string().required(),
         url: Yup.string().required(),
       })
     ),
 
-    request_documents: Yup.array().of(Yup.mixed<File>().required()).optional(),
+    deleted_documents: Yup.array().of(Yup.number().required()).optional(),
 
-    kandangExpenses: Yup.array()
+    documents: Yup.array().of(Yup.mixed<File>().required()).optional(),
+
+    cost_per_kandangs: Yup.array()
       .of(
         Yup.object({
-          kandangId: Yup.number().min(1, 'Wajib memilih kandang!').required(),
-          expenses: Yup.array()
+          kandang_id: Yup.number().min(1, 'Wajib memilih kandang!').required(),
+          cost_items: Yup.array()
             .of(
               Yup.object({
                 nonstock: Yup.object({
                   value: Yup.number().min(1).required(),
                   label: Yup.string().required(),
                 }).required('Nonstock wajib diisi!'),
-                totalQuantity: Yup.number().required(
-                  'Total kuantitas wajib diisi!'
-                ),
-                totalExpense: Yup.number().required('Total biaya wajib diisi!'),
+                quantity: Yup.number().required('Total kuantitas wajib diisi!'),
+                total_cost: Yup.number().required('Total biaya wajib diisi!'),
                 notes: Yup.string(),
               })
             )
@@ -90,7 +101,7 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
 export const UpdateExpenseRequestFormSchema = ExpenseRequestFormSchema;
 
 export const UploadRequestDocumentsFormSchema = Yup.object({
-  request_documents: Yup.array().of(Yup.mixed<File>().required()).required(),
+  documents: Yup.array().of(Yup.mixed<File>().required()).required(),
 });
 
 export type ExpenseRequestFormValues = Yup.InferType<
@@ -105,39 +116,52 @@ export const getExpenseFormInitialValues = (
   initialValues?: Expense
 ): ExpenseRequestFormValues => {
   return {
+    category: initialValues?.category
+      ? {
+          value: initialValues.category,
+          label: initialValues.category,
+        }
+      : undefined,
     location: initialValues?.location
       ? {
           value: initialValues.location.id,
           label: initialValues.location.name,
         }
       : undefined,
-    transaction_date: initialValues?.transaction_date
-      ? formatDate(initialValues.transaction_date, 'YYYY-MM-DD')
+    transaction_date: initialValues?.expense_date
+      ? formatDate(initialValues.expense_date, 'YYYY-MM-DD')
       : undefined,
     kandangs: initialValues?.kandangs.map((kandang) => ({
-      id: kandang.id,
+      id: kandang.kandang_id,
       name: kandang.name,
     })),
-    vendor: initialValues?.vendor
+    supplier: initialValues?.supplier
       ? {
-          value: initialValues.vendor.id,
-          label: initialValues.vendor.name,
+          value: initialValues.supplier.id,
+          label: initialValues.supplier.name,
         }
       : undefined,
-    existing_documents: initialValues?.request_documents,
-    request_documents: [],
-    kandangExpenses: initialValues?.kandang_expenses
-      ? initialValues.kandang_expenses.map((kandangExpense) => ({
-          kandangId: kandangExpense.kandang.id,
-          expenses: kandangExpense.expenses.map((expenseItem) => ({
-            nonstock: {
-              value: expenseItem.nonstock.id,
-              label: expenseItem.nonstock.name,
-            },
-            totalQuantity: expenseItem.total_quantity,
-            totalExpense: expenseItem.total_expense,
-            notes: expenseItem.notes,
-          })),
+    existing_documents: initialValues?.documents?.map((doc) => ({
+      id: doc.id,
+      name: doc.path,
+      url: doc.path,
+    })),
+    deleted_documents: [],
+    documents: [],
+    cost_per_kandangs: initialValues?.kandangs
+      ? initialValues.kandangs.map((kandangExpense) => ({
+          kandang_id: kandangExpense.kandang_id,
+          cost_items: kandangExpense.pengajuans
+            ? kandangExpense.pengajuans.map((expenseItem) => ({
+                nonstock: {
+                  value: expenseItem.nonstock.id,
+                  label: expenseItem.nonstock.name,
+                },
+                quantity: expenseItem.qty,
+                total_cost: expenseItem.total_price,
+                notes: expenseItem.note,
+              }))
+            : [],
         }))
       : [],
   };

src/components/pages/expense/form/ExpenseRequestForm.tsx

@@ -42,7 +42,6 @@ interface ExpenseFormProps {
   initialValues?: Expense;
 }
 
-// TODO: integrate this with real API
 const ExpenseRequestForm = ({
   type = 'add',
   initialValues,
@@ -59,7 +58,7 @@ const ExpenseRequestForm = ({
   const createExpenseHandler = useCallback(
     async (payload: CreateExpensePayload) => {
       const createExpenseRes = await ExpenseApi.create(
-        ExpenseApi.convertPayloadToFormData(payload)
+        ExpenseApi.convertExpenseRequestPayloadToFormData(payload)
       );
 
       if (isResponseError(createExpenseRes)) {
@@ -74,10 +73,15 @@ const ExpenseRequestForm = ({
   );
 
   const updateExpenseHandler = useCallback(
-    async (expenseId: number, payload: UpdateExpensePayload) => {
+    async (
+      expenseId: number,
+      payload: UpdateExpensePayload,
+      deletedDocumentIds: number[]
+    ) => {
       const updateExpenseRes = await ExpenseApi.update(
         expenseId,
-        ExpenseApi.convertPayloadToFormData(payload)
+        ExpenseApi.convertExpenseRequestUpdatePayloadToFormData(payload),
+        deletedDocumentIds
       );
 
       if (updateExpenseRes?.status === 'error') {
@@ -102,20 +106,17 @@ const ExpenseRequestForm = ({
       setExpenseFormErrorMessage('');
 
       const expensePayload: CreateExpensePayload = {
-        locationId: values.location?.value as number,
-        kandangIds: values.kandangs
-          ? values.kandangs.map((item) => item.id)
-          : [],
-        transaction_date: values.transaction_date as string,
-        vendorId: values.vendor?.value as number,
-        request_documents: values.request_documents as File[],
-        kandang_expenses: values.kandangExpenses.map((kandangExpense) => ({
-          kandangId: kandangExpense.kandangId,
-          expenses: kandangExpense.expenses.map((expenseItem) => ({
-            nonstockId: expenseItem.nonstock?.value as number,
-            total_quantity: expenseItem.totalQuantity as number,
-            total_expense: expenseItem.totalExpense as number,
-            notes: expenseItem.notes,
+        category: formik.values.category?.value as 'BOP' | 'NON-BOP',
+        transaction_date: values?.transaction_date as string,
+        supplier_id: values.supplier?.value as number,
+        documents: values.documents as File[],
+        cost_per_kandangs: values.cost_per_kandangs.map((costPerKandang) => ({
+          kandang_id: costPerKandang.kandang_id,
+          cost_items: costPerKandang.cost_items.map((costItem) => ({
+            nonstock_id: costItem.nonstock?.value as number,
+            quantity: parseFloat(String(costItem.quantity)) as number,
+            total_cost: parseFloat(String(costItem.total_cost)) as number,
+            notes: costItem.notes ?? '',
           })),
         })),
       };
@@ -126,9 +127,28 @@ const ExpenseRequestForm = ({
           break;
 
         case 'edit':
+          const expenseUpdatePayload: UpdateExpensePayload = {
+            category: formik.values.category?.value as 'BOP' | 'NON-BOP',
+            transaction_date: values?.transaction_date as string,
+            supplier_id: values.supplier?.value as number,
+            documents: values.documents as File[],
+            cost_per_kandang: values.cost_per_kandangs.map(
+              (costPerKandang) => ({
+                kandang_id: costPerKandang.kandang_id,
+                cost_items: costPerKandang.cost_items.map((costItem) => ({
+                  nonstock_id: costItem.nonstock?.value as number,
+                  quantity: parseFloat(String(costItem.quantity)) as number,
+                  total_cost: parseFloat(String(costItem.total_cost)) as number,
+                  notes: costItem.notes ?? '',
+                })),
+              })
+            ),
+          };
+
           await updateExpenseHandler(
             initialValues?.id as number,
-            expensePayload
+            expenseUpdatePayload,
+            formik.values.deleted_documents ?? []
           );
           break;
       }
@@ -145,72 +165,103 @@ const ExpenseRequestForm = ({
 
   const {
     setInputValue: setVendorInputValue,
-    options: vendorOptions,
+    options: supplierOptions,
     isLoadingOptions: isLoadingVendorOptions,
   } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');
 
+  const categoryChangeHandler = (val: OptionType | OptionType[] | null) => {
+    formik.setFieldTouched('category', true);
+    formik.setFieldValue('category', val);
+  };
+
   const locationChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldTouched('location', true);
     formik.setFieldValue('location', val);
 
     formik.setFieldValue('kandangs', []);
-    formik.setFieldValue('kandangExpenses', []);
+    formik.setFieldValue('cost_per_kandangs', []);
   };
 
   const kandangsChangeHandler = (kandangs: { id: number; name: string }[]) => {
     formik.setFieldTouched('kandangs', true);
     formik.setFieldValue('kandangs', kandangs);
 
-    const newKandangExpenses = [...(formik.values.kandangExpenses ?? [])];
+    const newCostPerKandangs = [...(formik.values.cost_per_kandangs ?? [])];
 
-    // add new kandangExpenses
+    // add new cost_per_kandangs
     kandangs.forEach((kandangItem) => {
-      const isKandangExistInKandangExpense = newKandangExpenses.find(
-        (kandangExpenseItem) => kandangExpenseItem.kandangId === kandangItem.id
+      const isKandangExistInCostPerKandangs = newCostPerKandangs.find(
+        (costPerKandangItem) => costPerKandangItem.kandang_id === kandangItem.id
       );
 
-      if (isKandangExistInKandangExpense) return;
+      if (isKandangExistInCostPerKandangs) return;
 
-      newKandangExpenses.push({
-        kandangId: kandangItem.id,
-        expenses: [
+      newCostPerKandangs.push({
+        kandang_id: kandangItem.id,
+        cost_items: [
           {
             nonstock: undefined,
-            totalExpense: undefined,
-            totalQuantity: undefined,
+            quantity: undefined,
+            total_cost: undefined,
             notes: '',
           },
         ],
       });
     });
 
-    // prune kandangExpenses
+    // prune cost_per_kandangs
     const kandangIds = new Set(kandangs.map((kandang) => kandang.id));
-    const deletedKandangExpensesIdx: number[] = [];
+    const deletedCostPerKandangsIdx: number[] = [];
 
-    newKandangExpenses.forEach((kandangExpense, idx) => {
-      const isKandangExpenseValid = kandangIds.has(kandangExpense.kandangId);
+    newCostPerKandangs.forEach((costPerKandang, idx) => {
+      const isCostPerKandangValid = kandangIds.has(costPerKandang.kandang_id);
 
-      if (!isKandangExpenseValid) {
-        deletedKandangExpensesIdx.push(idx);
+      if (!isCostPerKandangValid) {
+        deletedCostPerKandangsIdx.push(idx);
       }
     });
 
-    deletedKandangExpensesIdx.forEach((deletedKandangExpenseIdx) => {
-      newKandangExpenses.splice(deletedKandangExpenseIdx, 1);
+    deletedCostPerKandangsIdx.forEach((deletedCostPerKandangIdx) => {
+      newCostPerKandangs.splice(deletedCostPerKandangIdx, 1);
     });
 
-    formik.setFieldValue('kandangExpenses', newKandangExpenses);
+    formik.setFieldValue('cost_per_kandangs', newCostPerKandangs);
   };
 
-  const vendorChangeHandler = (val: OptionType | OptionType[] | null) => {
-    formik.setFieldTouched('vendor', true);
-    formik.setFieldValue('vendor', val);
+  const supplierChangeHandler = (val: OptionType | OptionType[] | null) => {
+    formik.setFieldTouched('supplier', true);
+    formik.setFieldValue('supplier', val);
   };
 
   const requestDocumentsChangeHandler = (val: File[]) => {
-    formik.setFieldTouched('request_documents', true);
-    formik.setFieldValue('request_documents', val);
+    formik.setFieldTouched('documents', true);
+    formik.setFieldValue('documents', val);
+  };
+
+  const requestDocumentsDeleteHandler = (deletedFileIdx: number) => {
+    const newRequestDocuments = formik.values.documents;
+
+    newRequestDocuments?.splice(deletedFileIdx, 1);
+
+    formik.setFieldValue('documents', newRequestDocuments);
+  };
+
+  const deleteDocumentClickHandler = (
+    deletedDocumentIdx: number,
+    deletedDocumentId: number
+  ) => {
+    const newDeletedDocumentIds = [...(formik.values.deleted_documents ?? [])];
+    const newExistingDocuments = [
+      ...(formik.values.existing_documents ?? []),
+    ].filter((_, idx) => idx !== deletedDocumentIdx);
+
+    newDeletedDocumentIds.push(deletedDocumentId);
+
+    formik.setFieldTouched('deleted_documents', true);
+    formik.setFieldValue('deleted_documents', newDeletedDocumentIds);
+
+    formik.setFieldTouched('existing_documents', true);
+    formik.setFieldValue('existing_documents', newExistingDocuments);
   };
 
   const deleteExpenseClickHandler = () => {
@@ -269,6 +320,25 @@ const ExpenseRequestForm = ({
           className='w-full mt-8 flex flex-col gap-6'
         >
           <div className='grid grid-cols-12 gap-4'>
+            <SelectInput
+              label='Kategori'
+              required
+              placeholder='Pilih Kategori'
+              value={formik.values.category}
+              onChange={categoryChangeHandler}
+              options={[
+                {
+                  value: 'BOP',
+                  label: 'BOP',
+                },
+                {
+                  value: 'NON-BOP',
+                  label: 'NON-BOP',
+                },
+              ]}
+              className={{ wrapper: 'col-span-12 sm:col-span-4' }}
+            />
+
             <SelectInput
               label='Lokasi'
               required
@@ -278,7 +348,7 @@ const ExpenseRequestForm = ({
               options={locationOptions}
               isLoading={isLoadingLocationOptions}
               onInputChange={setLocationInputValue}
-              className={{ wrapper: 'col-span-12 sm:col-span-6' }}
+              className={{ wrapper: 'col-span-12 sm:col-span-4' }}
             />
 
             <DateInput
@@ -288,7 +358,7 @@ const ExpenseRequestForm = ({
               value={formik.values.transaction_date}
               onChange={formik.handleChange}
               className={{
-                wrapper: 'col-span-12 sm:col-span-6',
+                wrapper: 'col-span-12 sm:col-span-4',
               }}
             />
 
@@ -306,9 +376,9 @@ const ExpenseRequestForm = ({
               label='Vendor'
               required
               placeholder='Pilih Vendor'
-              value={formik.values.vendor}
-              onChange={vendorChangeHandler}
-              options={vendorOptions}
+              value={formik.values.supplier}
+              onChange={supplierChangeHandler}
+              options={supplierOptions}
               isLoading={isLoadingVendorOptions}
               onInputChange={setVendorInputValue}
               className={{ wrapper: 'col-span-12' }}
@@ -316,9 +386,10 @@ const ExpenseRequestForm = ({
 
             <DropFileInput
               label='Dokumen Pengajuan'
-              name='request_documents'
-              values={formik.values.request_documents}
+              name='documents'
+              values={formik.values.documents}
               onChange={requestDocumentsChangeHandler}
+              onDelete={requestDocumentsDeleteHandler}
               accept={{
                 ...ACCEPTED_FILE_TYPE.PDF,
                 ...ACCEPTED_FILE_TYPE.IMAGE,
@@ -336,20 +407,41 @@ const ExpenseRequestForm = ({
                     {formik.values.existing_documents.map(
                       (existingDocument, existingDocumentIdx) => (
                         <li key={existingDocumentIdx}>
-                          <Link
-                            href={existingDocument.url}
-                            target='_blank'
-                            rel='noopener noreferrer'
-                            className='text-blue-500 underline'
-                          >
-                            {existingDocument.name}{' '}
-                            <Icon
-                              icon='cuida:open-in-new-tab-outline'
-                              width={12}
-                              height={12}
-                              className='inline'
-                            />
-                          </Link>
+                          <div className='w-full flex flex-wrap justify-between'>
+                            <Link
+                              href={existingDocument.url}
+                              target='_blank'
+                              rel='noopener noreferrer'
+                              className='text-blue-500 underline'
+                            >
+                              {existingDocument.name}{' '}
+                              <Icon
+                                icon='cuida:open-in-new-tab-outline'
+                                width={12}
+                                height={12}
+                                className='inline'
+                              />
+                            </Link>
+
+                            <Button
+                              type='button'
+                              variant='ghost'
+                              color='error'
+                              onClick={() => {
+                                deleteDocumentClickHandler(
+                                  existingDocumentIdx,
+                                  existingDocument.id
+                                );
+                              }}
+                              className='p-1 rounded-full text-error focus-visible:text-error-content hover:text-error-content'
+                            >
+                              <Icon
+                                icon='fluent:delete-12-regular'
+                                width={20}
+                                height={20}
+                              />
+                            </Button>
+                          </div>
                         </li>
                       )
                     )}
@@ -402,6 +494,17 @@ const ExpenseRequestForm = ({
               </div>
             )}
 
+            {expenseFormErrorMessage && (
+              <div role='alert' className='alert alert-error w-full'>
+                <Icon
+                  icon='material-symbols:error-outline'
+                  width={24}
+                  height={24}
+                />
+                <span>{expenseFormErrorMessage}</span>
+              </div>
+            )}
+
             {type !== 'detail' && (
               <div
                 className={cn('flex flex-row justify-end gap-2', {
@@ -424,17 +527,6 @@ const ExpenseRequestForm = ({
               </div>
             )}
           </div>
-
-          {expenseFormErrorMessage && (
-            <div role='alert' className='alert alert-error'>
-              <Icon
-                icon='material-symbols:error-outline'
-                width={24}
-                height={24}
-              />
-              <span>{expenseFormErrorMessage}</span>
-            </div>
-          )}
         </form>
       </section>
 

src/components/pages/expense/form/ExpenseRequestKandangDetailExpense.tsx

@@ -41,28 +41,28 @@ const ExpenseRequestKandangDetailExpense: React.FC<
     val: OptionType | OptionType[] | null
   ) => {
     formik.setFieldTouched(
-      `kandangExpenses[${kandangExpenseIdx}].expenses[${expenseIdx}].nonstock`,
+      `cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
       true
     );
     formik.setFieldValue(
-      `kandangExpenses[${kandangExpenseIdx}].expenses[${expenseIdx}].nonstock`,
+      `cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].nonstock`,
       val
     );
   };
 
   const addExpenseItemHandler = (kandangExpenseIdx: number) => {
     const newExpensesValue = [
-      ...formik.values.kandangExpenses[kandangExpenseIdx].expenses,
+      ...formik.values.cost_per_kandangs[kandangExpenseIdx].cost_items,
       {
         nonstock: undefined,
-        totalExpense: undefined,
-        totalQuantity: undefined,
+        total_cost: undefined,
+        quantity: undefined,
         notes: '',
       },
     ];
 
     formik.setFieldValue(
-      `kandangExpenses[${kandangExpenseIdx}].expenses`,
+      `cost_per_kandangs[${kandangExpenseIdx}].cost_items`,
       newExpensesValue
     );
   };
@@ -71,27 +71,28 @@ const ExpenseRequestKandangDetailExpense: React.FC<
     kandangExpenseIdx: number,
     expenseIdx: number
   ) => {
-    const path = `kandangExpenses[${kandangExpenseIdx}].expenses`;
+    const path = `cost_per_kandangs[${kandangExpenseIdx}].cost_items`;
 
     // trims values, errors, and touched at expenseIdx
     removeArrayItemAndSync(formik, path, expenseIdx);
   };
 
   const isExpenseRepeaterInputError = (
-    column: 'nonstock' | 'totalQuantity' | 'totalExpense' | 'notes',
+    column: 'nonstock' | 'quantity' | 'total_cost' | 'notes',
     kandangExpenseIdx: number,
     expenseIdx: number
   ) => {
     return (
-      formik.touched.kandangExpenses?.[kandangExpenseIdx]?.expenses?.[
+      formik.touched.cost_per_kandangs?.[kandangExpenseIdx]?.cost_items?.[
         expenseIdx
       ]?.[column] &&
       Boolean(
-        formik.errors.kandangExpenses?.[kandangExpenseIdx] instanceof Object &&
-          formik.errors.kandangExpenses?.[kandangExpenseIdx].expenses?.[
+        formik.errors.cost_per_kandangs?.[kandangExpenseIdx] instanceof
+          Object &&
+          formik.errors.cost_per_kandangs?.[kandangExpenseIdx].cost_items?.[
             expenseIdx
           ] instanceof Object &&
-          formik.errors.kandangExpenses?.[kandangExpenseIdx].expenses?.[
+          formik.errors.cost_per_kandangs?.[kandangExpenseIdx].cost_items?.[
             expenseIdx
           ]?.[column]
       )
@@ -112,7 +113,8 @@ const ExpenseRequestKandangDetailExpense: React.FC<
       </div>
 
       <div className='w-full flex flex-col gap-6'>
-        {formik.values.kandangExpenses.length === 0 && (
+        {(formik.values.cost_per_kandangs.length === 0 ||
+          !formik.values.supplier?.value) && (
           <div>
             <p className='text-sm text-gray-400 text-center'>
               Pilih kandang terlebih dahulu!
@@ -120,168 +122,171 @@ const ExpenseRequestKandangDetailExpense: React.FC<
           </div>
         )}
 
-        {formik.values.kandangExpenses.map(
-          (kandangExpense, kandangExpenseIdx) => {
-            const kandangName = formik.values.kandangs?.find(
-              (kandang) => kandang.id === kandangExpense.kandangId
-            );
+        {formik.values.cost_per_kandangs.length > 0 &&
+          formik.values.supplier?.value &&
+          formik.values.cost_per_kandangs.map(
+            (kandangExpense, kandangExpenseIdx) => {
+              const kandangName = formik.values.kandangs?.find(
+                (kandang) => kandang.id === kandangExpense.kandang_id
+              );
 
-            return (
-              kandangName?.name && (
-                <div
-                  key={`kandangExpense-${kandangExpenseIdx}`}
-                  className='w-full flex flex-col gap-4'
-                >
-                  <div>
-                    <h5 className='mb-2 text-lg font-bold text-center'>
-                      Biaya {kandangName?.name}
-                    </h5>
+              return (
+                kandangName?.name && (
+                  <div
+                    key={`kandangExpense-${kandangExpenseIdx}`}
+                    className='w-full flex flex-col gap-4'
+                  >
+                    <div>
+                      <h5 className='mb-2 text-lg font-bold text-center'>
+                        Biaya {kandangName?.name}
+                      </h5>
 
-                    <div className='overflow-x-auto'>
-                      <table className='table'>
-                        <thead>
-                          <tr>
-                            <th>Nonstock</th>
-                            <th>Total Kuantitas</th>
-                            <th>Total Biaya</th>
-                            <th>Catatan</th>
-                            {type !== 'detail' && <th>Aksi</th>}
-                          </tr>
-                        </thead>
+                      <div className='overflow-x-auto'>
+                        <table className='table'>
+                          <thead>
+                            <tr>
+                              <th>Nonstock</th>
+                              <th>Total Kuantitas</th>
+                              <th>Total Biaya</th>
+                              <th>Catatan</th>
+                              {type !== 'detail' && <th>Aksi</th>}
+                            </tr>
+                          </thead>
 
-                        <tbody>
-                          {kandangExpense.expenses.map(
-                            (expenseItem, expenseIdx) => (
-                              <tr key={`expense-${expenseIdx}`}>
-                                <td className='p-2'>
-                                  <SelectInput
-                                    placeholder='Pilih Nonstock'
-                                    value={expenseItem.nonstock}
-                                    onChange={(val) => {
-                                      nonstockChangeHandler(
-                                        kandangExpenseIdx,
-                                        expenseIdx,
-                                        val
-                                      );
-                                    }}
-                                    options={nonstockOptions}
-                                    isLoading={isLoadingNonstockOptions}
-                                    onInputChange={setNonstockInputValue}
-                                    className={{ wrapper: 'min-w-48' }}
-                                  />
-                                </td>
-
-                                <td className='p-2'>
-                                  <NumberInput
-                                    required
-                                    name={`kandangExpenses[${kandangExpenseIdx}].expenses[${expenseIdx}].totalQuantity`}
-                                    placeholder='Masukkan Total Kuantitas'
-                                    value={
-                                      formik.values.kandangExpenses[
-                                        kandangExpenseIdx
-                                      ].expenses[expenseIdx].totalQuantity ?? ''
-                                    }
-                                    onChange={formik.handleChange}
-                                    onBlur={formik.handleBlur}
-                                    isError={isExpenseRepeaterInputError(
-                                      'totalQuantity',
-                                      kandangExpenseIdx,
-                                      expenseIdx
-                                    )}
-                                    className={{ wrapper: 'min-w-24' }}
-                                  />
-                                </td>
-
-                                <td className='p-2'>
-                                  <NumberInput
-                                    name={`kandangExpenses[${kandangExpenseIdx}].expenses[${expenseIdx}].totalExpense`}
-                                    placeholder='Masukkan Total Biaya'
-                                    value={
-                                      formik.values.kandangExpenses[
-                                        kandangExpenseIdx
-                                      ].expenses[expenseIdx].totalExpense ?? ''
-                                    }
-                                    onChange={formik.handleChange}
-                                    onBlur={formik.handleBlur}
-                                    isError={isExpenseRepeaterInputError(
-                                      'totalExpense',
-                                      kandangExpenseIdx,
-                                      expenseIdx
-                                    )}
-                                    inputPrefix={
-                                      <span className='text-gray-600 font-medium'>
-                                        Rp
-                                      </span>
-                                    }
-                                    className={{ wrapper: 'min-w-24' }}
-                                  />
-                                </td>
-
-                                <td className='p-2'>
-                                  <TextInput
-                                    name={`kandangExpenses[${kandangExpenseIdx}].expenses[${expenseIdx}].notes`}
-                                    placeholder='Tuliskan catatan'
-                                    value={
-                                      formik.values.kandangExpenses[
-                                        kandangExpenseIdx
-                                      ].expenses[expenseIdx].notes ?? ''
-                                    }
-                                    onChange={formik.handleChange}
-                                    onBlur={formik.handleBlur}
-                                    isError={isExpenseRepeaterInputError(
-                                      'notes',
-                                      kandangExpenseIdx,
-                                      expenseIdx
-                                    )}
-                                    className={{ wrapper: 'min-w-24' }}
-                                  />
-                                </td>
-
-                                {type !== 'detail' && (
-                                  <td>
-                                    <Button
-                                      type='button'
-                                      color='error'
-                                      onClick={() =>
-                                        deleteExpenseItemHandler(
+                          <tbody>
+                            {kandangExpense.cost_items.map(
+                              (expenseItem, expenseIdx) => (
+                                <tr key={`expense-${expenseIdx}`}>
+                                  <td className='p-2'>
+                                    <SelectInput
+                                      placeholder='Pilih Nonstock'
+                                      value={expenseItem.nonstock}
+                                      onChange={(val) => {
+                                        nonstockChangeHandler(
                                           kandangExpenseIdx,
-                                          expenseIdx
-                                        )
-                                      }
-                                    >
-                                      <Icon
-                                        icon='material-symbols:delete-outline-rounded'
-                                        width={24}
-                                        height={24}
-                                      />
-                                    </Button>
+                                          expenseIdx,
+                                          val
+                                        );
+                                      }}
+                                      options={nonstockOptions}
+                                      isLoading={isLoadingNonstockOptions}
+                                      onInputChange={setNonstockInputValue}
+                                      className={{ wrapper: 'min-w-48' }}
+                                    />
                                   </td>
-                                )}
-                              </tr>
-                            )
-                          )}
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
 
-                  {type !== 'detail' && (
-                    <Button
-                      type='button'
-                      variant='outline'
-                      color='success'
-                      onClick={() => addExpenseItemHandler(kandangExpenseIdx)}
-                      className='w-fit mx-auto'
-                    >
-                      <Icon icon='ic:round-plus' width={24} height={24} />{' '}
-                      Tambah
-                    </Button>
-                  )}
-                </div>
-              )
-            );
-          }
-        )}
+                                  <td className='p-2'>
+                                    <NumberInput
+                                      required
+                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].quantity`}
+                                      placeholder='Masukkan Total Kuantitas'
+                                      value={
+                                        formik.values.cost_per_kandangs[
+                                          kandangExpenseIdx
+                                        ].cost_items[expenseIdx].quantity ?? ''
+                                      }
+                                      onChange={formik.handleChange}
+                                      onBlur={formik.handleBlur}
+                                      isError={isExpenseRepeaterInputError(
+                                        'quantity',
+                                        kandangExpenseIdx,
+                                        expenseIdx
+                                      )}
+                                      className={{ wrapper: 'min-w-24' }}
+                                    />
+                                  </td>
+
+                                  <td className='p-2'>
+                                    <NumberInput
+                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].total_cost`}
+                                      placeholder='Masukkan Total Biaya'
+                                      value={
+                                        formik.values.cost_per_kandangs[
+                                          kandangExpenseIdx
+                                        ].cost_items[expenseIdx].total_cost ??
+                                        ''
+                                      }
+                                      onChange={formik.handleChange}
+                                      onBlur={formik.handleBlur}
+                                      isError={isExpenseRepeaterInputError(
+                                        'total_cost',
+                                        kandangExpenseIdx,
+                                        expenseIdx
+                                      )}
+                                      inputPrefix={
+                                        <span className='text-gray-600 font-medium'>
+                                          Rp
+                                        </span>
+                                      }
+                                      className={{ wrapper: 'min-w-24' }}
+                                    />
+                                  </td>
+
+                                  <td className='p-2'>
+                                    <TextInput
+                                      name={`cost_per_kandangs[${kandangExpenseIdx}].cost_items[${expenseIdx}].notes`}
+                                      placeholder='Tuliskan catatan'
+                                      value={
+                                        formik.values.cost_per_kandangs[
+                                          kandangExpenseIdx
+                                        ].cost_items[expenseIdx].notes ?? ''
+                                      }
+                                      onChange={formik.handleChange}
+                                      onBlur={formik.handleBlur}
+                                      isError={isExpenseRepeaterInputError(
+                                        'notes',
+                                        kandangExpenseIdx,
+                                        expenseIdx
+                                      )}
+                                      className={{ wrapper: 'min-w-24' }}
+                                    />
+                                  </td>
+
+                                  {type !== 'detail' && (
+                                    <td>
+                                      <Button
+                                        type='button'
+                                        color='error'
+                                        onClick={() =>
+                                          deleteExpenseItemHandler(
+                                            kandangExpenseIdx,
+                                            expenseIdx
+                                          )
+                                        }
+                                      >
+                                        <Icon
+                                          icon='material-symbols:delete-outline-rounded'
+                                          width={24}
+                                          height={24}
+                                        />
+                                      </Button>
+                                    </td>
+                                  )}
+                                </tr>
+                              )
+                            )}
+                          </tbody>
+                        </table>
+                      </div>
+                    </div>
+
+                    {type !== 'detail' && (
+                      <Button
+                        type='button'
+                        variant='outline'
+                        color='success'
+                        onClick={() => addExpenseItemHandler(kandangExpenseIdx)}
+                        className='w-fit mx-auto'
+                      >
+                        <Icon icon='ic:round-plus' width={24} height={24} />{' '}
+                        Tambah
+                      </Button>
+                    )}
+                  </div>
+                )
+              );
+            }
+          )}
       </div>
     </Card>
   );

src/components/pages/expense/pdf/ExpensePDF.tsx

@@ -0,0 +1,651 @@
+'use client';
+
+import {
+  Document,
+  Image,
+  Link,
+  Page,
+  StyleSheet,
+  Text,
+  View,
+} from '@react-pdf/renderer';
+
+import { Expense } from '@/types/api/expense';
+import { formatCurrency, formatDate, formatNumber } from '@/lib/helper';
+
+interface ExpensePDFProps {
+  expense?: Expense;
+}
+
+const ExpensePDFStyle = StyleSheet.create({
+  page: {
+    paddingTop: 24,
+    paddingBottom: 64,
+    paddingHorizontal: 32,
+  },
+
+  companyInfoHeader: {
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'flex-start',
+    marginBottom: 8,
+  },
+  companyLogo: {
+    width: 64,
+    height: 'auto',
+  },
+  companyInfoHeaderDate: {
+    paddingTop: 8,
+    fontSize: 12,
+  },
+  companyName: {
+    fontSize: 12,
+    fontWeight: 'bold',
+    marginBottom: 4,
+  },
+  companyAddress: {
+    fontSize: 8,
+    maxWidth: 400,
+    marginBottom: 10,
+  },
+
+  title: {
+    marginTop: 16,
+    fontSize: 16,
+    lineHeight: '150%',
+    textAlign: 'center',
+    fontFamily: 'Times-Roman',
+    fontWeight: 'bold',
+  },
+
+  footer: {
+    width: '100%',
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    paddingHorizontal: 32,
+
+    position: 'absolute',
+    fontSize: 10,
+    bottom: 30,
+    left: 0,
+    right: 0,
+    textAlign: 'center',
+    color: 'grey',
+  },
+
+  // wrapper
+  generalInfoTable: {
+    width: '100%',
+    marginTop: 8,
+    borderWidth: 1,
+    borderColor: '#000000',
+    borderBottomWidth: 0,
+    fontSize: 12,
+  },
+
+  generalInfoTableRow: {
+    flexDirection: 'row',
+    borderBottomWidth: 1,
+    borderBottomColor: '#000000',
+  },
+
+  // columns
+  generalInfoTableColLabel: {
+    width: '30%',
+    paddingVertical: 6,
+    paddingHorizontal: 8,
+  },
+  generalInfoTableColSeparator: {
+    width: '3%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingVertical: 6,
+  },
+  generalInfoTableColValue: {
+    width: '67%',
+    paddingVertical: 6,
+    paddingHorizontal: 8,
+  },
+
+  generalInfoTableLabelText: {
+    fontWeight: 'bold',
+  },
+  generalInfoTableValueText: {},
+
+  // expense detail table
+  expenseDetailContainer: {
+    width: '100%',
+    marginTop: 12,
+  },
+  expenseDetailTitle: {
+    fontSize: 14,
+    lineHeight: '150%',
+    fontFamily: 'Times-Roman',
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+  kandangExpenseContainer: {
+    width: '100%',
+    marginTop: 8,
+  },
+  kandangExpenseTitle: {
+    fontSize: 14,
+    lineHeight: '150%',
+    fontFamily: 'Times-Roman',
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+  kandangExpenseTable: {
+    width: '100%',
+    marginTop: 8,
+    borderWidth: 1,
+    borderColor: '#000000',
+    borderBottomWidth: 0,
+    fontSize: 12,
+  },
+  kandangExpenseTableRow: {
+    flexDirection: 'row',
+    borderBottomWidth: 1,
+    borderBottomColor: '#000000',
+  },
+  kandangExpenseTableColLabel: {
+    width: '20%',
+    paddingVertical: 6,
+    paddingHorizontal: 8,
+  },
+  kandangExpenseTableColLabelBorderRight: {
+    borderRight: '1px solid #000000',
+  },
+  kandangExpenseTableColNonstock: {
+    width: '20%',
+  },
+  kandangExpenseTableColNote: {
+    width: '40%',
+  },
+  kandangExpenseHeaderLabelText: {
+    fontWeight: 'bold',
+  },
+  kandangExpenseLabelText: {
+    fontSize: 10,
+  },
+  kandangExpenseTableFooterColTotalExpenseCaption: {
+    width: '40%',
+    paddingVertical: 6,
+    paddingHorizontal: 8,
+    textAlign: 'right',
+  },
+  kandangExpenseTableFooterColTotalExpenseValue: {
+    width: '60%',
+    paddingVertical: 6,
+    paddingHorizontal: 8,
+  },
+
+  // utils
+  doubleDivider: {
+    width: '100%',
+    height: 6,
+    borderTop: '2px solid black',
+    borderBottom: '2px solid black',
+  },
+});
+
+const ExpensePDF = ({ expense }: ExpensePDFProps) => {
+  const isLatestApprovalRejected =
+    expense?.latest_approval?.action === 'REJECTED';
+  const isExpenseRealized =
+    expense?.latest_approval?.step_number &&
+    expense?.latest_approval.step_number >= 4;
+
+  const realizationStatus = isExpenseRealized
+    ? 'Sudah Realisasi'
+    : 'Belum Realisasi';
+
+  const rows = [
+    { label: 'Nomor PO', value: expense?.po_number },
+    { label: 'Nomor Referensi', value: expense?.reference_number },
+    {
+      label: 'Kategori',
+      value:
+        expense?.category === 'BOP'
+          ? 'Biaya Operasional'
+          : expense?.category === 'NON-BOP'
+            ? 'Non Biaya Operasional'
+            : '',
+    },
+    { label: 'Lokasi', value: expense?.location.name },
+    {
+      label: 'Kandang',
+      value: expense?.kandangs.map((item) => item.name).join(', '),
+    },
+    { label: 'Vendor', value: expense?.supplier.name },
+    {
+      label: 'Tanggal Transaksi',
+      value: formatDate(expense?.expense_date, 'DD MMMM YYYY'),
+    },
+    {
+      label: 'Tanggal Realisasi',
+      value: expense?.realization_date
+        ? formatDate(expense?.realization_date, 'DD MMMM YYYY')
+        : '-',
+    },
+    { label: 'Nama Pengaju', value: expense?.created_user.name },
+    {
+      label: 'Nominal Biaya',
+      value: formatCurrency(expense?.grand_total ?? 0),
+    },
+    {
+      label: 'Nominal Pengajuan',
+      value: formatCurrency(expense?.total_pengajuan ?? 0),
+    },
+    {
+      label: 'Nominal Realisasi',
+      value: expense?.total_realisasi
+        ? formatCurrency(expense?.total_realisasi ?? 0)
+        : '-',
+    },
+    { label: 'Status Pencairan', value: realizationStatus },
+    {
+      label: 'Status Biaya',
+      value: isLatestApprovalRejected
+        ? 'Ditolak'
+        : expense?.latest_approval?.step_name,
+    },
+  ];
+
+  return (
+    <Document>
+      <Page style={ExpensePDFStyle.page}>
+        <View>
+          <View style={ExpensePDFStyle.companyInfoHeader}>
+            <Image
+              style={ExpensePDFStyle.companyLogo}
+              src='/assets/img/lti-logo.png'
+            />
+
+            <Text style={ExpensePDFStyle.companyInfoHeaderDate}>
+              {formatDate(Date.now(), 'DD MMMM YYYY')}
+            </Text>
+          </View>
+
+          <View>
+            <Text style={ExpensePDFStyle.companyName}>
+              PT LUMBUNG TELUR INDONESIA
+            </Text>
+            <Text style={ExpensePDFStyle.companyAddress}>
+              SOHO Building Lt.3 (Paris Van Java), Jalan Karang Tinggal, Kel.
+              Cipedes, Kec. Sukajadi, Kota Bandung 40162
+            </Text>
+
+            <View style={ExpensePDFStyle.doubleDivider} />
+          </View>
+        </View>
+
+        <Text style={ExpensePDFStyle.title}>
+          Laporan{' '}
+          {expense?.category === 'BOP'
+            ? 'Biaya Operasional'
+            : 'Non-Biaya Operasional'}{' '}
+          {expense?.po_number}
+        </Text>
+
+        {/* General info table */}
+        <View style={ExpensePDFStyle.generalInfoTable}>
+          {rows.map((row) => (
+            <View style={ExpensePDFStyle.generalInfoTableRow} key={row.label}>
+              <View style={ExpensePDFStyle.generalInfoTableColLabel}>
+                <Text style={ExpensePDFStyle.generalInfoTableLabelText}>
+                  {row.label}
+                </Text>
+              </View>
+              <View style={ExpensePDFStyle.generalInfoTableColSeparator}>
+                <Text>:</Text>
+              </View>
+              <View style={ExpensePDFStyle.generalInfoTableColValue}>
+                <Text style={ExpensePDFStyle.generalInfoTableValueText}>
+                  {row.value}
+                </Text>
+              </View>
+            </View>
+          ))}
+        </View>
+
+        {/* Detail expense request */}
+        <View
+          minPresenceAhead={80}
+          style={ExpensePDFStyle.expenseDetailContainer}
+        >
+          <Text style={ExpensePDFStyle.expenseDetailTitle}>
+            Rincian Pengajuan Biaya Operasional
+          </Text>
+
+          {expense?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
+            let expenseRequestTotal = 0;
+
+            kandangExpense.pengajuans?.forEach(
+              (item) => (expenseRequestTotal += item.total_price)
+            );
+
+            return (
+              <View
+                key={kandangExpenseIdx}
+                style={ExpensePDFStyle.kandangExpenseContainer}
+              >
+                <Text style={ExpensePDFStyle.kandangExpenseTitle}>
+                  {kandangExpense.name}
+                </Text>
+
+                <View style={ExpensePDFStyle.kandangExpenseTable}>
+                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ExpensePDFStyle.kandangExpenseTableColNonstock,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Nonstock
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Kuantitas
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Total Biaya
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColNote,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Catatan
+                      </Text>
+                    </View>
+                  </View>
+
+                  {kandangExpense.pengajuans?.map((pengajuan, pengajuanIdx) => (
+                    <View
+                      key={pengajuanIdx}
+                      style={ExpensePDFStyle.kandangExpenseTableRow}
+                    >
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                          ExpensePDFStyle.kandangExpenseTableColNonstock,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {pengajuan.nonstock.name}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {formatNumber(pengajuan.qty)}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {formatCurrency(pengajuan.total_price)}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColNote,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {pengajuan.note}
+                        </Text>
+                      </View>
+                    </View>
+                  ))}
+
+                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseCaption,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Total Biaya Keseluruhan
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseValue,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        {formatCurrency(expenseRequestTotal)}
+                      </Text>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            );
+          })}
+        </View>
+
+        {/* Detail expense realization */}
+        <View
+          minPresenceAhead={80}
+          style={ExpensePDFStyle.expenseDetailContainer}
+        >
+          <Text style={ExpensePDFStyle.expenseDetailTitle}>
+            Rincian Realisasi Biaya Operasional
+          </Text>
+
+          {expense?.kandangs.map((kandangExpense, kandangExpenseIdx) => {
+            let expenseRealizationTotal = 0;
+
+            kandangExpense.realisasi?.forEach(
+              (item) => (expenseRealizationTotal += item.total_price)
+            );
+
+            return (
+              <View
+                key={kandangExpenseIdx}
+                style={ExpensePDFStyle.kandangExpenseContainer}
+              >
+                <Text style={ExpensePDFStyle.kandangExpenseTitle}>
+                  {kandangExpense.name}
+                </Text>
+
+                <View style={ExpensePDFStyle.kandangExpenseTable}>
+                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ExpensePDFStyle.kandangExpenseTableColNonstock,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Nonstock
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Kuantitas
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Total Biaya
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableColLabel,
+                        ExpensePDFStyle.kandangExpenseTableColNote,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Catatan
+                      </Text>
+                    </View>
+                  </View>
+
+                  {kandangExpense.realisasi?.map((realisasi, realisasiIdx) => (
+                    <View
+                      key={realisasiIdx}
+                      style={ExpensePDFStyle.kandangExpenseTableRow}
+                    >
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                          ExpensePDFStyle.kandangExpenseTableColNonstock,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {realisasi.nonstock.name}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {formatNumber(realisasi.qty)}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {formatCurrency(realisasi.total_price)}
+                        </Text>
+                      </View>
+                      <View
+                        style={[
+                          ExpensePDFStyle.kandangExpenseTableColLabel,
+                          ExpensePDFStyle.kandangExpenseTableColNote,
+                        ]}
+                      >
+                        <Text style={ExpensePDFStyle.kandangExpenseLabelText}>
+                          {realisasi.note}
+                        </Text>
+                      </View>
+                    </View>
+                  ))}
+
+                  <View style={[ExpensePDFStyle.kandangExpenseTableRow]}>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseCaption,
+                        ExpensePDFStyle.kandangExpenseTableColLabelBorderRight,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        Total Biaya Keseluruhan
+                      </Text>
+                    </View>
+                    <View
+                      style={[
+                        ExpensePDFStyle.kandangExpenseTableFooterColTotalExpenseValue,
+                      ]}
+                    >
+                      <Text
+                        style={ExpensePDFStyle.kandangExpenseHeaderLabelText}
+                      >
+                        {formatCurrency(expenseRealizationTotal)}
+                      </Text>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            );
+          })}
+        </View>
+
+        <View style={ExpensePDFStyle.footer} fixed>
+          <Link
+            src={`${process.env.NEXT_PUBLIC_LTI_URL}expense/detail?expenseId=${expense?.id}`}
+          >
+            {expense?.po_number}
+          </Link>
+
+          <Text
+            render={({ pageNumber, totalPages }) =>
+              `${pageNumber} / ${totalPages}`
+            }
+            fixed
+          />
+        </View>
+      </Page>
+    </Document>
+  );
+};
+
+export default ExpensePDF;

src/components/pages/expense/pdf/ExpensePDFButton.tsx

@@ -0,0 +1,53 @@
+'use client';
+
+import { pdf } from '@react-pdf/renderer';
+
+import Button from '@/components/Button';
+import { Icon } from '@iconify/react';
+import ExpensePDF from '@/components/pages/expense/pdf/ExpensePDF';
+
+import { Expense } from '@/types/api/expense';
+
+interface ExpensePDFPreviewButtonProps {
+  expense?: Expense;
+}
+
+const ExpensePDFPreviewButton = ({ expense }: ExpensePDFPreviewButtonProps) => {
+  const openPdf = async () => {
+    const expensePdfBlob = await pdf(<ExpensePDF expense={expense} />).toBlob();
+
+    const expensePdfUrl = URL.createObjectURL(expensePdfBlob);
+    window.open(expensePdfUrl, '_blank');
+  };
+
+  const downloadPdf = async () => {
+    const blob = await pdf(<ExpensePDF expense={expense} />).toBlob();
+    const url = URL.createObjectURL(blob);
+
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = `${expense?.po_number}.pdf`;
+    link.click();
+
+    URL.revokeObjectURL(url);
+  };
+
+  return (
+    <div className='w-fit flex flex-col'>
+      <Button onClick={downloadPdf} className='text-xs'>
+        <Icon icon='bx:file' width={16} height={16} />
+        {expense?.po_number}
+      </Button>
+
+      <Button
+        onClick={openPdf}
+        variant='link'
+        className='p-0 mt-1 text-xs justify-start'
+      >
+        Lihat Dokumen
+      </Button>
+    </div>
+  );
+};
+
+export default ExpensePDFPreviewButton;

src/components/pages/inventory/adjustment/form/InventoryAdjustmentForm.tsx

@@ -71,9 +71,8 @@ const InventoryAdjustmentForm = ({
     Partial<InventoryAdjustmentFormValues>
   >(() => {
     return {
-      product_category_id: initialValues?.product_category?.id ?? 0,
-      product_id: initialValues?.product?.id ?? 0,
-      warehouse_id: initialValues?.warehouse?.id ?? 0,
+      product_id: initialValues?.product_warehouse?.product_id ?? 0,
+      warehouse_id: initialValues?.product_warehouse?.warehouse_id ?? 0,
       product_category: undefined,
       product: undefined,
       warehouse: undefined,

src/components/pages/inventory/movement/MovementTable.tsx

@@ -1,24 +1,44 @@
 'use client';
 
-import { useState } from 'react';
+import { ChangeEventHandler, useState } from 'react';
 import useSWR from 'swr';
-import { SortingState } from '@tanstack/react-table';
+import { SortingState, CellContext, ColumnDef } from '@tanstack/react-table';
 
 import Table from '@/components/Table';
-import { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import { Icon } from '@iconify/react';
 import { Movement } from '@/types/api/inventory/movement';
 import { MovementApi } from '@/services/api/inventory';
 import { cn } from '@/lib/helper';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { ROWS_OPTIONS } from '@/config/constant';
-import { TableToolbar } from '@/components/table/TableToolbar';
-import { TableRowSizeSelector } from '@/components/table/TableRowSizeSelector';
 import { OptionType } from '@/components/input/SelectInput';
+import Button from '@/components/Button';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import SelectInput from '@/components/input/SelectInput';
 import RowDropdownOptions from '@/components/table/RowDropdownOptions';
 import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import { TableRowOptions } from '@/components/table/TableRowOptions';
+import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<Movement, unknown>;
+}) => (
+  <RowOptionsMenuWrapper type={type}>
+    <Button
+      href={`/inventory/movement/detail/?movementId=${props.row.original.id}`}
+      variant='ghost'
+      color='primary'
+      className='justify-start text-sm'
+    >
+      <Icon icon='mdi:eye-outline' width={16} height={16} />
+      Detail
+    </Button>
+  </RowOptionsMenuWrapper>
+);
 
 const MovementTable = () => {
   const {
@@ -28,30 +48,24 @@ const MovementTable = () => {
     setPageSize,
     toQueryString: getTableFilterQueryString,
   } = useTableFilter({
-    initial: { search: '' },
-    paramMap: { page: 'page', pageSize: 'limit' },
+    initial: {
+      search: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+    },
   });
 
   const [sorting, setSorting] = useState<SortingState>([]);
-  const [selectedMovement, setSelectedMovement] = useState<
-    Movement | undefined
-  >(undefined);
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
 
-  const deleteModal = useModal();
-
-  const {
-    data: movements,
-    isLoading,
-    mutate: refreshMovements,
-  } = useSWR(
+  const { data: movements, isLoading } = useSWR(
     `${MovementApi.basePath}${getTableFilterQueryString()}`,
     MovementApi.getAllFetcher
   );
 
-  const searchChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
     updateFilter('search', e.target.value);
-    setPage(1);
   };
 
   const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
@@ -60,167 +74,143 @@ const MovementTable = () => {
     setPage(1);
   };
 
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsDeleteLoading(true);
-    try {
-      await MovementApi.delete(selectedMovement?.id as number);
-      refreshMovements();
-      deleteModal.closeModal();
-    } finally {
-      setIsDeleteLoading(false);
-    }
-  };
+  const movementColumns: ColumnDef<Movement>[] = [
+    {
+      header: '#',
+      cell: (props) =>
+        tableFilterState.pageSize * (tableFilterState.page - 1) +
+        props.row.index +
+        1,
+    },
+    {
+      accessorFn: (row) => row.source_warehouse?.name,
+      header: 'Gudang Asal',
+    },
+    {
+      accessorFn: (row) => row.destination_warehouse?.name,
+      header: 'Gudang Tujuan',
+    },
+    {
+      accessorKey: 'transfer_reason',
+      header: 'Catatan',
+    },
+    {
+      accessorKey: 'transfer_date',
+      header: 'Tanggal',
+      cell: (props) =>
+        new Date(props.row.original.transfer_date).toLocaleDateString('id-ID'),
+    },
+    {
+      accessorFn: (row) => {
+        const totalCost = row.deliveries?.reduce(
+          (sum, d) => sum + (d.shipping_cost_total || 0),
+          0
+        );
+        return totalCost?.toLocaleString('id-ID');
+      },
+      header: 'Biaya Pengiriman',
+    },
+    {
+      header: 'Aksi',
+      cell: (props) => {
+        const currentPageSize = props.table.getPaginationRowModel().rows.length;
+        const currentPageRows = props.table.getPaginationRowModel().flatRows;
+        const currentRowRelativeIndex =
+          currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+        const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+        return (
+          <>
+            {currentPageSize > 2 && (
+              <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                <RowOptionsMenu type='dropdown' props={props} />
+              </RowDropdownOptions>
+            )}
+
+            {currentPageSize <= 2 && (
+              <RowCollapseOptions>
+                <RowOptionsMenu type='collapse' props={props} />
+              </RowCollapseOptions>
+            )}
+          </>
+        );
+      },
+    },
+  ];
 
   return (
-    <div className='flex flex-col gap-4'>
-      <div className='flex flex-col gap-2 mb-4'>
-        <TableToolbar
-          addButton={{
-            href: '/inventory/movement/add',
-            label: 'Tambah',
+    <>
+      <div className='w-full p-0 sm:p-4'>
+        <div className='flex flex-col gap-2 mb-4'>
+          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
+            <div className='w-full flex flex-row gap-2'>
+              <Button
+                href='/inventory/movement/add'
+                variant='outline'
+                color='primary'
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='ic:round-plus' width={24} height={24} />
+                Tambah
+              </Button>
+            </div>
+
+            <DebouncedTextInput
+              name='search'
+              placeholder='Cari Movement'
+              value={tableFilterState.search}
+              onChange={searchChangeHandler}
+              className={{ wrapper: 'sm:max-w-3xs' }}
+            />
+          </div>
+
+          <div className='flex justify-end gap-4'>
+            <SelectInput
+              label='Baris'
+              options={ROWS_OPTIONS}
+              value={{
+                label: String(tableFilterState.pageSize),
+                value: tableFilterState.pageSize,
+              }}
+              onChange={pageSizeChangeHandler}
+              className={{
+                wrapper:
+                  'col-span-6 sm:col-span-4 max-w-28 sm:justify-self-end',
+              }}
+            />
+          </div>
+        </div>
+
+        <Table<Movement>
+          data={isResponseSuccess(movements) ? movements?.data : []}
+          columns={movementColumns}
+          pageSize={tableFilterState.pageSize}
+          page={isResponseSuccess(movements) ? movements?.meta?.page : 0}
+          totalItems={
+            isResponseSuccess(movements) ? movements?.meta?.total_results : 0
+          }
+          onPageChange={setPage}
+          isLoading={isLoading}
+          sorting={sorting}
+          setSorting={setSorting}
+          className={{
+            containerClassName: cn({
+              'mb-20':
+                isResponseSuccess(movements) && movements?.data?.length === 0,
+            }),
+            tableWrapperClassName: 'overflow-x-auto min-h-full!',
+            tableClassName: 'font-inter w-full table-auto min-h-full!',
+            headerRowClassName: 'border-b border-b-gray-200',
+            headerColumnClassName:
+              'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+            bodyRowClassName: 'border-b border-b-gray-200',
+            bodyColumnClassName:
+              'px-6 py-3 last:flex last:flex-row last:justify-end',
           }}
-          search={{
-            value: tableFilterState.search,
-            onChange: searchChangeHandler,
-            placeholder: 'Cari Movement',
-          }}
-        />
-        <TableRowSizeSelector
-          value={tableFilterState.pageSize}
-          onChange={pageSizeChangeHandler}
-          options={ROWS_OPTIONS}
         />
       </div>
-
-      <Table<Movement>
-        data={isResponseSuccess(movements) ? movements?.data : []}
-        columns={[
-          {
-            header: '#',
-            cell: (props) =>
-              tableFilterState.pageSize * (tableFilterState.page - 1) +
-              props.row.index +
-              1,
-          },
-          {
-            accessorFn: (row) => row.source_warehouse?.name,
-            header: 'Gudang Asal',
-          },
-          {
-            accessorFn: (row) => row.destination_warehouse?.name,
-            header: 'Gudang Tujuan',
-          },
-          {
-            accessorKey: 'transfer_reason',
-            header: 'Catatan',
-          },
-          {
-            accessorKey: 'transfer_date',
-            header: 'Tanggal',
-            cell: (props) =>
-              new Date(props.row.original.transfer_date).toLocaleDateString(
-                'id-ID'
-              ),
-          },
-          {
-            accessorFn: (row) => {
-              const totalCost = row.deliveries?.reduce(
-                (sum, d) => sum + (d.shipping_cost_total || 0),
-                0
-              );
-              return totalCost?.toLocaleString('id-ID');
-            },
-            header: 'Biaya Pengiriman',
-          },
-          {
-            header: 'Aksi',
-            cell: (props) => {
-              const currentPageSize =
-                props.table.getPaginationRowModel().rows.length;
-              const currentPageRows =
-                props.table.getPaginationRowModel().flatRows;
-              const currentRowRelativeIndex =
-                currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-              const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-              const deleteClickHandler = () => {
-                setSelectedMovement(props.row.original);
-                deleteModal.openModal();
-              };
-
-              return (
-                <>
-                  {currentPageSize > 2 && (
-                    <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                      <TableRowOptions
-                        type='dropdown'
-                        recordId={props.row.original.id}
-                        basePath='/inventory/movement'
-                        queryParam='movementId'
-                        showEdit={false}
-                        showDelete={false}
-                      />
-                    </RowDropdownOptions>
-                  )}
-
-                  {currentPageSize <= 2 && (
-                    <RowCollapseOptions>
-                      <TableRowOptions
-                        type='collapse'
-                        recordId={props.row.original.id}
-                        basePath='/inventory/movement'
-                        queryParam='movementId'
-                        showEdit={false}
-                        showDelete={false}
-                      />
-                    </RowCollapseOptions>
-                  )}
-                </>
-              );
-            },
-          },
-        ]}
-        pageSize={tableFilterState.pageSize}
-        page={isResponseSuccess(movements) ? movements?.meta?.page : 0}
-        totalItems={
-          isResponseSuccess(movements) ? movements?.meta?.total_results : 0
-        }
-        onPageChange={setPage}
-        isLoading={isLoading}
-        sorting={sorting}
-        setSorting={setSorting}
-        className={{
-          containerClassName: cn({
-            'mb-20':
-              isResponseSuccess(movements) && movements?.data?.length === 0,
-          }),
-          tableWrapperClassName: 'overflow-x-auto min-h-full!',
-          tableClassName: 'font-inter w-full table-auto min-h-full!',
-          headerRowClassName: 'border-b border-b-gray-200',
-          headerColumnClassName:
-            'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-          bodyRowClassName: 'border-b border-b-gray-200',
-          bodyColumnClassName:
-            'px-6 py-3 last:flex last:flex-row last:justify-end',
-        }}
-      />
-
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data Movement ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isDeleteLoading,
-          onClick: confirmationModalDeleteClickHandler,
-        }}
-      />
-    </div>
+    </>
   );
 };
 

src/components/pages/inventory/movement/form/MovementForm.schema.ts

@@ -1,34 +1,82 @@
 import * as Yup from 'yup';
 import { Movement } from '@/types/api/inventory/movement';
 
+type MovementFormSchemaType = {
+  transfer_reason: string;
+  transfer_date: string;
+  source_warehouse?: {
+    value: number;
+    label: string;
+    area?: string;
+    location?: string;
+  } | null;
+  source_warehouse_id: number;
+  destination_warehouse?: {
+    value: number;
+    label: string;
+    area?: string;
+    location?: string;
+  } | null;
+  destination_warehouse_id: number;
+  products: {
+    product?: {
+      value: number;
+      label: string;
+    } | null;
+    product_id: number;
+    product_qty: number | string;
+  }[];
+  deliveries: {
+    delivery_cost?: number | string;
+    delivery_cost_per_item?: number | string;
+    document?: File | string | null;
+    document_path?: string | null;
+    driver_name: string;
+    vehicle_plate: string;
+    supplier?: {
+      value: number;
+      label: string;
+    } | null;
+    supplier_id: number;
+    products: {
+      product?: {
+        value: number;
+        label: string;
+      } | null;
+      product_id: number;
+      product_qty: number | string;
+    }[];
+  }[];
+};
+
 export type ProductSchema = {
-  product: {
+  product?: {
     value: number;
     label: string;
   } | null;
   product_id: number;
-  product_qty: number;
+  product_qty: number | string;
 };
 
 export type DeliverySchema = {
-  delivery_cost?: number | undefined;
-  delivery_cost_per_item?: number | undefined;
+  delivery_cost?: number | string;
+  delivery_cost_per_item?: number | string;
   document?: File | string | null;
   document_path?: string | null;
   driver_name: string;
   vehicle_plate: string;
-  supplier: {
+  supplier?: {
     value: number;
     label: string;
   } | null;
   supplier_id: number;
   products: {
-    product: {
+    product?: {
       value: number;
       label: string;
     } | null;
     product_id: number;
-    product_qty: number;
+    product_qty: number | string;
   }[];
 };
 
@@ -102,38 +150,47 @@ const DeliveryObjectSchema: Yup.ObjectSchema<DeliverySchema> = Yup.object({
     .required('Produk wajib diisi!'),
 });
 
-export const MovementFormSchema = Yup.object({
-  transfer_reason: Yup.string().required('Alasan transfer wajib diisi!'),
-  transfer_date: Yup.string().required('Tanggal transfer wajib diisi!'),
-  source_warehouse: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-    area: Yup.string().optional(),
-    location: Yup.string().optional(),
-  }).nullable(),
-  source_warehouse_id: Yup.number()
-    .required('Gudang asal wajib diisi!')
-    .typeError('Gudang asal wajib diisi!'),
-  destination_warehouse: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-    area: Yup.string().optional(),
-    location: Yup.string().optional(),
-  }).nullable(),
-  destination_warehouse_id: Yup.number()
-    .required('Gudang tujuan wajib diisi!')
-    .typeError('Gudang tujuan wajib diisi!'),
-  products: Yup.array()
-    .of(ProductObjectSchema)
-    .min(1, 'Minimal harus ada 1 produk!')
-    .required('Produk wajib diisi!'),
-  deliveries: Yup.array()
-    .of(DeliveryObjectSchema)
-    .min(1, 'Minimal harus ada 1 pengiriman!')
-    .required('Pengiriman wajib diisi!'),
-});
-
-export const UpdateMovementFormSchema = MovementFormSchema;
+export const MovementFormSchema: Yup.ObjectSchema<MovementFormSchemaType> =
+  Yup.object({
+    transfer_reason: Yup.string().required('Alasan transfer wajib diisi!'),
+    transfer_date: Yup.string().required('Tanggal transfer wajib diisi!'),
+    source_warehouse: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+      area: Yup.string().optional(),
+      location: Yup.string().optional(),
+    }).nullable(),
+    source_warehouse_id: Yup.number()
+      .required('Gudang asal wajib diisi!')
+      .typeError('Gudang asal wajib diisi!'),
+    destination_warehouse: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+      area: Yup.string().optional(),
+      location: Yup.string().optional(),
+    }).nullable(),
+    destination_warehouse_id: Yup.number()
+      .required('Gudang tujuan wajib diisi!')
+      .typeError('Gudang tujuan wajib diisi!')
+      .test(
+        'different-warehouse',
+        'Gudang tujuan tidak boleh sama dengan gudang asal!',
+        function (value) {
+          const { source_warehouse_id } = this.parent;
+          return (
+            !value || !source_warehouse_id || value !== source_warehouse_id
+          );
+        }
+      ),
+    products: Yup.array()
+      .of(ProductObjectSchema)
+      .min(1, 'Minimal harus ada 1 produk!')
+      .required('Produk wajib diisi!'),
+    deliveries: Yup.array()
+      .of(DeliveryObjectSchema)
+      .min(1, 'Minimal harus ada 1 pengiriman!')
+      .required('Pengiriman wajib diisi!'),
+  });
 
 export type MovementFormValues = Yup.InferType<typeof MovementFormSchema>;
 

src/components/pages/inventory/movement/form/useMovementFormHandlers.ts

@@ -1,95 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { toast } from 'react-hot-toast';
-import { useModal } from '@/components/Modal';
-import { MovementApi } from '@/services/api/inventory';
-import {
-  CreateMovementPayload,
-  UpdateMovementPayload,
-} from '@/types/api/inventory/movement';
-import { isResponseError } from '@/lib/api-helper';
-
-export const useMovementFormHandlers = (initialValuesId?: number) => {
-  const router = useRouter();
-  const deleteModal = useModal();
-  const [movementFormErrorMessage, setMovementFormErrorMessage] = useState('');
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-
-  const createMovementHandler = useCallback(
-    async (payload: CreateMovementPayload, documents: File[] = []) => {
-      const formData = new FormData();
-      formData.append('data', JSON.stringify(payload));
-      documents.forEach((file, index) => {
-        formData.append(`documents[${index}]`, file);
-      });
-
-      const res = await MovementApi.create(
-        formData as unknown as CreateMovementPayload
-      );
-      if (isResponseError(res)) {
-        setMovementFormErrorMessage(res.message);
-        return;
-      }
-      toast.success(res?.message as string);
-      router.push('/inventory/movement');
-    },
-    [router]
-  );
-
-  const updateMovementHandler = useCallback(
-    async (
-      movementId: number,
-      payload: UpdateMovementPayload,
-      documents: File[] = []
-    ) => {
-      let finalPayload: UpdateMovementPayload | FormData;
-
-      if (documents.length > 0) {
-        const formData = new FormData();
-        formData.append('data', JSON.stringify(payload));
-        documents.forEach((file, index) => {
-          formData.append(`documents[${index}]`, file);
-        });
-
-        finalPayload = formData as unknown as UpdateMovementPayload;
-      } else {
-        finalPayload = payload;
-      }
-
-      const res = await MovementApi.update(movementId, finalPayload);
-      if (res?.status === 'error') {
-        setMovementFormErrorMessage(res.message);
-        return;
-      }
-      toast.success(res?.message as string);
-      router.refresh();
-      router.push('/inventory/movement');
-    },
-    [router]
-  );
-
-  const deleteMovementClickHandler = useCallback(() => {
-    deleteModal.openModal();
-  }, [deleteModal]);
-
-  const confirmationModalDeleteClickHandler = useCallback(async () => {
-    if (!initialValuesId) return;
-
-    setIsDeleteLoading(true);
-    await MovementApi.delete(initialValuesId);
-    deleteModal.closeModal();
-    toast.success('Successfully delete Movement!');
-    setIsDeleteLoading(false);
-    router.push('/inventory/movement');
-  }, [deleteModal, initialValuesId, router]);
-
-  return {
-    deleteModal,
-    movementFormErrorMessage,
-    isDeleteLoading,
-    createMovementHandler,
-    updateMovementHandler,
-    deleteMovementClickHandler,
-    confirmationModalDeleteClickHandler,
-  };
-};

src/components/pages/marketing/MarketingTable.tsx

@@ -2,34 +2,41 @@
 
 import Button from '@/components/Button';
 import CheckboxInput from '@/components/input/CheckboxInput';
-import { OptionType } from '@/components/input/SelectInput';
+import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import Modal, { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import Table from '@/components/Table';
 import RowCollapseOptions from '@/components/table/RowCollapseOptions';
 import RowDropdownOptions from '@/components/table/RowDropdownOptions';
 import { TableRowSizeSelector } from '@/components/table/TableRowSizeSelector';
 import { TableToolbar } from '@/components/table/TableToolbar';
 import { ROWS_OPTIONS } from '@/config/constant';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { cn, formatCurrency, formatVechicleNumber } from '@/lib/helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { cn, formatCurrency, formatDate } from '@/lib/helper';
+import {
+  MarketingApi,
+  SalesOrderApi,
+} from '@/services/api/marketing/marketing';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { Marketing, MarketingProduct } from '@/types/api/marketing/marketing';
-import { Customer } from '@/types/api/master-data/customer';
+import { BaseSalesOrder, Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
-import { CellContext } from '@tanstack/react-table';
+import { CellContext, Row } from '@tanstack/react-table';
+import { useRouter } from 'next/navigation';
 import { useCallback, useState } from 'react';
+import toast from 'react-hot-toast';
 import useSWR from 'swr';
 
 const RowsOptionsMenu = ({
   type = 'dropdown',
   props,
   deleteClickHandler,
+  deliveryClickHandler,
 }: {
   type: 'dropdown' | 'collapse';
   props: CellContext<Marketing, unknown>;
   deleteClickHandler: () => void;
+  deliveryClickHandler?: () => void;
 }) => {
   return (
     <div
@@ -44,7 +51,7 @@ const RowsOptionsMenu = ({
     >
       <div className='flex flex-col gap-1'>
         <Button
-          href={`/marketing/sales-orders/detail/?salesOrderId=${props.row.original.id}`}
+          href={`/marketing/detail?marketingId=${props.row.original.id}`}
           variant='ghost'
           color='primary'
           className='justify-start text-sm'
@@ -52,15 +59,39 @@ const RowsOptionsMenu = ({
           <Icon icon='mdi:eye-outline' width={16} height={16} />
           Detail
         </Button>
-        <Button
-          href={`/marketing/sales-orders/detail/edit/?salesOrderId=${props.row.original.id}`}
-          variant='ghost'
-          color='warning'
-          className='justify-start text-sm'
-        >
-          <Icon icon='mdi:pencil-outline' width={16} height={16} />
-          Edit
-        </Button>
+        {props.row.original.latest_approval.step_number != 1 && (
+          <Button
+            href={
+              props.row.original.latest_approval.step_number == 3
+                ? `/marketing/detail/delivery-orders/edit?marketingId=${props.row.original.id}`
+                : props.row.original.latest_approval.step_number == 2
+                  ? `/marketing/add/delivery-orders?marketingId=${props.row.original.id}`
+                  : undefined
+            }
+            onClick={() => {
+              if (props.row.original.latest_approval.step_number == 2) {
+                deliveryClickHandler?.();
+              }
+            }}
+            variant='ghost'
+            color='success'
+            className='justify-start text-sm'
+          >
+            <Icon icon='mdi:truck' width={16} height={16} />
+            Deliver
+          </Button>
+        )}
+        {props.row.original.latest_approval.step_number != 3 && (
+          <Button
+            href={`/marketing/detail/sales-orders/edit?marketingId=${props.row.original.id}`}
+            variant='ghost'
+            color='warning'
+            className='justify-start text-sm'
+          >
+            <Icon icon='mdi:pencil-outline' width={16} height={16} />
+            Edit
+          </Button>
+        )}
         <Button
           onClick={deleteClickHandler}
           variant='ghost'
@@ -75,19 +106,18 @@ const RowsOptionsMenu = ({
   );
 };
 
-const SalesOrderTable = () => {
+const MarketingTable = () => {
   const [search, setSearch] = useState('');
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
 
-  const [approveAction, setApproveAction] = useState<
-    'approve' | 'reject' | null
-  >(null);
+  const [approveAction, setApproveAction] = useState<'APPROVED' | 'REJECTED'>(
+    'APPROVED'
+  );
   const [selectedItem, setSelectedItem] = useState<Marketing | null>(null);
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
-  const selectedRowIds = Object.keys(rowSelection).filter(
-    (id) => rowSelection[id]
-  );
+
+  const router = useRouter();
 
   const {
     data: marketing,
@@ -98,6 +128,7 @@ const SalesOrderTable = () => {
   const deleteModal = useModal();
   const confirmationModal = useModal();
   const productsModal = useModal();
+  const deliveryModal = useModal();
 
   const searchChangeHandler = useCallback(
     (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -116,12 +147,12 @@ const SalesOrderTable = () => {
   );
 
   const approveClickHandler = () => {
-    setApproveAction('approve');
+    setApproveAction('APPROVED');
     confirmationModal.openModal();
   };
 
   const rejectClickHandler = () => {
-    setApproveAction('reject');
+    setApproveAction('REJECTED');
     confirmationModal.openModal();
   };
 
@@ -130,6 +161,91 @@ const SalesOrderTable = () => {
     productsModal.openModal();
   };
 
+  const deleteMarketingHandler = async () => {
+    const deleteMarketingRes = await MarketingApi.delete(
+      selectedItem?.id as number
+    );
+    if (isResponseSuccess(deleteMarketingRes)) {
+      confirmationModal.closeModal();
+      toast.success(deleteMarketingRes?.message as string);
+    }
+    if (isResponseError(deleteMarketingRes)) {
+      confirmationModal.closeModal();
+      toast.error(deleteMarketingRes?.message as string);
+    }
+    refreshMarketing();
+    deleteModal.closeModal();
+  };
+
+  const allData = isResponseSuccess(marketing) ? marketing.data : [];
+  const selectedRowsData = allData.filter(
+    (row) => rowSelection[row.id.toString()]
+  );
+
+  const hasApprovable = selectedRowsData.some(
+    (row) =>
+      row.latest_approval.step_number === 1 &&
+      row.latest_approval.action !== 'REJECTED'
+  );
+  const hasRejectable = selectedRowsData.some(
+    (row) =>
+      row.latest_approval.step_number === 1 &&
+      row.latest_approval.action !== 'REJECTED'
+  );
+
+  const disableApprove = !hasApprovable;
+  const disableReject = !hasRejectable;
+
+  const idsToProcess =
+    approveAction === 'APPROVED'
+      ? selectedRowsData
+          .filter((row) => row.latest_approval.step_number === 1)
+          .map((row) => row.id)
+      : selectedRowsData
+          .filter((row) => row.latest_approval.step_number === 2)
+          .map((row) => row.id);
+
+  const approveMarketingHandler = async (notes: string) => {
+    let idsToProcess: number[] = [];
+
+    idsToProcess = selectedRowsData
+      .filter((row) => row.latest_approval.step_number === 1)
+      .map((row) => row.id);
+
+    if (idsToProcess.length === 0) {
+      toast.error(`Tidak ada data yang valid untuk di ${approveAction}.`);
+      confirmationModal.closeModal();
+      return;
+    }
+
+    const approveMarketingRes = await SalesOrderApi.bulkApprovals(
+      idsToProcess,
+      approveAction,
+      notes
+    );
+
+    if (isResponseSuccess(approveMarketingRes)) {
+      confirmationModal.closeModal();
+      toast.success(approveMarketingRes?.message as string);
+      setRowSelection({});
+    }
+    if (isResponseError(approveMarketingRes)) {
+      confirmationModal.closeModal();
+      toast.error(approveMarketingRes?.message as string);
+    }
+    refreshMarketing();
+  };
+
+  const confirmationModalDeliveryClickHandler = async (notes: string) => {
+    const res = await SalesOrderApi.delivery(selectedItem?.id as number, notes);
+    deliveryModal.closeModal();
+    toast.success(res?.message as string);
+    refreshMarketing?.();
+    router.push(
+      `/marketing/detail/delivery-orders/edit?marketingId=${selectedItem?.id}`
+    );
+  };
+
   const {
     state: tableFilterState,
     updateFilter,
@@ -144,13 +260,18 @@ const SalesOrderTable = () => {
     },
   });
 
+  const getRowCanSelect = (row: Row<Marketing>): boolean => {
+    const approval = row.original.latest_approval;
+    return approval?.step_number === 1 && approval?.action !== 'REJECTED';
+  };
+
   return (
     <>
       <div className='flex flex-col gap-4'>
         <div className='flex flex-col gap-2 mb-4'>
           <TableToolbar
             addButton={{
-              href: '/marketing/sales-orders/add',
+              href: '/marketing/add/sales-orders',
               label: 'Tambah Sales Order',
             }}
             search={{
@@ -159,17 +280,12 @@ const SalesOrderTable = () => {
               placeholder: 'Cari Sales Order',
             }}
           />
-          <TableRowSizeSelector
-            value={pageSize}
-            onChange={pageSizeChangeHandler}
-            options={ROWS_OPTIONS}
-          />
           <div className='flex flex-row gap-2'>
             <Button
               color='success'
               onClick={approveClickHandler}
               className='justify-start text-sm'
-              disabled={!selectedRowIds.length}
+              disabled={disableApprove}
             >
               <Icon icon='material-symbols:check' width={24} height={24} />
               Approve
@@ -179,41 +295,93 @@ const SalesOrderTable = () => {
               color='error'
               onClick={rejectClickHandler}
               className='justify-start text-sm'
-              disabled={!selectedRowIds.length}
+              disabled={disableReject}
             >
               <Icon icon='material-symbols:close' width={24} height={24} />
               Reject
             </Button>
           </div>
+          <TableRowSizeSelector
+            value={pageSize}
+            onChange={pageSizeChangeHandler}
+            options={ROWS_OPTIONS}
+          >
+            {/* select multiple product */}
+            <SelectInput
+              label='Product'
+              isClearable
+              placeholder='Pilih product'
+              options={[]}
+              isMulti
+            />
+            {/* select status */}
+            <SelectInput
+              label='Status'
+              isClearable
+              placeholder='Pilih status'
+              options={[]}
+            />
+            {/* select customer */}
+            <SelectInput
+              label='Customer'
+              isClearable
+              placeholder='Pilih customer'
+              options={[]}
+            />
+          </TableRowSizeSelector>
         </div>
         <Table
           rowSelection={rowSelection}
           setRowSelection={setRowSelection}
-          data={isResponseSuccess(marketing) ? marketing.data : []}
+          data={allData}
           columns={[
             {
               id: 'select',
-              header: ({ table }) => (
-                <div className='w-full flex flex-row justify-center'>
-                  <CheckboxInput
-                    name='allRow'
-                    checked={table.getIsAllRowsSelected()}
-                    indeterminate={table.getIsSomeRowsSelected()}
-                    onChange={table.getToggleAllRowsSelectedHandler()}
-                  />
-                </div>
-              ),
-              cell: ({ row }) => (
-                <div>
-                  <CheckboxInput
-                    name='row'
-                    checked={row.getIsSelected()}
-                    disabled={!row.getCanSelect()}
-                    indeterminate={row.getIsSomeSelected()}
-                    onChange={row.getToggleSelectedHandler()}
-                  />
-                </div>
-              ),
+              header: ({ table }) => {
+                const allRows = table.getRowModel().rows;
+                const selectableRows = allRows.filter(getRowCanSelect);
+
+                const allSelected =
+                  selectableRows.length > 0 &&
+                  selectableRows.every((row) => row.getIsSelected());
+
+                const someSelected =
+                  selectableRows.some((row) => row.getIsSelected()) &&
+                  !allSelected;
+
+                const toggleSelectableRows = () => {
+                  const shouldSelect = !allSelected;
+                  selectableRows.forEach((row) =>
+                    row.toggleSelected(shouldSelect)
+                  );
+                };
+
+                return (
+                  <div className='w-full flex flex-row justify-center'>
+                    <CheckboxInput
+                      name='allRow'
+                      checked={allSelected}
+                      indeterminate={someSelected}
+                      onChange={toggleSelectableRows}
+                      disabled={selectableRows.length === 0}
+                    />
+                  </div>
+                );
+              },
+              cell: ({ row }) => {
+                const canSelect = getRowCanSelect(row);
+                return (
+                  <div>
+                    <CheckboxInput
+                      name='row'
+                      checked={row.getIsSelected()}
+                      disabled={!canSelect}
+                      indeterminate={row.getIsSomeSelected()}
+                      onChange={row.getToggleSelectedHandler()}
+                    />
+                  </div>
+                );
+              },
             },
             {
               accessorKey: 'so_number',
@@ -222,9 +390,12 @@ const SalesOrderTable = () => {
             {
               accessorKey: 'so_date',
               header: 'Tanggal',
+              cell: (props) => {
+                return formatDate(props.row.original.so_date, 'DD MMM yyyy');
+              },
             },
             {
-              accessorKey: 'approval.step_name',
+              accessorKey: 'latest_approval.step_name',
               header: 'Status',
             },
             {
@@ -232,15 +403,25 @@ const SalesOrderTable = () => {
               header: 'Customer',
             },
             {
-              accessorKey: 'grand_total',
+              accessorFn: (row) =>
+                row.sales_order
+                  ?.map((product) => product.total_price)
+                  .reduce((a, b) => a + b, 0) ?? 0,
               header: 'Grand Total',
+              cell: (props) => {
+                return formatCurrency(
+                  props.row.original?.sales_order
+                    ?.map((product) => product.total_price)
+                    .reduce((a, b) => a + b, 0) ?? 0
+                );
+              },
             },
             {
               accessorKey: 'marketing_products.length',
               header: 'Product Details',
               cell: (props) => {
-                if (props?.row?.original?.marketing_products?.length) {
-                  if (props?.row?.original?.marketing_products?.length > 1) {
+                if (props?.row?.original?.sales_order?.length) {
+                  if (props?.row?.original?.sales_order?.length > 1) {
                     return (
                       <Button
                         variant='link'
@@ -250,12 +431,11 @@ const SalesOrderTable = () => {
                           productsClickHandler(props?.row?.original);
                         }}
                       >
-                        Lihat {props?.row?.original?.marketing_products?.length}{' '}
-                        Produk
+                        Lihat {props?.row?.original?.sales_order?.length} Produk
                       </Button>
                     );
                   } else {
-                    const product = props?.row?.original?.marketing_products[0];
+                    const product = props?.row?.original?.sales_order[0];
                     return <>{product?.product_warehouse?.product?.name}</>;
                   }
                 }
@@ -274,7 +454,15 @@ const SalesOrderTable = () => {
                 const isLast2Rows =
                   currentRowRelativeIndex > currentPageSize - 2;
 
-                const deleteClickHandler = () => {};
+                const deleteClickHandler = () => {
+                  setSelectedItem(props.row.original);
+                  deleteModal.openModal();
+                };
+
+                const deliveryClickHandler = () => {
+                  setSelectedItem(props.row.original);
+                  deliveryModal.openModal();
+                };
 
                 return (
                   <>
@@ -284,6 +472,7 @@ const SalesOrderTable = () => {
                           type='dropdown'
                           props={props}
                           deleteClickHandler={deleteClickHandler}
+                          deliveryClickHandler={deliveryClickHandler}
                         />
                       </RowDropdownOptions>
                     )}
@@ -294,6 +483,7 @@ const SalesOrderTable = () => {
                           type='collapse'
                           props={props}
                           deleteClickHandler={deleteClickHandler}
+                          deliveryClickHandler={deliveryClickHandler}
                         />
                       </RowCollapseOptions>
                     )}
@@ -330,16 +520,45 @@ const SalesOrderTable = () => {
         }}
       />
 
-      <ConfirmationModal
+      <ConfirmationModalWithNotes
         ref={confirmationModal.ref}
-        type={approveAction === 'approve' ? 'success' : 'error'}
-        text={`Apakah anda yakin ingin ${approveAction} data penjualan (${selectedRowIds.length} data)?`}
+        type={approveAction === 'APPROVED' ? 'success' : 'error'}
+        text={`Apakah anda yakin ingin ${approveAction == 'APPROVED' ? 'approve' : 'reject'} data penjualan (${idsToProcess.length} data)?`}
+        secondaryButton={{
+          text: 'Tidak',
+          onClick: confirmationModal.closeModal,
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: approveAction === 'APPROVED' ? 'success' : 'error',
+          onClick: approveMarketingHandler,
+        }}
+      />
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data penjualan ini?`}
+        secondaryButton={{
+          text: 'Tidak',
+          onClick: deleteModal.closeModal,
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          onClick: deleteMarketingHandler,
+        }}
+      />
+      <ConfirmationModalWithNotes
+        ref={deliveryModal.ref}
+        type={'success'}
+        text={`Apakah anda yakin ingin deliver penjualan ${selectedItem?.so_number}?`}
         secondaryButton={{
           text: 'Tidak',
         }}
         primaryButton={{
           text: 'Ya',
-          color: approveAction === 'approve' ? 'success' : 'error',
+          color: 'success',
+          onClick: confirmationModalDeliveryClickHandler,
         }}
       />
 
@@ -361,10 +580,10 @@ const SalesOrderTable = () => {
             <Icon icon='mdi:close' width={16} height={16} />
           </Button>
         </div>
-        <Table<MarketingProduct>
+        <Table<BaseSalesOrder>
           data={
             isResponseSuccess(marketing) && selectedItem
-              ? (selectedItem?.marketing_products ?? [])
+              ? (selectedItem?.sales_order ?? [])
               : []
           }
           columns={[
@@ -403,4 +622,4 @@ const SalesOrderTable = () => {
     </>
   );
 };
-export default SalesOrderTable;
+export default MarketingTable;

src/components/pages/marketing/detail/MarketingDetail.tsx

@@ -0,0 +1,477 @@
+'use client';
+
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
+import ApprovalSteps, {
+  useApprovalSteps,
+} from '@/components/pages/ApprovalSteps';
+import Table from '@/components/Table';
+import { MARKETING_APPROVAL_LINE } from '@/config/approval-line';
+import {
+  cn,
+  formatCurrency,
+  formatDate,
+  formatNumber,
+  formatVechicleNumber,
+} from '@/lib/helper';
+import {
+  MarketingApi,
+  SalesOrderApi,
+} from '@/services/api/marketing/marketing';
+import {
+  BaseDelivery,
+  BaseSalesOrder,
+  Marketing,
+} from '@/types/api/marketing/marketing';
+import { Icon } from '@iconify/react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+import SalesOrderExport from '@/components/pages/marketing/pdf/SalesOrderExport';
+import DeliveryOrderExport from '@/components/pages/marketing/pdf/DeliveryOrderExport';
+
+const MarketingDetail = ({
+  initialValues,
+  refresh,
+}: {
+  initialValues?: Marketing;
+  refresh?: () => void;
+}) => {
+  const router = useRouter();
+  const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
+    'APPROVED'
+  );
+  const [grandTotal, setGrandTotal] = useState(
+    initialValues?.sales_order
+      ?.map((item) => item.total_price)
+      .reduce((a, b) => a + b, 0)
+  );
+  const [isLoading, setIsLoading] = useState(false);
+
+  const deleteModal = useModal();
+  const confirmationModal = useModal();
+  const deliveryModal = useModal();
+  const {
+    approvals,
+    isLoading: isLoadingApproval,
+    refresh: refreshApproval,
+  } = useApprovalSteps({
+    latestApproval: initialValues?.latest_approval,
+    approvalLines: MARKETING_APPROVAL_LINE,
+    moduleName: 'MARKETINGS',
+    moduleId: initialValues?.id as number as unknown as string,
+  });
+
+  const approveClickHandler = () => {
+    setApprovalAction('APPROVED');
+    confirmationModal.openModal();
+  };
+
+  const rejectClickHandler = () => {
+    setApprovalAction('REJECTED');
+    confirmationModal.openModal();
+  };
+
+  const deliveryClickHandler = () => {
+    deliveryModal.openModal();
+  };
+
+  const deleteClickHandler = () => {
+    deleteModal.openModal();
+  };
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsLoading(true);
+    const res = await MarketingApi.delete(initialValues?.id as number);
+    deleteModal.closeModal();
+    router.push('/marketing');
+    toast.success(res?.message as string);
+    refresh?.();
+    setIsLoading(false);
+  };
+
+  const confirmationModalApproveClickHandler = async (notes: string) => {
+    setIsLoading(true);
+    const res = await SalesOrderApi.singleApproval(
+      initialValues?.id as number,
+      approvalAction,
+      notes
+    );
+    setIsLoading(false);
+    confirmationModal.closeModal();
+    toast.success(res?.message as string);
+    refresh?.();
+    refreshApproval?.();
+  };
+
+  const confirmationModalDeliveryClickHandler = async (notes: string) => {
+    setIsLoading(true);
+    const res = await SalesOrderApi.delivery(
+      initialValues?.id as number,
+      notes
+    );
+    setIsLoading(false);
+    deliveryModal.closeModal();
+    toast.success(res?.message as string);
+    refresh?.();
+    refreshApproval?.();
+    router.push(
+      `/marketing/detail/delivery-orders/edit?marketingId=${initialValues?.id}`
+    );
+  };
+
+  return (
+    <>
+      <div className='flex flex-col w-full gap-4'>
+        <FormHeader title='Detail Sales Order' backUrl='/marketing' />
+        {!isLoadingApproval && approvals && (
+          <ApprovalSteps approvals={approvals} />
+        )}
+        <div className='flex-row flex gap-3'>
+          {initialValues?.latest_approval?.step_number == 1 && (
+            <>
+              <Button
+                color='success'
+                onClick={approveClickHandler}
+                disabled={
+                  initialValues?.latest_approval?.step_number == 1 &&
+                  initialValues?.latest_approval?.action == 'REJECTED'
+                }
+              >
+                <Icon icon='mdi:check' width={24} height={24} />
+                Approve
+              </Button>
+              <Button
+                color='error'
+                onClick={rejectClickHandler}
+                disabled={
+                  initialValues?.latest_approval?.step_number == 1 &&
+                  initialValues?.latest_approval?.action == 'REJECTED'
+                }
+              >
+                <Icon icon='mdi:close' width={24} height={24} />
+                Reject
+              </Button>
+            </>
+          )}
+          {initialValues?.latest_approval?.step_number != 1 && (
+            <Button
+              color='success'
+              href={
+                initialValues?.latest_approval?.step_number == 3
+                  ? `/marketing/detail/delivery-orders/edit?marketingId=${initialValues?.id}`
+                  : `/marketing/add/delivery-orders?marketingId=${initialValues?.id}`
+              }
+            >
+              <Icon icon='mdi:truck' width={24} height={24} />
+              {initialValues?.latest_approval?.step_number == 3
+                ? 'Edit '
+                : 'Tambah '}
+              Delivery Order
+            </Button>
+          )}
+        </div>
+
+        <Card
+          title='Informasi Penjualan'
+          className={{
+            wrapper: 'w-full bg-white',
+          }}
+        >
+          <div className='overflow-x-auto rounded-box border border-base-content/5 bg-base-100 mt-3'>
+            <table className='table'>
+              <tbody>
+                <tr>
+                  <td width='45%' className='font-semibold'>
+                    No. Sales Order
+                  </td>
+                  <td>:</td>
+                  <td width='50%'>{initialValues?.so_number}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Nama Pelanggan</td>
+                  <td>:</td>
+                  <td>{initialValues?.customer?.name}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Status</td>
+                  <td>:</td>
+                  <td>{initialValues?.latest_approval?.step_name}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Tanggal Penjualan</td>
+                  <td>:</td>
+                  <td>{formatDate(initialValues?.so_date, 'DD MMM yyyy')}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Total Penjualan</td>
+                  <td>:</td>
+                  <td>{formatCurrency(grandTotal as number)}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Catatan</td>
+                  <td>:</td>
+                  <td>{initialValues?.notes ?? '-'}</td>
+                </tr>
+                <tr>
+                  <td className='font-semibold'>Dokumen</td>
+                  <td>:</td>
+                  <td>
+                    <SalesOrderExport data={initialValues} />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </Card>
+        {initialValues?.sales_order && (
+          <Card
+            title='Informasi Produk'
+            className={{
+              wrapper: 'w-full bg-white',
+            }}
+          >
+            <Table<BaseSalesOrder>
+              data={initialValues?.sales_order}
+              columns={[
+                {
+                  header: 'Kandang',
+                  accessorFn(row) {
+                    return row.product_warehouse.warehouse.name;
+                  },
+                },
+                {
+                  header: 'Produk',
+                  accessorFn(row) {
+                    return row.product_warehouse.product.name;
+                  },
+                },
+                {
+                  header: 'Harga Satuan (Rp)',
+                  accessorFn(row) {
+                    return formatCurrency(row.unit_price);
+                  },
+                },
+                {
+                  header: 'Total Bobot (Kg)',
+                  accessorFn(row) {
+                    return formatNumber(row.total_weight);
+                  },
+                },
+                {
+                  header: 'Kuantitas',
+                  accessorFn(row) {
+                    return formatNumber(row.qty);
+                  },
+                },
+                {
+                  header: 'Avg. Bobot (Kg)',
+                  accessorFn(row) {
+                    return formatNumber(row.avg_weight);
+                  },
+                },
+                {
+                  header: 'Total Penjualan (Rp)',
+                  accessorFn(row) {
+                    return formatCurrency(row.total_price);
+                  },
+                },
+              ]}
+              className={{
+                containerClassName: cn({
+                  'mb-20':
+                    initialValues?.sales_order &&
+                    initialValues?.sales_order?.length === 0,
+                }),
+                tableWrapperClassName: 'overflow-x-auto min-h-full!',
+                tableClassName: 'font-inter w-full table-auto min-h-full!',
+                headerRowClassName: 'border-b border-b-gray-200',
+                headerColumnClassName:
+                  'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+                bodyRowClassName: 'border-b border-b-gray-200',
+                bodyColumnClassName:
+                  'px-6 py-3 last:flex last:flex-row last:justify-end',
+                paginationClassName: 'hidden',
+              }}
+            />
+          </Card>
+        )}
+        {initialValues?.delivery_order && (
+          <Card
+            title='Informasi Pengiriman'
+            className={{
+              wrapper: 'w-full bg-white',
+            }}
+          >
+            {initialValues?.delivery_order.map((delivery, index) => {
+              return (
+                <div key={index}>
+                  <Card
+                    className={{
+                      wrapper: 'w-full',
+                    }}
+                  >
+                    <div className='flex flex-row gap-3'>
+                      <div className='font-semibold'>
+                        Nomor DO : {delivery.do_number}
+                      </div>
+                    </div>
+                    <Table<BaseDelivery>
+                      data={delivery.deliveries}
+                      columns={[
+                        {
+                          header: 'Tanggal Pengiriman',
+                          accessorFn() {
+                            return formatDate(
+                              delivery.delivery_date,
+                              'DD MMM yyyy'
+                            );
+                          },
+                        },
+                        {
+                          header: 'No. Polisi',
+                          accessorFn(row) {
+                            return formatVechicleNumber(row.vehicle_number);
+                          },
+                        },
+                        {
+                          header: 'Kandang',
+                          accessorFn(row) {
+                            return row.product_warehouse.warehouse.name;
+                          },
+                        },
+                        {
+                          header: 'Produk',
+                          accessorFn(row) {
+                            return row.product_warehouse.product.name;
+                          },
+                        },
+                        {
+                          header: 'Harga Satuan (Rp)',
+                          accessorFn(row) {
+                            return formatCurrency(row.unit_price);
+                          },
+                        },
+                        {
+                          header: 'Total Bobot (Kg)',
+                          accessorFn(row) {
+                            return formatNumber(row.total_weight);
+                          },
+                        },
+                        {
+                          header: 'Kuantitas',
+                          accessorFn(row) {
+                            return formatNumber(row.qty);
+                          },
+                        },
+                        {
+                          header: 'Avg. Bobot (Kg)',
+                          accessorFn(row) {
+                            return formatNumber(row.avg_weight);
+                          },
+                        },
+                        {
+                          header: 'Total Penjualan (Rp)',
+                          accessorFn(row) {
+                            return formatCurrency(row.total_price);
+                          },
+                        },
+                      ]}
+                      className={{
+                        containerClassName: cn({
+                          'mb-20':
+                            initialValues?.sales_order &&
+                            initialValues?.sales_order?.length === 0,
+                        }),
+                        tableWrapperClassName: 'overflow-x-auto min-h-full!',
+                        tableClassName:
+                          'font-inter w-full table-auto min-h-full!',
+                        headerRowClassName: 'border-b border-b-gray-200',
+                        headerColumnClassName:
+                          'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+                        bodyRowClassName: 'border-b border-b-gray-200',
+                        bodyColumnClassName:
+                          'px-6 py-3 last:flex last:flex-row last:justify-end',
+                        paginationClassName: 'hidden',
+                      }}
+                    />
+                  </Card>
+                  <div className='flex flex-row gap-3 my-3'>
+                    <DeliveryOrderExport
+                      data={initialValues}
+                      deliveryOrder={delivery}
+                    />
+                  </div>
+                </div>
+              );
+            })}
+          </Card>
+        )}
+        <div className='flex flex-row gap-3'>
+          {initialValues?.latest_approval?.step_number != 3 && (
+            <Button
+              color='warning'
+              type='button'
+              href={`/marketing/detail/${initialValues?.latest_approval.step_number == 3 ? 'delivery-orders' : 'sales-orders'}/edit?marketingId=${initialValues?.id}`}
+            >
+              <Icon icon='mdi:pencil' width={24} height={24} />
+              Edit
+            </Button>
+          )}
+          <Button color='error' onClick={deleteClickHandler}>
+            <Icon icon='mdi:delete' width={24} height={24} />
+            Hapus
+          </Button>
+        </div>
+      </div>
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data penjualan ini?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isLoading,
+          onClick: confirmationModalDeleteClickHandler,
+        }}
+      />
+      <ConfirmationModalWithNotes
+        ref={confirmationModal.ref}
+        type={approvalAction === 'APPROVED' ? 'success' : 'error'}
+        text={`Apakah anda yakin ingin ${approvalAction == 'APPROVED' ? 'approve' : 'reject'} data penjualan ini?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: approvalAction === 'APPROVED' ? 'success' : 'error',
+          isLoading: isLoading,
+          onClick: confirmationModalApproveClickHandler,
+        }}
+      />
+      <ConfirmationModalWithNotes
+        ref={deliveryModal.ref}
+        type={'success'}
+        text={`Apakah anda yakin ingin deliver penjualan ini?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'success',
+          isLoading: isLoading,
+          onClick: confirmationModalDeliveryClickHandler,
+        }}
+      />
+    </>
+  );
+};
+
+export default MarketingDetail;

src/components/pages/marketing/form/MarketingForm.schema.ts

@@ -0,0 +1,77 @@
+import * as Yup from 'yup';
+import {
+  SalesOrderProductFormValues,
+  SalesOrderProductSchema,
+} from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+import {
+  DeliveryOrderProductFormValues,
+  DeliveryOrderProductSchema,
+} from './repeater/delivery-order/DeliverOrderProduct.schema';
+
+type MarketingSchemaType = {
+  customer_id: number | undefined;
+  sales_person_id: number | undefined;
+  customer:
+    | {
+        value: number;
+        label: string;
+      }
+    | undefined
+    | null;
+  so_date: string | undefined;
+  notes: string | undefined;
+};
+
+type SalesOrderSchemaType = MarketingSchemaType & {
+  sales_order: SalesOrderProductFormValues[];
+};
+
+type DeliveryOrderSchemaType = {
+  delivery_order: DeliveryOrderProductFormValues[];
+};
+
+export const SalesOrderSchema: Yup.ObjectSchema<SalesOrderSchemaType> =
+  Yup.object({
+    customer_id: Yup.number().required('Customer wajib diisi!'),
+    sales_person_id: Yup.number().required('Sales Person wajib diisi!'),
+    customer: Yup.object({
+      value: Yup.number().required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    so_date: Yup.string().required('Tanggal wajib diisi!'),
+    notes: Yup.string().required('Catatan wajib diisi!'),
+    sales_order: Yup.array()
+      .of(SalesOrderProductSchema)
+      .min(1, 'Produk wajib diisi!')
+      .required('Produk wajib diisi!'),
+  });
+
+export const DeliveryOrderSchema: Yup.ObjectSchema<DeliveryOrderSchemaType> =
+  Yup.object({
+    delivery_order: Yup.array()
+      .min(1, 'Pengiriman wajib diisi!')
+      .required('Pengiriman wajib diisi!')
+      .test(
+        'at-least-one-valid-row',
+        'Minimal ada satu baris pengiriman yang valid!',
+        function (items) {
+          if (!items || items.length === 0) return false;
+
+          // VALIDASI: minimal 1 item valid full
+          const itemSchema = DeliveryOrderProductSchema;
+
+          const hasValidItem = items.some((item) => {
+            if (!item) return false;
+            return itemSchema.isValidSync(item, { abortEarly: true });
+          });
+
+          return hasValidItem;
+        }
+      ),
+  });
+
+export const UpdateSalesOrderSchema = SalesOrderSchema;
+
+export type SalesOrderFormValues = Yup.InferType<typeof SalesOrderSchema>;
+
+export type DeliveryOrderFormValues = Yup.InferType<typeof DeliveryOrderSchema>;

src/components/pages/marketing/form/MarketingForm.tsx

@@ -0,0 +1,802 @@
+'use client';
+
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import DateInput from '@/components/input/DateInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import TextArea from '@/components/input/TextArea';
+import Modal, { useModal } from '@/components/Modal';
+import { formatCurrency, formatDate } from '@/lib/helper';
+import {
+  BaseDeliveryOrder,
+  BaseSalesOrder,
+  CreateDeliveryOrderPayload,
+  CreateSalesOrderPayload,
+  CreateSalesOrderProductPayload,
+  Marketing,
+  UpdateDeliveryOrderPayload,
+  UpdateSalesOrderPayload,
+} from '@/types/api/marketing/marketing';
+import { Icon } from '@iconify/react';
+import { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { Customer } from '@/types/api/master-data/customer';
+import { CustomerApi } from '@/services/api/master-data';
+import { useFormik } from 'formik';
+import {
+  DeliveryOrderFormValues,
+  DeliveryOrderSchema,
+  SalesOrderFormValues,
+  SalesOrderSchema,
+} from './MarketingForm.schema';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import {
+  DeliveryOrderApi,
+  MarketingApi,
+  SalesOrderApi,
+} from '@/services/api/marketing/marketing';
+import { SalesOrderProductFormValues } from './repeater/sales-order/SalesOrderProduct.schema';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import toast from 'react-hot-toast';
+import { useRouter } from 'next/navigation';
+import SalesOrderProductTable from './table-view/SalesOrderProductTable';
+import SalesOrderProductForm from './repeater/sales-order/SalesOrderProductForm';
+import DeliveryOrderProductTable from './table-view/DeliveryOrderProductTable';
+import DeliveryOrderProductForm from './repeater/delivery-order/DeliverOrderProduct';
+import { DeliveryOrderProductFormValues } from './repeater/delivery-order/DeliverOrderProduct.schema';
+import DebouncedTextArea from '@/components/input/DebouncedTextArea';
+
+const MemoizedSalesOrderProductTable = memo(SalesOrderProductTable);
+const MemoizedSalesOrderProductForm = memo(SalesOrderProductForm);
+const MemoizedDeliveryOrderProductTable = memo(DeliveryOrderProductTable);
+const MemoizedDeliveryOrderProductForm = memo(DeliveryOrderProductForm);
+
+// ================== EXTERNAL HELPER FUNCTION ==================
+export interface ProductCalculationFields {
+  qty: string | number | undefined;
+  unit_price: string | number | undefined;
+  total_price: string | number | undefined;
+  avg_weight: string | number | undefined;
+  total_weight: string | number | undefined;
+}
+
+export const SalesProductToFieldValues = (
+  product: BaseSalesOrder
+): SalesOrderProductFormValues => {
+  return {
+    id: product.id,
+    vehicle_number: product.vehicle_number,
+    kandang_id: product.product_warehouse.warehouse.id,
+    kandang: {
+      value: product.product_warehouse.warehouse.id,
+      label: product.product_warehouse.warehouse.name,
+    },
+    product_warehouse: {
+      value: product.product_warehouse.id,
+      label: product.product_warehouse.product.name,
+    },
+    product_warehouse_id: product.product_warehouse.id,
+    unit_price: product.unit_price,
+    total_weight: product.total_weight,
+    qty: product.qty,
+    avg_weight: product.avg_weight,
+    total_price: product.total_price,
+  };
+};
+export const DeliveryProductToFieldValues = (
+  salesOrders: BaseSalesOrder[],
+  delivery: BaseDeliveryOrder
+): DeliveryOrderProductFormValues[] => {
+  const data = delivery.deliveries.map((item) => {
+    const soId = salesOrders.find(
+      (so) => so.product_warehouse.id === item.product_warehouse.id
+    )?.id;
+    return {
+      id: soId,
+      unit_price: item.unit_price,
+      total_weight: item.total_weight,
+      qty: item.qty,
+      avg_weight: item.avg_weight,
+      total_price: item.total_price,
+      vehicle_number: item.vehicle_number,
+      delivery_date: formatDate(delivery.delivery_date, 'yyyy-MM-DD'),
+      do_number: delivery.do_number,
+      marketing_product_id: soId,
+      marketing_product: {
+        id: soId,
+        vehicle_number: item.vehicle_number,
+        kandang_id: item.product_warehouse.warehouse.id,
+        kandang: {
+          value: item.product_warehouse.warehouse.id,
+          label: item.product_warehouse.warehouse.name,
+        },
+        product_warehouse: {
+          value: item.product_warehouse.id,
+          label: item.product_warehouse.product.name,
+        },
+        product_warehouse_id: item.product_warehouse.id,
+        unit_price: item.unit_price,
+        total_weight: item.total_weight,
+        qty: item.qty,
+        avg_weight: item.avg_weight,
+        total_price: item.total_price,
+      },
+    } as DeliveryOrderProductFormValues;
+  });
+  return data;
+};
+export const mergeSOwithDO = (
+  salesOrders: SalesOrderProductFormValues[],
+  deliveryOrders: DeliveryOrderProductFormValues[]
+): DeliveryOrderProductFormValues[] => {
+  return salesOrders.map((so) => {
+    const delivery = deliveryOrders.find(
+      (d) => d?.marketing_product_id === so.id
+    );
+
+    return {
+      ...so, // nilai dasar dari sales order
+      marketing_product_id: so.id,
+      delivery_date: delivery?.delivery_date || undefined,
+      do_number: delivery?.do_number || undefined,
+      vehicle_number: delivery?.vehicle_number || so.vehicle_number,
+      unit_price: delivery?.unit_price,
+      total_weight: delivery?.total_weight,
+      qty: delivery?.qty,
+      avg_weight: delivery?.avg_weight,
+      total_price: delivery?.total_price,
+      marketing_product: so, // jika ada, override
+    } as DeliveryOrderProductFormValues;
+  });
+};
+export const recalculate = (
+  field: string,
+  values: ProductCalculationFields
+) => {
+  console.log('Values');
+  console.log(values);
+  const { qty, unit_price, total_price, avg_weight, total_weight } = values;
+  const result: Partial<ProductCalculationFields> = {};
+  if (field == 'unit_price' || field == 'total_price' || field == 'qty') {
+    if (qty && unit_price && (field == 'unit_price' || field == 'qty')) {
+      result.total_price = Number(qty) * Number(unit_price);
+    } else if (qty && total_price && field == 'total_price') {
+      result.unit_price = Number(total_price) / Number(qty);
+    }
+  }
+  if (field == 'avg_weight' || field == 'total_weight' || field == 'qty') {
+    if (qty && avg_weight && (field == 'avg_weight' || field == 'qty')) {
+      result.total_weight = Number(qty) * Number(avg_weight);
+    } else if (qty && total_weight && field == 'total_weight') {
+      result.avg_weight = Number(total_weight) / Number(qty);
+    }
+  }
+  console.log('Result');
+  console.log(result);
+  return result;
+};
+export const getSubmitField = (values: ProductCalculationFields) => {
+  const { qty, unit_price, total_price, avg_weight, total_weight } = values;
+
+  // Harga logic
+  if (qty && unit_price && !total_price) {
+    return 'unit_price';
+  }
+  if (qty && total_price && !unit_price) {
+    return 'total_price';
+  }
+
+  // Bobot logic
+  if (qty && avg_weight && !total_weight) {
+    return 'avg_weight';
+  }
+  if (qty && total_weight && !avg_weight) {
+    return 'total_weight';
+  }
+
+  // Tidak ada yang perlu dihitung
+  return '';
+};
+
+const MarketingForm = ({
+  formType = 'add',
+  initialValues,
+  afterSubmit,
+}: {
+  formType?: 'add' | 'edit' | 'add_deliver' | 'edit_deliver';
+  initialValues?: Marketing;
+  afterSubmit?: () => void;
+}) => {
+  const router = useRouter();
+  const deleteModal = useModal();
+
+  const [isLoading, setIsLoading] = useState(false);
+  const [selectedMarketingProduct, setSelectedMarketingProduct] =
+    useState<SalesOrderProductFormValues | null>(null);
+  const [selectedDeliveryProduct, setSelectedDeliveryProduct] =
+    useState<DeliveryOrderProductFormValues | null>(null);
+  const [deliveryFormState, setDeliveryFormState] = useState<'add' | 'edit'>(
+    'add'
+  );
+  const [deliveryOrderValues, setDeliveryOrderValues] = useState<
+    DeliveryOrderProductFormValues[]
+  >(
+    mergeSOwithDO(
+      initialValues?.sales_order?.map(SalesProductToFieldValues) ?? [],
+      initialValues?.delivery_order?.flatMap((delivery) =>
+        DeliveryProductToFieldValues(initialValues.sales_order, delivery)
+      ) ?? []
+    )
+  );
+
+  // ================== REPEATER ==================
+  const addSOModal = useModal();
+  const addDOModal = useModal();
+  const [rowSOSelection, setRowSOSelection] = useState<Record<string, boolean>>(
+    {}
+  );
+  const selectedRowSOIds = Object.keys(rowSOSelection).map((item) =>
+    parseInt(item)
+  );
+
+  // ================== FETCH OPTIONS ==================
+  const {
+    options: customerOptions,
+    isLoadingOptions: isLoadingCustomerOptions,
+  } = useSelect<Customer>(CustomerApi.basePath, 'id', 'name');
+
+  // ================== SETUP FORMIK ==================
+  const formikInitialValues = useMemo<
+    SalesOrderFormValues & DeliveryOrderFormValues
+  >(() => {
+    return {
+      so_date: initialValues?.so_date || undefined,
+      notes: initialValues?.notes || undefined,
+      customer_id: initialValues?.customer?.id || undefined,
+      sales_person_id: initialValues?.sales_person?.id || 1,
+      customer: initialValues?.customer
+        ? {
+            value: initialValues.customer.id,
+            label: initialValues.customer.name,
+          }
+        : null,
+      sales_order:
+        initialValues?.sales_order?.map((product) =>
+          SalesProductToFieldValues(product)
+        ) ?? [],
+      delivery_order: mergeSOwithDO(
+        initialValues?.sales_order?.map(SalesProductToFieldValues) ?? [],
+        initialValues?.delivery_order?.flatMap((delivery) =>
+          DeliveryProductToFieldValues(initialValues.sales_order, delivery)
+        ) ?? []
+      ),
+    };
+  }, [initialValues]);
+  const formik = useFormik<SalesOrderFormValues & DeliveryOrderFormValues>({
+    enableReinitialize: true,
+    initialValues: formikInitialValues,
+    validationSchema:
+      formType == 'add_deliver' || formType == 'edit_deliver'
+        ? DeliveryOrderSchema
+        : SalesOrderSchema,
+    validateOnMount: true,
+    onSubmit: async (values) => {
+      const payload =
+        formType != 'add_deliver' && formType != 'edit_deliver'
+          ? ({
+              customer_id: values.customer_id as number,
+              sales_person_id: values.sales_person_id as number,
+              date: formatDate(values.so_date as string, 'yyyy-MM-DD'),
+              notes: values.notes as string,
+              marketing_products: values.sales_order.map((product) => {
+                return {
+                  vehicle_number: product.vehicle_number as string,
+                  kandang_id: product.kandang_id as number,
+                  product_warehouse_id: product.product_warehouse_id as number,
+                  unit_price: parseFloat(product.unit_price as string),
+                  total_weight: parseFloat(product.total_weight as string),
+                  qty: parseFloat(product.qty as string),
+                  avg_weight: parseFloat(product.avg_weight as string),
+                  total_price: parseFloat(product.total_price as string),
+                } as CreateSalesOrderProductPayload;
+              }),
+            } as CreateSalesOrderPayload)
+          : ({
+              marketing_id: initialValues?.id as number,
+              delivery_products: values.delivery_order
+                .map((product) => {
+                  if (Boolean(product.delivery_date)) {
+                    return {
+                      marketing_product_id:
+                        product.marketing_product_id as number,
+                      unit_price: parseFloat(product.unit_price as string),
+                      total_weight: parseFloat(product.total_weight as string),
+                      qty: parseFloat(product.qty as string),
+                      avg_weight: parseFloat(product.avg_weight as string),
+                      total_price: parseFloat(product.total_price as string),
+                      delivery_date: formatDate(
+                        product.delivery_date as string,
+                        'yyyy-MM-DD'
+                      ),
+                      vehicle_number: product.vehicle_number,
+                    };
+                  }
+                })
+                .filter((item) => Boolean(item)),
+            } as UpdateDeliveryOrderPayload);
+      console.log('PAYLOAD');
+      console.log(payload);
+      switch (formType) {
+        case 'add':
+          await createMarketingHandler(payload as CreateSalesOrderPayload);
+          break;
+        case 'edit':
+          await updateMarketingHandler(payload as UpdateSalesOrderPayload);
+          break;
+        case 'add_deliver':
+          await createDeliveryHandler(payload as CreateDeliveryOrderPayload);
+          break;
+        case 'edit_deliver':
+          await updateDeliveryHandler(payload as UpdateDeliveryOrderPayload);
+          break;
+        default:
+          break;
+      }
+      afterSubmit?.();
+    },
+  });
+
+  // ================== FORM REPEATER HANDLER ==================
+  const createMarketingHandler = async (values: CreateSalesOrderPayload) => {
+    setIsLoading(true);
+    console.log(values);
+    const createMarketingRes = await SalesOrderApi.create(values);
+    if (isResponseSuccess(createMarketingRes)) {
+      toast.success(createMarketingRes?.message as string);
+      router.push('/marketing');
+    }
+    if (isResponseError(createMarketingRes)) {
+      toast.error(createMarketingRes?.message as string);
+    }
+    setIsLoading(false);
+  };
+  const updateMarketingHandler = async (values: UpdateSalesOrderPayload) => {
+    setIsLoading(true);
+    console.log(values);
+    const updateMarketingRes = await SalesOrderApi.update(
+      initialValues?.id as number,
+      values
+    );
+    if (isResponseSuccess(updateMarketingRes)) {
+      toast.success(updateMarketingRes?.message as string);
+      router.push(`/marketing/detail?marketingId=${initialValues?.id}`);
+    }
+    if (isResponseError(updateMarketingRes)) {
+      toast.error(updateMarketingRes?.message as string);
+    }
+    setIsLoading(false);
+  };
+  const createDeliveryHandler = async (values: CreateDeliveryOrderPayload) => {
+    setIsLoading(true);
+    console.log(initialValues?.id);
+    const createDeliveryRes = await DeliveryOrderApi.create(values);
+    if (isResponseSuccess(createDeliveryRes)) {
+      console.log(createDeliveryRes);
+      toast.success(createDeliveryRes?.message as string);
+      setDeliveryOrderValues(
+        createDeliveryRes.data?.delivery_order?.flatMap((delivery) =>
+          DeliveryProductToFieldValues(
+            createDeliveryRes.data?.sales_order,
+            delivery
+          )
+        ) ?? []
+      );
+      router.push(`/marketing/detail?marketingId=${initialValues?.id}`);
+    }
+    if (isResponseError(createDeliveryRes)) {
+      console.log(createDeliveryRes);
+      toast.error(createDeliveryRes?.message as string);
+    }
+    setIsLoading(false);
+  };
+  const updateDeliveryHandler = async (values: UpdateDeliveryOrderPayload) => {
+    setIsLoading(true);
+    console.log(initialValues?.id);
+    const updateDeliveryRes = await DeliveryOrderApi.update(
+      initialValues?.id as number,
+      values
+    );
+    if (isResponseSuccess(updateDeliveryRes)) {
+      console.log(updateDeliveryRes);
+      toast.success(updateDeliveryRes?.message as string);
+      setDeliveryOrderValues(
+        mergeSOwithDO(
+          formik.values.sales_order,
+          updateDeliveryRes.data?.delivery_order?.flatMap((delivery) =>
+            DeliveryProductToFieldValues(
+              updateDeliveryRes.data?.sales_order,
+              delivery
+            )
+          ) ?? []
+        )
+      );
+      router.push(`/marketing/detail?marketingId=${initialValues?.id}`);
+    }
+    if (isResponseError(updateDeliveryRes)) {
+      console.log(updateDeliveryRes);
+      toast.error(updateDeliveryRes?.message as string);
+    }
+    setIsLoading(false);
+  };
+
+  // ================== MARKETING HANDLER ==================
+  const deleteMarketingHandler = async () => {
+    setIsLoading(true);
+    console.log(initialValues?.id);
+    const deleteMarketingRes = await MarketingApi.delete(
+      initialValues?.id as number
+    );
+    if (isResponseSuccess(deleteMarketingRes)) {
+      console.log(deleteMarketingRes);
+      toast.success(deleteMarketingRes?.message as string);
+    }
+    if (isResponseError(deleteMarketingRes)) {
+      console.log(deleteMarketingRes);
+      toast.error(deleteMarketingRes?.message as string);
+    }
+    setIsLoading(false);
+    deleteModal.closeModal();
+    router.push('/marketing');
+  };
+  const handleChangeCustomer = useCallback(
+    (val: OptionType | OptionType[] | null) => {
+      formik.setFieldValue('customer_id', (val as OptionType)?.value);
+      formik.setFieldValue('customer', val as OptionType);
+    },
+    []
+  );
+  const handleDelete = useCallback(() => {
+    deleteModal.openModal();
+  }, [deleteModal]);
+
+  // ================== SALES ORDER HANDLER ==================
+  const handleDeleteSO = useCallback((id: number) => {
+    const currentProducts = formik.values.sales_order;
+    formik.setFieldValue(
+      'sales_order',
+      currentProducts.filter((p) => p.id != id)
+    );
+  }, []);
+  const handleBulkDeleteSO = useCallback(() => {
+    const currentProducts = formik.values.sales_order;
+    formik.setFieldValue(
+      'sales_order',
+      currentProducts.filter(
+        (product) => !selectedRowSOIds.includes(product.id ?? -1)
+      )
+    );
+    setRowSOSelection({});
+  }, [selectedRowSOIds]);
+  const handleAddSOClick = useCallback(() => {
+    setSelectedMarketingProduct(null);
+    addSOModal.openModal();
+  }, [addSOModal]);
+  const handleAddSubmitSO = useCallback(
+    async (values: SalesOrderProductFormValues) => {
+      const currentProducts = formik.values.sales_order;
+
+      const newValues = {
+        ...values,
+        id: values.id ?? Date.now(),
+      };
+
+      const existingIndex = currentProducts.findIndex(
+        (item) =>
+          item.kandang_id === newValues.kandang_id &&
+          item.product_warehouse_id === newValues.product_warehouse_id
+      );
+
+      let updatedProducts = [];
+
+      if (existingIndex !== -1) {
+        // Overwrite
+        updatedProducts = currentProducts.map((item, index) =>
+          index === existingIndex ? newValues : item
+        );
+      } else {
+        // Add new item
+        updatedProducts = [...currentProducts, newValues];
+      }
+
+      formik.setFieldValue('sales_order', updatedProducts);
+
+      addSOModal.closeModal();
+    },
+    [addSOModal]
+  );
+
+  // ================== DELIVERY ORDER HANDLER ==================
+  const handleEditDO = useCallback(
+    (id: number, values?: DeliveryOrderProductFormValues) => {
+      setDeliveryFormState('edit');
+      const currentProducts = formik.values.delivery_order.find(
+        (product) => product.id == id
+      );
+      setSelectedDeliveryProduct(values ?? currentProducts ?? null);
+      addDOModal.openModal();
+    },
+    [addDOModal]
+  );
+  const handleAddDOClick = useCallback(() => {
+    setDeliveryFormState('add');
+    setSelectedDeliveryProduct(null);
+    addDOModal.openModal();
+  }, [addDOModal]);
+  const handleAddSubmitDO = useCallback(
+    async (values: DeliveryOrderProductFormValues) => {
+      const newValues = {
+        ...values,
+        id: values.id ?? Date.now(),
+      };
+
+      setDeliveryOrderValues((prev) => [...prev, newValues]);
+      addDOModal.closeModal();
+      setSelectedDeliveryProduct(null);
+    },
+    [addDOModal]
+  );
+  const handleUpdateDO = useCallback(
+    async (id: number, values: DeliveryOrderProductFormValues) => {
+      setDeliveryOrderValues((prev) =>
+        prev.map((product) =>
+          product.id === id ? { ...product, ...values } : product
+        )
+      );
+      addDOModal.closeModal();
+      setSelectedDeliveryProduct(null);
+    },
+    [addDOModal]
+  );
+
+  const memoSalesOrder = formik.values.sales_order;
+
+  useEffect(() => {
+    formik.setFieldValue('delivery_order', deliveryOrderValues);
+  }, [deliveryOrderValues, initialValues]);
+
+  const grandTotal = useMemo(() => {
+    return memoSalesOrder.reduce(
+      (total, product) =>
+        total + parseFloat((product.total_price as string) || '0'),
+      0
+    );
+  }, [memoSalesOrder]);
+
+  return (
+    <>
+      <form
+        className='flex flex-col gap-4'
+        onSubmit={formik.handleSubmit}
+        onReset={formik.handleReset}
+      >
+        <FormHeader
+          title={`${formType == 'add' || formType == 'add_deliver' ? 'Tambah' : 'Edit'} ${formType === 'add_deliver' || formType === 'edit_deliver' ? 'Delivery' : 'Sales'} Order`}
+          backUrl='/marketing'
+        />
+        {/* Input Cutomer And Date  */}
+        <Card
+          title='Informasi Order'
+          className={{
+            wrapper: 'bg-white w-full',
+          }}
+        >
+          <div className='grid grid-cols-2 gap-3 mt-3'>
+            <SelectInput
+              label='Pelanggan'
+              options={customerOptions}
+              isLoading={isLoadingCustomerOptions}
+              value={formik.values.customer}
+              onChange={handleChangeCustomer}
+              isError={
+                formik.touched.customer_id && Boolean(formik.errors.customer_id)
+              }
+              errorMessage={formik.errors.customer_id}
+              isClearable
+              placeholder='Pilih Pelanggan'
+              isDisabled={
+                formType === 'add_deliver' || formType === 'edit_deliver'
+              }
+            />
+            <DateInput
+              name='so_date'
+              label='Tanggal'
+              value={formik.values.so_date}
+              onChange={formik.handleChange}
+              isError={formik.touched.so_date && Boolean(formik.errors.so_date)}
+              errorMessage={formik.errors.so_date}
+              placeholder='Pilih Tanggal'
+              readOnly={formType == 'add_deliver' || formType == 'edit_deliver'}
+            />
+          </div>
+        </Card>
+
+        {/* Input Table Repeater Sales Order */}
+        <Card
+          title='Informasi Produk'
+          className={{
+            wrapper: 'bg-white w-full',
+          }}
+        >
+          <MemoizedSalesOrderProductTable
+            formType={formType}
+            data={memoSalesOrder}
+            rowSelection={rowSOSelection}
+            setRowSelection={setRowSOSelection}
+            selectedRowIds={selectedRowSOIds}
+            onDelete={handleDeleteSO}
+            onBulkDelete={handleBulkDeleteSO}
+            onAddProductClick={handleAddSOClick}
+          />
+        </Card>
+
+        {/* Input Table Repeater Delivery Order */}
+        {(formType == 'add_deliver' || formType == 'edit_deliver') &&
+          initialValues?.sales_order &&
+          initialValues?.sales_order.length > 0 && (
+            <Card
+              title='Informasi Pengiriman'
+              className={{
+                wrapper: 'bg-white w-full',
+              }}
+            >
+              {/* <div className='text-blue-500'>
+                {JSON.stringify(formik.values)}
+              </div>
+              <div className='text-red-500'>
+                {JSON.stringify(formik.errors)}
+              </div> */}
+              <MemoizedDeliveryOrderProductTable
+                formType={formType}
+                data={deliveryOrderValues}
+                onEdit={handleEditDO}
+                onAddProductClick={handleAddDOClick}
+              />
+            </Card>
+          )}
+
+        {/* Input Notes */}
+        <div className='grid grid-cols-2 gap-3'>
+          <DebouncedTextArea
+            required
+            name='notes'
+            label='Catatan'
+            rows={3}
+            placeholder='Masukan catatan penjualan'
+            value={formik.values.notes}
+            onChange={formik.handleChange}
+            isError={formik.touched.notes && Boolean(formik.errors.notes)}
+            errorMessage={formik.errors.notes}
+            disabled={formType === 'add_deliver' || formType === 'edit_deliver'}
+          />
+          <div className='flex flex-col h-full justify-between items-end py-6'>
+            <span>Total Penjualan</span>
+            <span className='text-lg font-semibold'>
+              {formatCurrency(grandTotal)}{' '}
+            </span>
+          </div>
+        </div>
+
+        {/* Form Actions */}
+        <div className='flex flex-row items-start justify-center gap-2 mt-4'>
+          <Button type='reset' color='warning' disabled={formik.isSubmitting}>
+            Reset
+          </Button>
+          <Button
+            type='submit'
+            disabled={!formik.isValid || formik.isSubmitting}
+            isLoading={formik.isSubmitting}
+          >
+            Submit
+          </Button>
+        </div>
+      </form>
+
+      {/* Actions button */}
+      {formType == 'edit' && (
+        <div className='flex flex-row justify-start'>
+          <Button
+            type='button'
+            color='error'
+            onClick={handleDelete}
+            isLoading={isLoading}
+          >
+            <Icon icon='mdi:trash' width={24} height={24} />
+            Hapus
+          </Button>
+        </div>
+      )}
+
+      {/* Modals */}
+      <Modal
+        ref={addSOModal.ref}
+        closeOnBackdrop
+        className={{
+          modalBox: 'max-w-4/5 z-100',
+        }}
+      >
+        <div className='flex flex-col gap-4'>
+          <div className='flex flex-row items-center justify-between'>
+            <h3 className='text-lg font-semibold mb-4'>Tambah Produk</h3>
+            <Button
+              variant='ghost'
+              color='error'
+              className='rounded-full'
+              onClick={addSOModal.closeModal}
+            >
+              <Icon icon='mdi:close' width={20} height={20} />
+            </Button>
+          </div>
+          <div>
+            <MemoizedSalesOrderProductForm
+              onSubmitForm={handleAddSubmitSO}
+              initialValues={selectedMarketingProduct ?? undefined}
+              exisitingValues={memoSalesOrder}
+            />
+          </div>
+        </div>
+      </Modal>
+      <Modal
+        ref={addDOModal.ref}
+        closeOnBackdrop
+        className={{
+          modalBox: 'max-w-4/5 z-100',
+        }}
+      >
+        <div className='flex flex-col gap-4'>
+          <div className='flex flex-row items-center justify-between'>
+            <h3 className='text-lg font-semibold mb-4'>
+              {selectedDeliveryProduct ? 'Edit' : 'Tambah'} Pengiriman
+            </h3>
+            <Button
+              variant='ghost'
+              color='error'
+              className='rounded-full'
+              onClick={addDOModal.closeModal}
+            >
+              <Icon icon='mdi:close' width={20} height={20} />
+            </Button>
+          </div>
+          <div>
+            <MemoizedDeliveryOrderProductForm
+              formState={deliveryFormState}
+              salesOrders={initialValues?.sales_order ?? []}
+              exisitingValues={deliveryOrderValues}
+              onSubmitForm={handleAddSubmitDO}
+              initialValues={selectedDeliveryProduct ?? undefined}
+              onUpdateForm={handleUpdateDO}
+            />
+          </div>
+        </div>
+      </Modal>
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data penjualan ini?`}
+        secondaryButton={{
+          text: 'Tidak',
+          onClick: deleteModal.closeModal,
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          onClick: deleteMarketingHandler,
+        }}
+      />
+    </>
+  );
+};
+
+export default MarketingForm;

src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema.ts

@@ -0,0 +1,47 @@
+import * as Yup from 'yup';
+import { SalesOrderProductFormValues } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+
+type DeliveryOrderProductSchemaType = {
+  id?: number | undefined;
+  marketing_product_id: number | undefined; // Sales Order ID
+  marketing_product?: SalesOrderProductFormValues | undefined | null;
+  unit_price: string | number | undefined;
+  total_weight: string | number | undefined;
+  qty: string | number | undefined;
+  avg_weight: string | number | undefined;
+  total_price: string | number | undefined;
+  vehicle_number: string | undefined;
+  delivery_date: string | undefined | null;
+  do_number?: string | undefined | null; // Uncertain
+};
+
+export const DeliveryOrderProductSchema: Yup.ObjectSchema<DeliveryOrderProductSchemaType> =
+  Yup.object({
+    id: Yup.number(),
+    marketing_product_id: Yup.number()
+      .min(1, 'Produk wajib diisi!')
+      .required('Produk wajib diisi!'),
+    marketing_product: Yup.object().nullable().optional(),
+    unit_price: Yup.number()
+      .min(1, 'Harga Satuan wajib diisi!')
+      .required('Harga Satuan wajib diisi!'),
+    total_weight: Yup.number()
+      .min(0, 'Total Bobot wajib diisi!')
+      .required('Total Bobot wajib diisi!'),
+    qty: Yup.number()
+      .min(1, 'Kuantitas wajib diisi!')
+      .required('Kuantitas wajib diisi!'),
+    avg_weight: Yup.number()
+      .min(0, 'Avg. Bobot wajib diisi!')
+      .required('Avg. Bobot wajib diisi!'),
+    total_price: Yup.number()
+      .min(1, 'Total Penjualan wajib diisi!')
+      .required('Total Penjualan wajib diisi!'),
+    vehicle_number: Yup.string().required('Nomor Kendaraan wajib diisi!'),
+    delivery_date: Yup.string().required('Tanggal Pengiriman wajib diisi!'),
+    do_number: Yup.string().nullable().optional(),
+  });
+
+export type DeliveryOrderProductFormValues = Yup.InferType<
+  typeof DeliveryOrderProductSchema
+>;

src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx

@@ -0,0 +1,394 @@
+import { useEffect, useState } from 'react';
+import {
+  DeliveryOrderProductFormValues,
+  DeliveryOrderProductSchema,
+} from './DeliverOrderProduct.schema';
+import { useFormik } from 'formik';
+import Alert from '@/components/Alert';
+import Button from '@/components/Button';
+import NumberInput from '@/components/input/NumberInput';
+import PatternInput from '@/components/input/PatternInput';
+import { formatVechicleNumber } from '@/lib/helper';
+import DateInput from '@/components/input/DateInput';
+import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import { BaseSalesOrder } from '@/types/api/marketing/marketing';
+import Badge from '@/components/Badge';
+import { SalesProductToFieldValues } from '@/components/pages/marketing/form/MarketingForm';
+import * as Yup from 'yup';
+
+const DeliveryOrderProductForm = ({
+  formState,
+  salesOrders,
+  initialValues,
+  exisitingValues,
+  onSubmitForm,
+  onUpdateForm,
+}: {
+  formState: 'add' | 'edit';
+  salesOrders: BaseSalesOrder[];
+  initialValues?: DeliveryOrderProductFormValues;
+  exisitingValues?: DeliveryOrderProductFormValues[];
+  onSubmitForm?: (value: DeliveryOrderProductFormValues) => Promise<void>;
+  onUpdateForm?: (
+    id: number,
+    value: DeliveryOrderProductFormValues
+  ) => Promise<void>;
+}) => {
+  const [formikErrorMessage, setFormErrorMessage] = useState('');
+  const [selectedProduct, setSelectedProduct] = useState<OptionType | null>(
+    null
+  );
+  const [currentInput, setCurrentInput] = useState<string>('');
+  const salesOrder = salesOrders.find(
+    (item) => item.id === initialValues?.marketing_product_id
+  );
+
+  const formik = useFormik<DeliveryOrderProductFormValues>({
+    enableReinitialize: true,
+    initialValues: {
+      delivery_date: initialValues?.delivery_date || undefined,
+      vehicle_number: initialValues?.vehicle_number || undefined,
+      marketing_product_id:
+        salesOrder?.id || initialValues?.marketing_product_id || undefined,
+      unit_price: initialValues?.unit_price || undefined,
+      total_weight: initialValues?.total_weight || undefined,
+      qty: initialValues?.qty || undefined,
+      avg_weight: initialValues?.avg_weight || undefined,
+      total_price: initialValues?.total_price || undefined,
+      marketing_product: initialValues?.marketing_product || undefined,
+    },
+    isInitialValid: false,
+    validationSchema: Yup.object().shape({
+      ...DeliveryOrderProductSchema.fields,
+
+      qty: Yup.lazy((_, context) => {
+        // values diambil aman dari context
+        const { parent } = context;
+
+        const mpId = parent?.marketing_product_id;
+        const selectedSO = salesOrders.find((item) => item.id === mpId);
+
+        const maxQty = selectedSO?.qty ?? Infinity;
+
+        return Yup.number()
+          .min(1, 'Kuantitas wajib diisi!')
+          .max(maxQty, `Maksimal kuantitas adalah ${maxQty}`)
+          .required('Kuantitas wajib diisi!');
+      }),
+    }),
+    validateOnChange: true,
+    validateOnBlur: true,
+    onSubmit: async (values) => {
+      setFormErrorMessage('');
+      if (initialValues?.id) {
+        await onUpdateForm?.(initialValues.id, values);
+      } else {
+        await onUpdateForm?.(values.marketing_product_id as number, values);
+      }
+      handleResetForm();
+    },
+  });
+
+  const handleResetForm = () => {
+    setFormErrorMessage('');
+    formik.resetForm({
+      values: {
+        delivery_date: '',
+        vehicle_number: '',
+        marketing_product_id: undefined,
+        unit_price: '',
+        total_weight: '',
+        qty: '',
+        avg_weight: '',
+        total_price: '',
+        marketing_product: undefined,
+      },
+    });
+    setSelectedProduct(null);
+  };
+
+  const handleBlurField = (field: string) => {
+    setCurrentInput(field);
+    const { qty, unit_price, total_price, avg_weight, total_weight } =
+      formik.values;
+
+    if (field === 'unit_price' || field === 'total_price' || field === 'qty') {
+      if (qty && unit_price && (field === 'unit_price' || field === 'qty')) {
+        formik.setFieldValue('total_price', Number(qty) * Number(unit_price));
+      } else if (qty && total_price && field === 'total_price') {
+        formik.setFieldValue('unit_price', Number(total_price) / Number(qty));
+      }
+    }
+
+    if (field === 'avg_weight' || field === 'total_weight' || field === 'qty') {
+      if (qty && avg_weight && (field === 'avg_weight' || field === 'qty')) {
+        formik.setFieldValue('total_weight', Number(qty) * Number(avg_weight));
+      } else if (qty && total_weight && field === 'total_weight') {
+        formik.setFieldValue('avg_weight', Number(total_weight) / Number(qty));
+      }
+    }
+  };
+
+  const options = exisitingValues
+    ?.map((item) => {
+      if (!Boolean(item.qty)) {
+        return {
+          value: item.id,
+          label: `${item.marketing_product?.product_warehouse?.label} - ${item.marketing_product?.kandang?.label}`,
+        } as OptionType;
+      } else {
+        return null;
+      }
+    })
+    ?.filter((item) => item != null) as OptionType[];
+
+  const { setValues: setFormikValues } = formik;
+
+  useEffect(() => {
+    if (initialValues) {
+      if (!Boolean(initialValues.qty)) {
+        handleResetForm();
+      } else {
+        setFormikValues(initialValues);
+        // const value = exisitingValues?.find(
+        //   (item) => item.id === initialValues?.id
+        // );
+        if (initialValues?.marketing_product_id) {
+          setSelectedProduct({
+            value: initialValues?.id,
+            label: `${initialValues?.marketing_product?.product_warehouse?.label} - ${initialValues?.marketing_product?.kandang?.label}`,
+          } as OptionType);
+        }
+      }
+    }
+  }, [initialValues]);
+
+  return (
+    <>
+      <form
+        className='size-full'
+        onSubmit={(e) => {
+          e.preventDefault();
+          handleBlurField(currentInput);
+          formik.handleSubmit(e);
+        }}
+        onReset={handleResetForm}
+      >
+        {/* <small className='block text-blue-500'>
+          {JSON.stringify(exisitingValues)}
+        </small>
+        <small className='block text-emerald-500'>
+          {JSON.stringify(formik.values)}
+        </small> */}
+        {/* <small className='block text-red-500'>
+          {JSON.stringify(formik.errors)}
+        </small>
+        <div className='hidden'>
+          {JSON.stringify(formik.values.marketing_product)}
+        </div> */}
+
+        {formikErrorMessage && (
+          <div onClick={() => setFormErrorMessage('')} className='my-3 w-full'>
+            <Alert color='error'>{formikErrorMessage}</Alert>
+          </div>
+        )}
+
+        <div className='grid grid-cols-2 gap-4'>
+          <SelectInput
+            options={options}
+            label='Produk'
+            placeholder='Pilih Produk'
+            isDisabled={formState == 'edit'}
+            value={
+              selectedProduct
+                ? ({
+                    value: selectedProduct?.value,
+                    label: exisitingValues?.find(
+                      (item) => item.id === selectedProduct?.value
+                    )?.marketing_product?.product_warehouse?.label,
+                  } as OptionType)
+                : null
+            }
+            onChange={(value) => {
+              const selected = value as OptionType;
+              setSelectedProduct(selected);
+
+              const so = salesOrders?.find(
+                (item) => item.id === selected?.value
+              );
+              if (!so) {
+                formik.setValues({
+                  ...formik.values,
+                  marketing_product_id: undefined,
+                  marketing_product: null,
+                  qty: formik.values.qty || '',
+                  unit_price: '',
+                  total_price: '',
+                  avg_weight: '',
+                  total_weight: '',
+                  vehicle_number: '',
+                });
+                return;
+              }
+
+              formik.setValues({
+                ...formik.values,
+                marketing_product_id: selected.value as number,
+                marketing_product: SalesProductToFieldValues(so),
+                qty: formik.values.qty || so.qty,
+                unit_price: so.unit_price,
+                total_price: so.total_price,
+                avg_weight: so.avg_weight,
+                total_weight: so.total_weight,
+                vehicle_number: so.vehicle_number,
+              });
+            }}
+            startAdornment={
+              selectedProduct && (
+                <Badge
+                  variant='soft'
+                  color='success'
+                  size='sm'
+                  className={{ badge: 'whitespace-nowrap font-semibold' }}
+                >
+                  {
+                    exisitingValues?.find(
+                      (item) => item.id === selectedProduct?.value
+                    )?.marketing_product?.kandang?.label
+                  }
+                </Badge>
+              )
+            }
+            isClearable
+            isError={Boolean(formik.errors.marketing_product_id)}
+            errorMessage={formik.errors.marketing_product_id}
+            required
+          />
+          <DateInput
+            name='delivery_date'
+            label='Tanggal'
+            value={formik.values.delivery_date ?? undefined}
+            onChange={formik.handleChange}
+            onBlur={formik.handleBlur}
+            isError={
+              formik.touched.delivery_date &&
+              Boolean(formik.errors.delivery_date)
+            }
+            errorMessage={formik.errors.delivery_date}
+            placeholder='Pilih Tanggal'
+            className={{
+              inputWrapper: 'bg-white',
+            }}
+            required
+          />
+
+          <PatternInput
+            name='vehicle_number'
+            label='No. Polisi'
+            format='AA #### AAA'
+            mask='_'
+            inputVehicleNumber
+            required
+            type='text'
+            placeholder='B 1234 CDE'
+            value={formatVechicleNumber(formik.values.vehicle_number ?? '')}
+            onChange={formik.handleChange}
+            onBlur={formik.handleBlur}
+            isError={Boolean(formik.errors.vehicle_number)}
+            errorMessage={formik.errors.vehicle_number}
+          />
+
+          <NumberInput
+            required
+            label='Kuantitas'
+            name='qty'
+            value={formik.values.qty}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
+            onBlur={() => handleBlurField('qty')}
+            isError={Boolean(formik.errors.qty)}
+            errorMessage={formik.errors.qty}
+            placeholder='Masukan Kuantitas'
+          />
+
+          <NumberInput
+            required
+            label='Avg. Bobot (Kg)'
+            name='avg_weight'
+            value={formik.values.avg_weight}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
+            onBlur={() => handleBlurField('avg_weight')}
+            isError={Boolean(formik.errors.avg_weight)}
+            errorMessage={formik.errors.avg_weight}
+            placeholder='Masukan Bobot Rata-rata'
+          />
+
+          <NumberInput
+            required
+            label='Harga Satuan (Rp)'
+            name='unit_price'
+            value={formik.values.unit_price}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
+            onBlur={() => handleBlurField('unit_price')}
+            isError={Boolean(formik.errors.unit_price)}
+            errorMessage={formik.errors.unit_price}
+            placeholder='Masukan Harga Satuan'
+          />
+
+          <NumberInput
+            required
+            label='Total Bobot (Kg)'
+            name='total_weight'
+            value={formik.values.total_weight}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
+            onBlur={() => handleBlurField('total_weight')}
+            isError={Boolean(formik.errors.total_weight)}
+            errorMessage={formik.errors.total_weight}
+            placeholder='Masukan Total Bobot'
+          />
+
+          <NumberInput
+            required
+            label='Total Penjualan (Rp)'
+            name='total_price'
+            value={formik.values.total_price}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
+            onBlur={() => handleBlurField('total_price')}
+            isError={Boolean(formik.errors.total_price)}
+            errorMessage={formik.errors.total_price}
+            placeholder='Masukan Total Penjualan'
+          />
+        </div>
+
+        <div className='flex flex-row justify-end gap-3 mt-4'>
+          <Button type='reset' color='warning'>
+            Reset
+          </Button>
+          <Button
+            type='submit'
+            isLoading={formik.isSubmitting}
+            disabled={!formik.isValid || formik.isSubmitting}
+          >
+            Submit
+          </Button>
+        </div>
+      </form>
+    </>
+  );
+};
+
+export default DeliveryOrderProductForm;

src/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema.ts

@@ -1,7 +1,7 @@
 import * as Yup from 'yup';
 
-type MarketingProductSchemaType = {
-  vehicle_number: string | undefined;
+type SalesOrderProductSchemaType = {
+  id?: number | undefined;
   kandang_id?: number;
   kandang?: {
     value: number;
@@ -15,15 +15,15 @@ type MarketingProductSchemaType = {
   unit_price: string | number | undefined;
   total_weight: string | number | undefined;
   qty: string | number | undefined;
-  uom: string | undefined | null;
   avg_weight: string | number | undefined;
   total_price: string | number | undefined;
-  delivery_date?: string | undefined | null;
+  vehicle_number?: string | undefined;
 };
 
-export const MarketingProductSchema: Yup.ObjectSchema<MarketingProductSchemaType> =
+export const SalesOrderProductSchema: Yup.ObjectSchema<SalesOrderProductSchemaType> =
   Yup.object({
-    vehicle_number: Yup.string().required('No. Polisi wajib diisi!'),
+    id: Yup.number(),
+    vehicle_number: Yup.string().required('Nomor Kendaraan wajib diisi!'),
     kandang: Yup.object({
       value: Yup.number().min(1).required(),
       label: Yup.string().required(),
@@ -42,21 +42,19 @@ export const MarketingProductSchema: Yup.ObjectSchema<MarketingProductSchemaType
       .min(1, 'Harga Satuan wajib diisi!')
       .required('Harga Satuan wajib diisi!'),
     total_weight: Yup.number()
-      .min(1, 'Total Bobot wajib diisi!')
+      .min(0, 'Total Bobot wajib diisi!')
       .required('Total Bobot wajib diisi!'),
     qty: Yup.number()
       .min(1, 'Kuantitas wajib diisi!')
       .required('Kuantitas wajib diisi!'),
-    uom: Yup.string().nullable(),
     avg_weight: Yup.number()
-      .min(1, 'Avg. Bobot wajib diisi!')
+      .min(0, 'Avg. Bobot wajib diisi!')
       .required('Avg. Bobot wajib diisi!'),
     total_price: Yup.number()
       .min(1, 'Total Penjualan wajib diisi!')
       .required('Total Penjualan wajib diisi!'),
-    delivery_date: Yup.string().required().nullable(),
   });
 
-export type MarketingProductFormValues = Yup.InferType<
-  typeof MarketingProductSchema
+export type SalesOrderProductFormValues = Yup.InferType<
+  typeof SalesOrderProductSchema
 >;

src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx

@@ -1,17 +1,11 @@
 'use client';
 
-import TextInput from '@/components/input/TextInput';
-import {
-  CreateMarketingPayload,
-  CreateMarketingProductPayload,
-  MarketingProduct,
-} from '@/types/api/marketing/marketing';
 import { useFormik } from 'formik';
 import {
-  MarketingProductFormValues,
-  MarketingProductSchema,
-} from './MarketingProduct.schema';
-import { RefObject, use, useEffect, useRef, useState } from 'react';
+  SalesOrderProductFormValues,
+  SalesOrderProductSchema,
+} from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+import { RefObject, useMemo, useState } from 'react';
 import SelectInput, {
   OptionType,
   useSelect,
@@ -23,37 +17,52 @@ import { ProductWarehouseApi } from '@/services/api/inventory';
 import NumberInput from '@/components/input/NumberInput';
 import Button from '@/components/Button';
 import { isResponseSuccess } from '@/lib/api-helper';
-import PatternInput from '@/components/input/PatternInput';
 import { formatVechicleNumber } from '@/lib/helper';
+import PatternInput from '@/components/input/PatternInput';
+import Alert from '@/components/Alert';
 
-const MarketingProductForm = ({
+const SalesOrderProductForm = ({
   initialValues,
-  data,
-  modalRef,
+  exisitingValues,
   onSubmitForm,
 }: {
-  initialValues?: MarketingProduct;
-  data: MarketingProduct[];
+  initialValues?: SalesOrderProductFormValues;
+  exisitingValues?: SalesOrderProductFormValues[];
   modalRef?: RefObject<HTMLDialogElement | null>;
-  onSubmitForm?: (
-    tableValues: CreateMarketingProductPayload,
-    fieldValues: MarketingProductFormValues
-  ) => Promise<void>;
+  onSubmitForm?: (value: SalesOrderProductFormValues) => Promise<void>;
 }) => {
-  // State
-  const [selectedOptionsKandang, setSelectedOptionsKandang] =
-    useState<OptionType | null>(null);
-  const [selectedOptionsWarehouse, setSelectedOptionsWarehouse] = useState<
-    OptionType | null | undefined
-  >(undefined);
   const [formErrorMessage, setFormErrorMessage] = useState('');
+  const [currentInput, setCurrentInput] = useState<string>('');
+
+  const formik = useFormik<SalesOrderProductFormValues>({
+    enableReinitialize: true,
+    initialValues: {
+      vehicle_number: initialValues?.vehicle_number || undefined,
+      kandang_id: initialValues?.kandang_id || undefined,
+      kandang: initialValues?.kandang || undefined,
+      product_warehouse: initialValues?.product_warehouse || undefined,
+      product_warehouse_id: initialValues?.product_warehouse_id || undefined,
+      unit_price: initialValues?.unit_price || undefined,
+      total_weight: initialValues?.total_weight || undefined,
+      qty: initialValues?.qty || undefined,
+      avg_weight: initialValues?.avg_weight || undefined,
+      total_price: initialValues?.total_price || undefined,
+    },
+    validationSchema: SalesOrderProductSchema,
+    onSubmit: async (values) => {
+      setFormErrorMessage('');
+      onSubmitForm?.(values);
+      handleResetForm();
+    },
+    validateOnBlur: true,
+    isInitialValid: false,
+  });
 
-  // Options Data
   const {
     options: kandangSourceOptions,
-    rawData: kandangSourceRawData,
     isLoadingOptions: isLoadingKandangSourceOptions,
   } = useSelect<Kandang>(KandangApi.basePath, 'id', 'name');
+
   const {
     options: warehouseSourceOptions,
     rawData: warehouseSourceRawData,
@@ -64,109 +73,44 @@ const MarketingProductForm = ({
     'product.name',
     'search',
     {
-      warehouse_id: selectedOptionsKandang?.value?.toString() ?? '',
+      warehouse_id: formik.values.kandang_id?.toString() ?? '',
     }
   );
 
-  // Handler
+  const productOptionsFiltered = useMemo(() => {
+    return warehouseSourceOptions.filter(
+      (product) =>
+        !exisitingValues
+          ?.map((item) => item.product_warehouse_id)
+          .includes(product.value)
+    );
+  }, [warehouseSourceOptions, exisitingValues]);
+
   const kandangChangeHandler = (val: OptionType | OptionType[] | null) => {
-    setSelectedOptionsKandang(val as OptionType);
     formik.setFieldValue('kandang', val as OptionType);
     formik.setFieldValue('kandang_id', (val as OptionType)?.value);
     formik.setFieldValue('product_warehouse_id', null);
+    formik.setFieldValue('product_warehouse', null);
     formik.setFieldValue('qty', null);
-    warehouseChangeHandler(null);
   };
 
   const warehouseChangeHandler = (val: OptionType | OptionType[] | null) => {
-    setSelectedOptionsWarehouse(val as OptionType);
     formik.setFieldValue('product_warehouse', val as OptionType);
-    formik.setFieldValue('product_warehouse_id', (val as OptionType)?.value);
-    if (isResponseSuccess(warehouseSourceRawData)) {
+    const newId = (val as OptionType)?.value;
+    formik.setFieldValue('product_warehouse_id', newId);
+
+    if (isResponseSuccess(warehouseSourceRawData) && newId) {
       const productWarehouse = warehouseSourceRawData?.data.find(
-        (item: ProductWarehouse) => item.id === (val as OptionType)?.value
+        (item: ProductWarehouse) => item.id === newId
       );
-      if (selectedOptionsWarehouse?.value !== null) {
-        formik.setFieldValue('qty', productWarehouse?.quantity);
-        handleBlurField('qty');
-      } else {
-        formik.setFieldValue('qty', null);
-      }
+      formik.setFieldValue('qty', productWarehouse?.quantity);
+      handleBlurField('qty');
+    } else {
+      formik.setFieldValue('qty', null);
     }
   };
 
-  // Formik
-  const formik = useFormik<MarketingProductFormValues>({
-    enableReinitialize: true,
-    initialValues: {
-      vehicle_number:
-        initialValues?.marketing_delivery_products?.vehicle_number || undefined,
-      kandang_id: initialValues?.product_warehouse.warehouse.id || undefined,
-      kandang: {
-        value: initialValues?.product_warehouse.warehouse.id as number,
-        label: initialValues?.product_warehouse.warehouse.name as string,
-      },
-      product_warehouse: {
-        value: initialValues?.product_warehouse.product.id as number,
-        label: initialValues?.product_warehouse.product.name as string,
-      },
-      product_warehouse_id:
-        initialValues?.product_warehouse.product.id || undefined,
-      unit_price: initialValues?.unit_price || undefined,
-      total_weight: initialValues?.total_weight || undefined,
-      qty: initialValues?.qty || undefined,
-      uom: initialValues?.product_warehouse?.product?.uom?.name || undefined,
-      avg_weight: initialValues?.avg_weight || undefined,
-      total_price: initialValues?.total_price || undefined,
-      delivery_date:
-        initialValues?.marketing_delivery_products?.delivery_date ||
-        new Date().toDateString() ||
-        undefined,
-    },
-    validationSchema: MarketingProductSchema,
-    onSubmit: async (values) => {
-      setFormErrorMessage('');
-      if (
-        isResponseSuccess(kandangSourceRawData) &&
-        isResponseSuccess(warehouseSourceRawData)
-      ) {
-        const productWarehouse = warehouseSourceRawData?.data.find(
-          (item: ProductWarehouse) => item.id === values.product_warehouse_id
-        );
-        const kandang = kandangSourceRawData?.data.find(
-          (item: Kandang) => item.id === values.kandang_id
-        );
-
-        const marketingProduct: CreateMarketingProductPayload = {
-          id: initialValues?.id || undefined,
-          vehicle_number: formatVechicleNumber(values.vehicle_number as string),
-          kandang_id: values.kandang_id as number,
-          kandang: kandang,
-          product_warehouse_id: values.product_warehouse_id as number,
-          product_warehouse: productWarehouse,
-          unit_price: values.unit_price as number,
-          total_weight: values.total_weight as number,
-          qty: values.qty as number,
-          uom: values.uom as string,
-          avg_weight: values.avg_weight as number,
-          total_price: values.total_price as number,
-          delivery_date: values.delivery_date as string,
-        };
-
-        onSubmitForm?.(marketingProduct, values);
-        handleResetForm();
-      }
-    },
-  });
-  const { setValues: formikSetValues } = formik;
-
-  useEffect(() => {
-    formikSetValues(formik.initialValues);
-  }, [formikSetValues, formik.initialValues]);
-
   const handleResetForm = () => {
-    setSelectedOptionsKandang(null);
-    setSelectedOptionsWarehouse(null);
     setFormErrorMessage('');
     formik.resetForm({
       values: {
@@ -178,20 +122,19 @@ const MarketingProductForm = ({
         unit_price: '',
         total_weight: '',
         qty: '',
-        uom: '',
         avg_weight: '',
         total_price: '',
-        delivery_date: new Date().toDateString(),
       },
     });
   };
 
   const handleBlurField = (field: string) => {
+    setCurrentInput(field);
     const { qty, unit_price, total_price, avg_weight, total_weight } =
       formik.values;
 
     if (field === 'unit_price' || field === 'total_price' || field === 'qty') {
-      if (qty && unit_price && field === 'unit_price') {
+      if (qty && unit_price && (field === 'unit_price' || field === 'qty')) {
         formik.setFieldValue(
           'total_price',
           (qty as number) * (unit_price as number)
@@ -205,7 +148,7 @@ const MarketingProductForm = ({
     }
 
     if (field === 'avg_weight' || field === 'total_weight' || field === 'qty') {
-      if (qty && avg_weight && field === 'avg_weight') {
+      if (qty && avg_weight && (field === 'avg_weight' || field === 'qty')) {
         formik.setFieldValue(
           'total_weight',
           (qty as number) * (avg_weight as number)
@@ -223,9 +166,23 @@ const MarketingProductForm = ({
     <>
       <form
         className='size-full'
-        onSubmit={formik.handleSubmit}
+        onSubmit={(e) => {
+          e.preventDefault();
+          handleBlurField(currentInput);
+          formik.handleSubmit(e);
+        }}
         onReset={handleResetForm}
       >
+        {formErrorMessage && (
+          <div onClick={() => setFormErrorMessage('')} className='my-3 w-full'>
+            <Alert color='error'>
+              {formErrorMessage ? formErrorMessage : ''}
+            </Alert>
+          </div>
+        )}
+        {/* <small className='block text-rose-500'>
+          {JSON.stringify(formik.errors)}
+        </small> */}
         <div className='grid grid-cols-2 gap-4 z-200'>
           <PatternInput
             name='vehicle_number'
@@ -250,10 +207,9 @@ const MarketingProductForm = ({
             label='Kandang'
             options={kandangSourceOptions}
             isLoading={isLoadingKandangSourceOptions}
-            value={selectedOptionsKandang}
+            value={formik.values.kandang}
             onChange={kandangChangeHandler}
             isClearable
-            menuPortalTarget={modalRef?.current}
             isError={
               formik.touched.kandang_id && Boolean(formik.errors.kandang_id)
             }
@@ -263,14 +219,19 @@ const MarketingProductForm = ({
           <SelectInput
             required
             label='Produk'
-            options={warehouseSourceOptions}
+            options={productOptionsFiltered}
             isLoading={isLoadingWarehouseSourceOptions}
-            value={selectedOptionsWarehouse}
+            value={formik.values.product_warehouse}
             onChange={warehouseChangeHandler}
             isClearable
-            menuPortalTarget={modalRef?.current}
-            placeholder='Pilih Kandang Terlebih Dahulu'
-            isDisabled={!selectedOptionsKandang?.value}
+            placeholder={
+              formik.values.kandang_id
+                ? productOptionsFiltered.length == 0
+                  ? 'Tidak ada produk yang tersedia'
+                  : 'Pilih produk'
+                : 'Pilih Kandang Terlebih Dahulu'
+            }
+            isDisabled={!formik.values.kandang_id}
             isError={
               formik.touched.product_warehouse_id &&
               Boolean(formik.errors.product_warehouse_id)
@@ -282,7 +243,10 @@ const MarketingProductForm = ({
             label='Kuantitas'
             name='qty'
             value={formik.values.qty}
-            onChange={formik.handleChange}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
             onBlur={() => handleBlurField('qty')}
             isError={formik.touched.qty && Boolean(formik.errors.qty)}
             errorMessage={formik.errors.qty}
@@ -293,7 +257,10 @@ const MarketingProductForm = ({
             label='Avg. Bobot (Kg)'
             name='avg_weight'
             value={formik.values.avg_weight}
-            onChange={formik.handleChange}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
             onBlur={() => handleBlurField('avg_weight')}
             isError={
               formik.touched.avg_weight && Boolean(formik.errors.avg_weight)
@@ -306,7 +273,10 @@ const MarketingProductForm = ({
             label='Harga Satuan (Rp)'
             name='unit_price'
             value={formik.values.unit_price}
-            onChange={formik.handleChange}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
             onBlur={() => handleBlurField('unit_price')}
             isError={
               formik.touched.unit_price && Boolean(formik.errors.unit_price)
@@ -319,7 +289,10 @@ const MarketingProductForm = ({
             label='Total Bobot (Kg)'
             name='total_weight'
             value={formik.values.total_weight}
-            onChange={formik.handleChange}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
             onBlur={() => handleBlurField('total_weight')}
             isError={
               formik.touched.total_weight && Boolean(formik.errors.total_weight)
@@ -332,7 +305,10 @@ const MarketingProductForm = ({
             label='Total Penjualan (Rp)'
             name='total_price'
             value={formik.values.total_price}
-            onChange={formik.handleChange}
+            onChange={(e) => {
+              formik.handleChange(e);
+              setCurrentInput(e.target.name);
+            }}
             onBlur={() => handleBlurField('total_price')}
             isError={
               formik.touched.total_price && Boolean(formik.errors.total_price)
@@ -358,4 +334,4 @@ const MarketingProductForm = ({
   );
 };
 
-export default MarketingProductForm;
+export default SalesOrderProductForm;

src/components/pages/marketing/form/table-view/DeliveryOrderProductTable.tsx

@@ -0,0 +1,272 @@
+import Table from '@/components/Table';
+import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
+import Button from '@/components/Button';
+import { Icon } from '@iconify/react';
+import * as TanStack from '@tanstack/react-table';
+import { useMemo, useRef } from 'react';
+import {
+  cn,
+  formatCurrency,
+  formatDate,
+  formatNumber,
+  formatVechicleNumber,
+} from '@/lib/helper';
+
+type DeliveryOrderProductTableProps = {
+  data: DeliveryOrderProductFormValues[];
+  formType?: 'add' | 'edit' | 'add_deliver' | 'edit_deliver';
+  onEdit: (id: number) => void;
+  onAddProductClick: () => void;
+};
+
+const DeliveryOrderProductTable = ({
+  data,
+  formType,
+  onEdit,
+  onAddProductClick,
+}: DeliveryOrderProductTableProps) => {
+  const onEditRef = useRef(onEdit);
+  onEditRef.current = onEdit;
+
+  const canAddData = data.filter((item) => !Boolean(item.qty));
+
+  const columns = useMemo(() => {
+    const cols = [
+      // {
+      //   id: 'select',
+      //   header: ({
+      //     table,
+      //   }: {
+      //     table: TanStack.Table<DeliveryOrderProductFormValues>;
+      //   }) => (
+      //     <div className='w-full flex flex-row justify-center'>
+      //       <CheckboxInput
+      //         name='allRow'
+      //         checked={table.getIsAllRowsSelected()}
+      //         indeterminate={table.getIsSomeRowsSelected()}
+      //         onChange={table.getToggleAllRowsSelectedHandler()}
+      //       />
+      //     </div>
+      //   ),
+      //   cell: ({
+      //     row,
+      //   }: {
+      //     row: TanStack.Row<DeliveryOrderProductFormValues>;
+      //   }) => (
+      //     <div>
+      //       <CheckboxInput
+      //         name='row'
+      //         checked={row.getIsSelected()}
+      //         disabled={!row.getCanSelect()}
+      //         indeterminate={row.getIsSomeSelected()}
+      //         onChange={row.getToggleSelectedHandler()}
+      //       />
+      //     </div>
+      //   ),
+      // },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.do_number,
+        header: 'No. Pengiriman',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) => (
+          <>
+            {props.row.original.do_number ? props.row.original.do_number : '-'}
+          </>
+        ),
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.vehicle_number,
+        header: 'No. Polisi',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.vehicle_number
+            ? formatVechicleNumber(props.row.original.vehicle_number as string)
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) =>
+          row.marketing_product?.kandang?.label,
+        header: 'Kandang',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) =>
+          row.marketing_product?.product_warehouse?.label,
+        header: 'Produk',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) =>
+          row.delivery_date
+            ? formatDate(row.delivery_date as string, 'DD MMM YYYY')
+            : '-',
+        header: 'Tanggal Delivery',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.delivery_date
+            ? formatDate(
+                props.row.original.delivery_date as string,
+                'DD MMM YYYY'
+              )
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.unit_price,
+        header: 'Harga Satuan (Rp)',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.unit_price
+            ? formatCurrency(
+                parseFloat(props.row.original.unit_price as string)
+              )
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.total_weight,
+        header: 'Total Bobot (Kg)',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.total_weight
+            ? formatNumber(
+                parseFloat(props.row.original.total_weight as string)
+              )
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.qty,
+        header: 'Kuantitas',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.qty
+            ? formatNumber(parseFloat(props.row.original.qty as string))
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.avg_weight,
+        header: 'Avg. Bobot (Kg)',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.avg_weight
+            ? formatNumber(parseFloat(props.row.original.avg_weight as string))
+            : '-',
+      },
+      {
+        accessorFn: (row: DeliveryOrderProductFormValues) => row.total_price,
+        header: 'Total Penjualan (Rp)',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) =>
+          props.row.original.total_price
+            ? formatCurrency(
+                parseFloat(props.row.original.total_price as string)
+              )
+            : '-',
+      },
+
+      {
+        header: 'Aksi',
+        cell: (
+          props: TanStack.CellContext<DeliveryOrderProductFormValues, unknown>
+        ) => (
+          <div className='flex flex-row gap-1 items-center justify-end h-full mt-2'>
+            <>
+              {props.row.original.qty && (
+                <Button
+                  color='warning'
+                  className='px-2 py-1 text-sm'
+                  onClick={() =>
+                    onEditRef.current(props.row.original.id as number)
+                  }
+                  type='button'
+                >
+                  <Icon icon='mdi:edit' width={16} height={16} /> Edit
+                </Button>
+              )}
+              {!props.row.original.qty && '-'}
+              {/* {formType == 'add_deliver' && (
+                <Button
+                  color='error'
+                  className='p-1'
+                  onClick={() =>
+                    onDeleteRef.current(props.row.original.id as number)
+                  }
+                  type='button'
+                >
+                  <Icon icon='mdi:trash' width={16} height={16} />
+                </Button>
+              )} */}
+            </>
+          </div>
+        ),
+      },
+    ];
+    if (formType == 'add_deliver') {
+      return cols.filter((col) => col.header != 'No. Pengiriman');
+    }
+    return cols;
+  }, [formType, onEditRef]);
+
+  return (
+    <>
+      <Table<DeliveryOrderProductFormValues>
+        data={data}
+        columns={columns}
+        className={{
+          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableClassName: 'font-inter w-full table-auto min-h-full!',
+          headerRowClassName: 'border-b border-b-gray-200',
+          headerColumnClassName:
+            'px-2 py-2 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end first:flex first:flex-row first:justify-start',
+          bodyRowClassName: 'border-b border-b-gray-200',
+          bodyColumnClassName:
+            'px-2 py-2 last:flex last:flex-row last:justify-end',
+          paginationClassName: 'hidden',
+        }}
+        emptyContent={
+          <div
+            className={cn(
+              'w-full h-16 flex flex-col justify-center items-center gap-2'
+            )}
+          >
+            <span className='text-gray-500'>Belum ada data pengiriman</span>
+          </div>
+        }
+      />
+      <div className='flex flex-row gap-3 mt-3'>
+        <Button
+          type='button'
+          variant='outline'
+          className='justify-start w-fit py-1 text-sm'
+          onClick={onAddProductClick}
+          disabled={!canAddData}
+        >
+          <Icon icon='mdi:plus' width={16} height={16} />
+          Tambah Pengiriman
+        </Button>
+        {/* {selectedRowIds.length > 0 && (
+          <Button
+            type='button'
+            variant='outline'
+            color='error'
+            className='justify-start w-fit py-1 text-sm'
+            onClick={onBulkDelete}
+          >
+            <Icon icon='mdi:trash' width={16} height={16} />
+            Hapus
+            {selectedRowIds.length > 0
+              ? ` (${selectedRowIds.length})`
+              : ''}{' '}
+            Pengiriman
+          </Button>
+        )} */}
+      </div>
+    </>
+  );
+};
+
+export default DeliveryOrderProductTable;

src/components/pages/marketing/form/table-view/SalesOrderProductTable.tsx

@@ -0,0 +1,203 @@
+'use client';
+
+import Button from '@/components/Button';
+import Table from '@/components/Table';
+import { SalesOrderProductFormValues } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+import {
+  cn,
+  formatCurrency,
+  formatNumber,
+  formatVechicleNumber,
+} from '@/lib/helper';
+import { Icon } from '@iconify/react';
+import { useMemo, useRef, useState } from 'react';
+import * as TanStack from '@tanstack/react-table';
+import CheckboxInput from '@/components/input/CheckboxInput';
+
+type SalesOrderProductTableProps = {
+  data: SalesOrderProductFormValues[];
+  formType: 'add' | 'edit' | 'add_deliver' | 'edit_deliver';
+  rowSelection: Record<string, boolean>;
+  setRowSelection: React.Dispatch<
+    React.SetStateAction<Record<string, boolean>>
+  >;
+  selectedRowIds: number[];
+  onDelete: (id: number) => void;
+  onBulkDelete: () => void;
+  onAddProductClick: () => void;
+};
+
+const SalesOrderProductTable = ({
+  data,
+  formType,
+  rowSelection,
+  setRowSelection,
+  selectedRowIds,
+  onDelete,
+  onBulkDelete,
+  onAddProductClick,
+}: SalesOrderProductTableProps) => {
+  const onDeleteRef = useRef(onDelete);
+  onDeleteRef.current = onDelete;
+
+  const columns = useMemo(
+    () => [
+      {
+        id: 'select',
+        header: ({
+          table,
+        }: {
+          table: TanStack.Table<SalesOrderProductFormValues>;
+        }) => (
+          <div className='w-full flex flex-row justify-center'>
+            <CheckboxInput
+              name='allRow'
+              checked={table.getIsAllRowsSelected()}
+              indeterminate={table.getIsSomeRowsSelected()}
+              onChange={table.getToggleAllRowsSelectedHandler()}
+            />
+          </div>
+        ),
+        cell: ({ row }: { row: TanStack.Row<SalesOrderProductFormValues> }) => (
+          <div>
+            <CheckboxInput
+              name='row'
+              checked={row.getIsSelected()}
+              disabled={!row.getCanSelect()}
+              indeterminate={row.getIsSomeSelected()}
+              onChange={row.getToggleSelectedHandler()}
+              value={`${row.original.product_warehouse_id}${row.original.kandang_id}`}
+            />
+          </div>
+        ),
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatVechicleNumber(row.vehicle_number as string),
+        header: 'No. Polisi',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) => row.kandang?.label,
+        header: 'Kandang',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          row.product_warehouse?.label,
+        header: 'Produk',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatCurrency(parseFloat(row.unit_price as string)),
+        header: 'Harga Satuan (Rp)',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatNumber(parseFloat(row.total_weight as string)),
+        header: 'Total Bobot (Kg)',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatNumber(parseFloat(row.qty as string)),
+        header: 'Kuantitas',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatNumber(parseFloat(row.avg_weight as string)),
+        header: 'Avg. Bobot (Kg)',
+      },
+      {
+        accessorFn: (row: SalesOrderProductFormValues) =>
+          formatCurrency(parseFloat(row.total_price as string)),
+        header: 'Total Penjualan (Rp)',
+      },
+      {
+        header: 'Aksi',
+        cell: (
+          props: TanStack.CellContext<SalesOrderProductFormValues, unknown>
+        ) => (
+          <div className='flex flex-row gap-1 items-center justify-end h-full mt-2'>
+            <Button
+              color='error'
+              className='p-1'
+              onClick={() =>
+                onDeleteRef.current(props.row.original.id as number)
+              }
+              type='button'
+            >
+              <Icon icon='mdi:trash' width={16} height={16} />
+            </Button>
+          </div>
+        ),
+      },
+    ],
+    []
+  );
+
+  return (
+    <>
+      <Table<SalesOrderProductFormValues>
+        rowSelection={rowSelection}
+        setRowSelection={setRowSelection}
+        data={data}
+        columns={
+          formType == 'add_deliver' || formType == 'edit_deliver'
+            ? columns.filter(
+                (col) => col.header != 'Aksi' && col.id != 'select'
+              )
+            : columns
+        }
+        className={{
+          tableWrapperClassName: 'overflow-x-auto min-h-full!',
+          tableClassName: 'font-inter w-full table-auto min-h-full!',
+          headerRowClassName: 'border-b border-b-gray-200',
+          headerColumnClassName:
+            'px-2 py-2 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end first:flex first:flex-row first:justify-start',
+          bodyRowClassName: 'border-b border-b-gray-200',
+          bodyColumnClassName:
+            'px-2 py-2 last:flex last:flex-row last:justify-end first:flex first:flex-row first:justify-start',
+          paginationClassName: 'hidden',
+        }}
+        emptyContent={
+          <div
+            className={cn(
+              'w-full h-16 flex flex-col justify-center items-center gap-2'
+            )}
+          >
+            <span className='text-gray-500'>Belum ada data penjualan</span>
+          </div>
+        }
+      />
+      {formType != 'add_deliver' && formType != 'edit_deliver' && (
+        <div className='flex flex-row gap-3 mt-3'>
+          <Button
+            type='button'
+            variant='outline'
+            className='justify-start w-fit py-1 text-sm'
+            onClick={onAddProductClick}
+          >
+            <Icon icon='mdi:plus' width={16} height={16} />
+            Tambah Produk
+          </Button>
+          {selectedRowIds.length > 0 && (
+            <Button
+              type='button'
+              variant='outline'
+              color='error'
+              className='justify-start w-fit py-1 text-sm'
+              onClick={onBulkDelete}
+            >
+              <Icon icon='mdi:trash' width={16} height={16} />
+              Hapus
+              {selectedRowIds.length > 0
+                ? ` (${selectedRowIds.length})`
+                : ''}{' '}
+              Produk
+            </Button>
+          )}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default SalesOrderProductTable;

src/components/pages/marketing/pdf/DeliveryOrderExport.tsx

@@ -0,0 +1,235 @@
+import Button from '@/components/Button';
+import { BaseDeliveryOrder, Marketing } from '@/types/api/marketing/marketing';
+import { Icon } from '@iconify/react';
+import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
+import { useMemo, useState } from 'react';
+import pdfStyles from './styles/MarketingPDFStyles';
+import { formatDate, formatNumber, formatVechicleNumber } from '@/lib/helper';
+import { format } from 'path';
+import { date } from 'yup';
+
+interface DeliveryOrderExportProps {
+  data?: Marketing;
+  deliveryOrder: BaseDeliveryOrder;
+  className?: string;
+}
+
+const DeliveryOrderExport = ({
+  data,
+  deliveryOrder,
+}: DeliveryOrderExportProps) => {
+  const [isGeneratingPDF, setIsGeneratingPDF] = useState(false);
+  const salesData = data;
+
+  const handleDownloadPDF = async () => {
+    if (!salesData) {
+      alert('No sales order data available');
+      return;
+    }
+    setIsGeneratingPDF(true);
+    try {
+      const blob = await pdf(
+        <PDFDocument data={salesData} deliveryOrder={deliveryOrder} />
+      ).toBlob();
+      const url = URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = `${deliveryOrder?.do_number || 'delivery-order'}.pdf`;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      URL.revokeObjectURL(url);
+    } catch (error) {
+      console.error('Error generating PDF:', error);
+      alert('Failed to generate PDF. Please try again.');
+    } finally {
+      setIsGeneratingPDF(false);
+    }
+  };
+
+  if (!salesData) {
+    return (
+      <div className='flex items-center justify-center min-h-screen'>
+        <div className='text-gray-500'>No sales order data available</div>
+      </div>
+    );
+  }
+
+  return salesData?.so_number && salesData.so_number !== 'Belum dibuat' ? (
+    <Button
+      color='primary'
+      className='w-fit min-w-32 flex items-center justify-start gap-1 px-2 py-1 text-sm font-mono'
+      onClick={handleDownloadPDF}
+      isLoading={isGeneratingPDF}
+    >
+      <Icon icon='material-symbols:file-open-outline' width={16} height={16} />
+      {deliveryOrder.do_number}
+    </Button>
+  ) : null;
+};
+
+export default DeliveryOrderExport;
+const PDFDocument = ({
+  data,
+  deliveryOrder,
+}: {
+  data: Marketing;
+  deliveryOrder: BaseDeliveryOrder;
+}) => {
+  const grandTotal = useMemo(() => {
+    return (
+      deliveryOrder.deliveries?.reduce((a, b) => a + b.total_price, 0) ?? 0
+    );
+  }, []);
+
+  return (
+    <Document>
+      <Page size='A4' style={pdfStyles.page}>
+        {/* Header Section */}
+        <View style={pdfStyles.header}>
+          <Image
+            src={'https://placehold.co/120x30/png'}
+            style={pdfStyles.logo}
+            id={'mbu-logo'}
+          />
+          <Text style={pdfStyles.companyInfo}>PT LUMBUNG TELUR INDONESIA</Text>
+          <Text style={pdfStyles.address}>
+            SOHO Building Lt.3 (Paris Van Java), Jalan Karang Tinggal, Kel.
+            Cipedes, Kec. Sukajadi, Kota Bandung 40162
+          </Text>
+          <View style={pdfStyles.divider} />
+        </View>
+
+        {/* Delivery Order Title */}
+        <View style={pdfStyles.titleSection}>
+          <Text style={pdfStyles.title}>DELIVERY ORDER</Text>
+          <View style={pdfStyles.poInfo}>
+            <Text>{deliveryOrder.do_number || '-'}</Text>
+          </View>
+        </View>
+
+        {/* Depature Table */}
+        <View style={pdfStyles.table}>
+          <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Ship To</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeaderLast}>
+              <Text>Depature From</Text>
+            </View>
+          </View>
+          <View style={pdfStyles.tableRow}>
+            <View style={pdfStyles.tableCell}>
+              <Text style={{ fontWeight: 'bold' }}>
+                {data?.customer?.name || '-'} ({data?.customer?.type || '-'})
+              </Text>
+              <Text style={{ marginTop: '2px' }}>
+                {data?.customer.email || ''} - {data?.customer.phone || ''}
+              </Text>
+              <Text></Text>
+              <Text>{data?.customer.address || ''}</Text>
+              <Text style={{ fontSize: '7px', marginTop: '3px' }}></Text>
+            </View>
+            <View style={pdfStyles.tableCellLast}>
+              <Text style={{ fontWeight: 'bold' }}>
+                {deliveryOrder.warehouse?.name || '-'}
+              </Text>
+              <Text style={{ marginTop: '2px' }}>
+                {formatDate(deliveryOrder.delivery_date, 'DD MMM YYYY')}
+              </Text>
+              <Text>{deliveryOrder.warehouse?.area?.name}</Text>
+            </View>
+          </View>
+        </View>
+
+        {/* Delivery Table */}
+        <Text style={pdfStyles.sectionTitle}>Product Shipped</Text>
+        <View style={pdfStyles.table}>
+          <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Item Description</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Vehicle Number</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Unit Price</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Quantity</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeaderLast}>
+              <Text>Total Amount</Text>
+            </View>
+          </View>
+          {deliveryOrder.deliveries?.map((item, index) => {
+            return (
+              <View key={index} style={[pdfStyles.tableRow]}>
+                <View style={pdfStyles.tableCell}>
+                  <Text>{item.product_warehouse?.product?.name || '-'}</Text>
+                </View>
+                <View style={pdfStyles.tableCell}>
+                  <Text>
+                    {formatVechicleNumber(item.vehicle_number) || '-'}
+                  </Text>
+                </View>
+                <View style={pdfStyles.tableCellRight}>
+                  <Text>Rp{formatNumber(item.unit_price || 0)}</Text>
+                </View>
+                <View style={pdfStyles.tableCellRight}>
+                  <Text>{formatNumber(item.qty || 0)}</Text>
+                </View>
+                <View style={pdfStyles.tableCellRightLast}>
+                  <Text>Rp{formatNumber(item.total_price || 0)}</Text>
+                </View>
+              </View>
+            );
+          }) || []}
+
+          {/* Grand Total Row inside table */}
+          <View style={pdfStyles.grandTotalRow}>
+            <View style={[pdfStyles.tableCell, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={[pdfStyles.tableCell, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={[pdfStyles.tableCellRight, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={pdfStyles.tableCellRight}>
+              <Text style={{ fontWeight: 'bold' }}>Grand Total</Text>
+            </View>
+            <View
+              style={[pdfStyles.tableCellRightLast, { fontWeight: 'bold' }]}
+            >
+              <Text>Rp{formatNumber(grandTotal)}</Text>
+            </View>
+          </View>
+        </View>
+
+        {/* Footer with Special Instructions */}
+        <View style={pdfStyles.footer}>
+          <View style={pdfStyles.specialInstructionTable}>
+            <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+              <View style={pdfStyles.tableCellHeaderLast}>
+                <Text>From Sales Order</Text>
+              </View>
+            </View>
+            <View style={pdfStyles.tableRow}>
+              <View style={pdfStyles.tableCellLast}>
+                <Text>
+                  {data?.so_number || '-'} -{' '}
+                  {formatDate(data.so_date, 'DD MMM YYYY')}
+                </Text>
+              </View>
+            </View>
+          </View>
+          <View style={pdfStyles.footerCompany}>
+            <Text>PT LUMBUNG TELUR INDONESIA</Text>
+          </View>
+        </View>
+      </Page>
+    </Document>
+  );
+};

src/components/pages/marketing/pdf/SalesOrderExport.tsx

@@ -0,0 +1,227 @@
+import Button from '@/components/Button';
+import { Marketing } from '@/types/api/marketing/marketing';
+import { Icon } from '@iconify/react';
+import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
+import { useMemo, useState } from 'react';
+import pdfStyles from './styles/MarketingPDFStyles';
+import { formatDate, formatNumber } from '@/lib/helper';
+
+interface SalesOrderExportProps {
+  data?: Marketing;
+  className?: string;
+}
+
+const SalesOrderExport = ({ data }: SalesOrderExportProps) => {
+  const [isGeneratingPDF, setIsGeneratingPDF] = useState(false);
+  const salesData = data;
+
+  const handleDownloadPDF = async () => {
+    if (!salesData) {
+      alert('No sales order data available');
+      return;
+    }
+    setIsGeneratingPDF(true);
+    try {
+      const blob = await pdf(<PDFDocument data={salesData} />).toBlob();
+      const url = URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = `${salesData?.so_number || 'sales-order'}.pdf`;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      URL.revokeObjectURL(url);
+    } catch (error) {
+      console.error('Error generating PDF:', error);
+      alert('Failed to generate PDF. Please try again.');
+    } finally {
+      setIsGeneratingPDF(false);
+    }
+  };
+
+  if (!salesData) {
+    return (
+      <div className='flex items-center justify-center min-h-screen'>
+        <div className='text-gray-500'>No sales order data available</div>
+      </div>
+    );
+  }
+
+  return salesData?.so_number && salesData.so_number !== 'Belum dibuat' ? (
+    <Button
+      color='primary'
+      className='w-fit min-w-32 flex items-center justify-start gap-1 px-2 py-1 text-sm font-mono'
+      onClick={handleDownloadPDF}
+      isLoading={isGeneratingPDF}
+    >
+      <Icon icon='material-symbols:file-open-outline' width={16} height={16} />
+      {salesData.so_number}
+    </Button>
+  ) : null;
+};
+
+export default SalesOrderExport;
+const PDFDocument = ({ data }: { data: Marketing }) => {
+  const grandTotal = useMemo(() => {
+    return data?.sales_order?.reduce((a, b) => a + b.total_price, 0) ?? 0;
+  }, [data?.sales_order]);
+
+  return (
+    <Document>
+      <Page size='A4' style={pdfStyles.page}>
+        {/* Header Section */}
+        <View style={pdfStyles.header}>
+          <Image
+            src={'https://placehold.co/120x30/png'}
+            style={pdfStyles.logo}
+            id={'mbu-logo'}
+          />
+          <Text style={pdfStyles.companyInfo}>PT LUMBUNG TELUR INDONESIA</Text>
+          <Text style={pdfStyles.address}>
+            SOHO Building Lt.3 (Paris Van Java), Jalan Karang Tinggal, Kel.
+            Cipedes, Kec. Sukajadi, Kota Bandung 40162
+          </Text>
+          <View style={pdfStyles.divider} />
+        </View>
+
+        {/* Sales Order Title */}
+        <View style={pdfStyles.titleSection}>
+          <Text style={pdfStyles.title}>SALES ORDER</Text>
+          <View style={pdfStyles.poInfo}>
+            <Text>SO Number: {data?.so_number || '-'}</Text>
+            <Text>
+              Date:{' '}
+              {data?.so_date
+                ? formatDate(data.so_date, 'DD MMM YYYY')
+                : formatDate(new Date(), 'DD MMM YYYY')}
+            </Text>
+          </View>
+        </View>
+
+        {/* Customer Table */}
+        <View style={pdfStyles.table}>
+          <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Customer</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeaderLast}>
+              <Text>Sales</Text>
+            </View>
+          </View>
+          <View style={pdfStyles.tableRow}>
+            <View style={pdfStyles.tableCell}>
+              <Text style={{ fontWeight: 'bold' }}>
+                {data?.customer?.name || '-'} ({data?.customer?.type || '-'})
+              </Text>
+              <Text style={{ marginTop: '2px' }}>
+                {data?.customer.email || ''} - {data?.customer.phone || ''}
+              </Text>
+              <Text></Text>
+              <Text>{data?.customer.address || ''}</Text>
+              <Text style={{ fontSize: '7px', marginTop: '3px' }}></Text>
+            </View>
+            <View style={pdfStyles.tableCellLast}>
+              <Text style={{ fontWeight: 'bold' }}>
+                PT LUMBUNG TELUR INDONESIA
+              </Text>
+              <Text style={{ fontWeight: 'bold', marginTop: '2px' }}>
+                {data?.sales_person?.name || '-'}
+              </Text>
+              <Text>{data?.sales_person.email}</Text>
+            </View>
+          </View>
+        </View>
+
+        {/* Product Sales Order Table */}
+        <Text style={pdfStyles.sectionTitle}>Product Sold</Text>
+        <View style={pdfStyles.table}>
+          <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Item Description</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>From</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Unit Price</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeader}>
+              <Text>Quantity</Text>
+            </View>
+            <View style={pdfStyles.tableCellHeaderLast}>
+              <Text>Total Amount</Text>
+            </View>
+          </View>
+          {data?.sales_order?.map((item, index) => {
+            const isLastItem = index === (data?.sales_order?.length || 0) - 1;
+            return (
+              <View
+                key={index}
+                style={[
+                  pdfStyles.tableRow,
+                  // isLastItem ? {} : pdfStyles.tableBorderBottom,
+                ]}
+              >
+                <View style={pdfStyles.tableCell}>
+                  <Text>{item.product_warehouse?.product?.name || '-'}</Text>
+                </View>
+                <View style={pdfStyles.tableCell}>
+                  <Text>{item.product_warehouse?.warehouse?.name || '-'}</Text>
+                </View>
+                <View style={pdfStyles.tableCellRight}>
+                  <Text>Rp{formatNumber(item.unit_price || 0)}</Text>
+                </View>
+                <View style={pdfStyles.tableCellRight}>
+                  <Text>{formatNumber(item.qty || 0)}</Text>
+                </View>
+                <View style={pdfStyles.tableCellRightLast}>
+                  <Text>Rp{formatNumber(item.total_price || 0)}</Text>
+                </View>
+              </View>
+            );
+          }) || []}
+
+          {/* Grand Total Row inside table */}
+          <View style={pdfStyles.grandTotalRow}>
+            <View style={[pdfStyles.tableCell, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={[pdfStyles.tableCell, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={[pdfStyles.tableCellRight, { borderRightWidth: 0 }]}>
+              <Text></Text>
+            </View>
+            <View style={pdfStyles.tableCellRight}>
+              <Text style={{ fontWeight: 'bold' }}>Grand Total</Text>
+            </View>
+            <View
+              style={[pdfStyles.tableCellRightLast, { fontWeight: 'bold' }]}
+            >
+              <Text>Rp{formatNumber(grandTotal)}</Text>
+            </View>
+          </View>
+        </View>
+
+        {/* Footer with Special Instructions */}
+        <View style={pdfStyles.footer}>
+          <View style={pdfStyles.specialInstructionTable}>
+            <View style={[pdfStyles.tableRow, pdfStyles.tableHeader]}>
+              <View style={pdfStyles.tableCellHeaderLast}>
+                <Text>Notes</Text>
+              </View>
+            </View>
+            <View style={pdfStyles.tableRow}>
+              <View style={pdfStyles.tableCellLast}>
+                <Text>{data?.notes || '-'}</Text>
+              </View>
+            </View>
+          </View>
+          <View style={pdfStyles.footerCompany}>
+            <Text>PT LUMBUNG TELUR INDONESIA</Text>
+          </View>
+        </View>
+      </Page>
+    </Document>
+  );
+};

src/components/pages/marketing/pdf/styles/MarketingPDFStyles.tsx

@@ -0,0 +1,212 @@
+import { StyleSheet } from '@react-pdf/renderer';
+
+const pdfStyles = StyleSheet.create({
+  page: {
+    fontSize: 10,
+    fontFamily: 'Helvetica',
+    padding: 20,
+    backgroundColor: '#FFFFFF',
+  },
+  header: {
+    marginBottom: 20,
+  },
+  logo: {
+    width: 120,
+    height: 30,
+    marginBottom: 8,
+  },
+  companyInfo: {
+    fontSize: 12,
+    fontWeight: 'bold',
+    marginBottom: 4,
+    color: '#1f74bf',
+  },
+  address: {
+    fontSize: 8,
+    color: '#666666',
+    maxWidth: 400,
+    marginBottom: 10,
+  },
+  divider: {
+    borderBottomWidth: 1,
+    borderBottomColor: '#000000',
+    borderBottomStyle: 'solid',
+    marginBottom: 15,
+  },
+  titleSection: {
+    flexDirection: 'row',
+    marginBottom: 20,
+    justifyContent: 'space-between',
+    alignItems: 'flex-start',
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    flex: 3,
+    color: '#1f74bf',
+  },
+  poInfo: {
+    flex: 1,
+    fontSize: 9,
+    textAlign: 'right',
+  },
+  sectionTitle: {
+    fontSize: 12,
+    fontWeight: 'bold',
+    marginBottom: 8,
+    color: '#1f74bf',
+  },
+  table: {
+    borderWidth: 1,
+    borderColor: '#000000',
+    marginBottom: 15,
+  },
+  tableRow: {
+    flexDirection: 'row',
+  },
+  tableHeader: {
+    backgroundColor: '#F5F5F5',
+  },
+  tableCell: {
+    flex: 1,
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+    padding: 8,
+    fontSize: 9,
+  },
+  tableCellLast: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+  },
+  tableCellHeader: {
+    flex: 1,
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+    padding: 8,
+    fontSize: 9,
+    fontWeight: 'bold',
+    backgroundColor: '#F5F5F5',
+  },
+  tableCellHeaderLast: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+    fontWeight: 'bold',
+    backgroundColor: '#F5F5F5',
+  },
+  tableCellRight: {
+    flex: 1,
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+    padding: 8,
+    fontSize: 9,
+    textAlign: 'right',
+  },
+  tableCellRightLast: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+    textAlign: 'right',
+  },
+  tableBorderBottom: {
+    borderBottomWidth: 1,
+    borderBottomColor: '#000000',
+    borderBottomStyle: 'solid',
+  },
+  grandTotalRow: {
+    flexDirection: 'row',
+    borderTopWidth: 1,
+    borderTopColor: '#000000',
+    borderTopStyle: 'solid',
+  },
+  grandTotalLabel: {
+    flex: 3,
+    padding: 8,
+    fontSize: 9,
+    fontWeight: 'bold',
+    textAlign: 'right',
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+  },
+  grandTotalValue: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+    fontWeight: 'bold',
+    textAlign: 'right',
+    borderRightWidth: 0,
+  },
+  allocationSection: {
+    marginBottom: 15,
+  },
+  allocationTable: {
+    borderWidth: 1,
+    borderColor: '#000000',
+  },
+  innerTable: {
+    marginTop: 5,
+    borderWidth: 1,
+    borderColor: '#000000',
+  },
+  innerRow: {
+    flexDirection: 'row',
+    borderBottomWidth: 1,
+    borderBottomColor: '#000000',
+    borderBottomStyle: 'solid',
+  },
+  innerCell: {
+    flex: 1,
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+    padding: 8,
+    fontSize: 9,
+  },
+  innerCellLast: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+  },
+  innerCellRight: {
+    flex: 1,
+    borderRightWidth: 1,
+    borderRightColor: '#000000',
+    borderRightStyle: 'solid',
+    padding: 8,
+    fontSize: 9,
+    textAlign: 'right',
+  },
+  innerCellRightLast: {
+    flex: 1,
+    padding: 8,
+    fontSize: 9,
+    textAlign: 'right',
+  },
+  footer: {
+    marginTop: 30,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'flex-start',
+  },
+  footerCompany: {
+    fontSize: 12,
+    fontWeight: 'bold',
+    textAlign: 'right',
+    flex: 1,
+    color: '#1f74bf',
+  },
+  specialInstructionTable: {
+    width: '60%',
+    maxWidth: 300,
+    borderWidth: 1,
+    borderColor: '#000000',
+    flex: 1,
+  },
+});
+
+export default pdfStyles;

src/components/pages/marketing/sales-orders/detail/SalesOrderDetail.tsx

@@ -1,308 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import Card from '@/components/Card';
-import { FormHeader } from '@/components/helper/form/FormHeader';
-import { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import Table from '@/components/Table';
-import {
-  cn,
-  formatCurrency,
-  formatNumber,
-  formatVechicleNumber,
-} from '@/lib/helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { Marketing, MarketingProduct } from '@/types/api/marketing/marketing';
-import { Icon } from '@iconify/react';
-import { useState } from 'react';
-import toast from 'react-hot-toast';
-
-const SalesOrderDetail = ({
-  initialValues,
-  refreshValues,
-}: {
-  initialValues?: Marketing;
-  refreshValues?: () => void;
-}) => {
-  const [approvalAction, setApprovalAction] = useState<'approve' | 'reject'>(
-    'approve'
-  );
-  const [isLoading, setIsLoading] = useState(false);
-
-  const deleteModal = useModal();
-  const confirmationModal = useModal();
-  const deliveryModal = useModal();
-
-  const approveClickHandler = () => {
-    setApprovalAction('approve');
-    confirmationModal.openModal();
-  };
-
-  const rejectClickHandler = () => {
-    setApprovalAction('reject');
-    confirmationModal.openModal();
-  };
-
-  const deliveryClickHandler = () => {
-    deliveryModal.openModal();
-  };
-
-  const deleteClickHandler = () => {
-    deleteModal.openModal();
-  };
-
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsLoading(true);
-    // await MarketingApi.delete(initialValues?.id as number);
-    setIsLoading(false);
-    deleteModal.closeModal();
-    toast.success('Successfully deleted Sales Order!');
-    refreshValues?.();
-  };
-
-  const confirmationModalApproveClickHandler = async () => {
-    setIsLoading(true);
-    // await MarketingApi.singleApproval(
-    //   initialValues?.id as number,
-    //   approvalAction
-    // );
-    setIsLoading(false);
-    confirmationModal.closeModal();
-    toast.success('Successfully approved Sales Order!');
-    refreshValues?.();
-  };
-
-  const confirmationModalDeliveryClickHandler = async () => {
-    setIsLoading(true);
-    // await MarketingApi.delivery(initialValues?.id as number);
-    setIsLoading(false);
-    deliveryModal.closeModal();
-    toast.success('Successfully delivered Sales Order!');
-    refreshValues?.();
-  };
-
-  return (
-    <>
-      <div className='flex flex-col w-full gap-4'>
-        <FormHeader
-          title='Detail Sales Order'
-          backUrl='/marketing/sales-orders'
-        />
-        <div className='flex-row flex gap-3'>
-          {initialValues?.approval?.step_number != 3 && (
-            <>
-              <Button
-                color='success'
-                onClick={approveClickHandler}
-                disabled={initialValues?.approval?.step_number != 1}
-              >
-                <Icon icon='mdi:check' width={24} height={24} />
-                Approve
-              </Button>
-              <Button
-                color='error'
-                onClick={rejectClickHandler}
-                disabled={initialValues?.approval?.step_number != 2}
-              >
-                <Icon icon='mdi:close' width={24} height={24} />
-                Reject
-              </Button>
-            </>
-          )}
-          {initialValues?.approval?.step_number == 2 && (
-            <Button color='success' onClick={deliveryClickHandler}>
-              <Icon icon='mdi:check' width={24} height={24} />
-              Delivery Order
-            </Button>
-          )}
-        </div>
-        <Card
-          title='Informasi Sales Order'
-          className={{
-            wrapper: 'w-full bg-white',
-          }}
-        >
-          <div className='overflow-x-auto rounded-box border border-base-content/5 bg-base-100 mt-3'>
-            <table className='table'>
-              <tbody>
-                <tr>
-                  <td width='45%' className='font-semibold'>
-                    No. Sales Order
-                  </td>
-                  <td>:</td>
-                  <td width='50%'>{initialValues?.so_number}</td>
-                </tr>
-                <tr>
-                  <td className='font-semibold'>Nama Pelanggan</td>
-                  <td>:</td>
-                  <td>{initialValues?.customer?.name}</td>
-                </tr>
-                <tr>
-                  <td className='font-semibold'>Status</td>
-                  <td>:</td>
-                  <td>{initialValues?.approval?.step_name}</td>
-                </tr>
-                <tr>
-                  <td className='font-semibold'>Tanggal Penjualan</td>
-                  <td>:</td>
-                  <td>{initialValues?.so_date}</td>
-                </tr>
-                <tr>
-                  <td className='font-semibold'>Total Penjualan</td>
-                  <td>:</td>
-                  <td>
-                    {formatCurrency(initialValues?.grand_total as number)}
-                  </td>
-                </tr>
-                <tr>
-                  <td className='font-semibold'>Catatan</td>
-                  <td>:</td>
-                  <td>{initialValues?.notes ?? '-'}</td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </Card>
-        {initialValues?.marketing_products && (
-          <Card
-            title='Daftar Produk'
-            className={{
-              wrapper: 'w-full bg-white',
-            }}
-          >
-            <Table<MarketingProduct>
-              data={initialValues?.marketing_products}
-              columns={[
-                {
-                  header: 'No. Polisi',
-                  accessorFn(row) {
-                    return formatVechicleNumber(
-                      row.marketing_delivery_products?.vehicle_number as string
-                    );
-                  },
-                },
-                {
-                  header: 'Kandang',
-                  accessorFn(row) {
-                    return row.product_warehouse.warehouse.name;
-                  },
-                },
-                {
-                  header: 'Produk',
-                  accessorFn(row) {
-                    return row.product_warehouse.product.name;
-                  },
-                },
-                {
-                  header: 'Harga Satuan (Rp)',
-                  accessorFn(row) {
-                    return formatCurrency(row.unit_price);
-                  },
-                },
-                {
-                  header: 'Total Bobot (Kg)',
-                  accessorFn(row) {
-                    return formatNumber(row.total_weight);
-                  },
-                },
-                {
-                  header: 'Kuantitas',
-                  accessorFn(row) {
-                    return formatNumber(row.qty);
-                  },
-                },
-                {
-                  header: 'Avg. Bobot (Kg)',
-                  accessorFn(row) {
-                    return formatNumber(row.avg_weight);
-                  },
-                },
-                {
-                  header: 'Total Penjualan (Rp)',
-                  accessorFn(row) {
-                    return formatCurrency(row.total_price);
-                  },
-                },
-              ]}
-              className={{
-                containerClassName: cn({
-                  'mb-20':
-                    initialValues?.marketing_products &&
-                    initialValues?.marketing_products?.length === 0,
-                }),
-                tableWrapperClassName: 'overflow-x-auto min-h-full!',
-                tableClassName: 'font-inter w-full table-auto min-h-full!',
-                headerRowClassName: 'border-b border-b-gray-200',
-                headerColumnClassName:
-                  'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
-                bodyRowClassName: 'border-b border-b-gray-200',
-                bodyColumnClassName:
-                  'px-6 py-3 last:flex last:flex-row last:justify-end',
-                paginationClassName: 'hidden',
-              }}
-            />
-          </Card>
-        )}
-        <div className='flex flex-row gap-3'>
-          <Button
-            color='warning'
-            type='button'
-            href={`/marketing/sales-orders/detail/edit?salesOrderId=${initialValues?.id}`}
-          >
-            <Icon icon='mdi:pencil' width={24} height={24} />
-            Edit
-          </Button>
-          <Button color='error' onClick={deleteClickHandler}>
-            <Icon icon='mdi:delete' width={24} height={24} />
-            Hapus
-          </Button>
-        </div>
-      </div>
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data penjualan ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          isLoading: isLoading,
-          onClick: confirmationModalDeleteClickHandler,
-        }}
-      />
-      <ConfirmationModal
-        ref={confirmationModal.ref}
-        type={approvalAction === 'approve' ? 'success' : 'error'}
-        text={`Apakah anda yakin ingin ${approvalAction} data penjualan ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: approvalAction === 'approve' ? 'success' : 'error',
-          isLoading: isLoading,
-          onClick: confirmationModalApproveClickHandler,
-        }}
-      />
-      <ConfirmationModal
-        ref={deliveryModal.ref}
-        type={'success'}
-        text={`Apakah anda yakin ingin deliver penjualan ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'success',
-          isLoading: isLoading,
-          onClick: confirmationModalDeliveryClickHandler,
-        }}
-      />
-    </>
-  );
-};
-
-export default SalesOrderDetail;

src/components/pages/marketing/sales-orders/form/SalesForm.schema.ts

@@ -1,38 +0,0 @@
-import * as Yup from 'yup';
-import { MarketingProduct } from '@/types/api/marketing/marketing';
-import {
-  MarketingProductFormValues,
-  MarketingProductSchema,
-} from './repeater/MarketingProduct.schema';
-
-type MarketingSchema = {
-  customer_id: number | undefined;
-  customer:
-    | {
-        value: number;
-        label: string;
-      }
-    | undefined
-    | null;
-  so_date: string | undefined;
-  notes: string | undefined;
-  marketing_products: MarketingProductFormValues[];
-};
-
-export const MarketingSchema: Yup.ObjectSchema<MarketingSchema> = Yup.object({
-  customer_id: Yup.number().required('Customer wajib diisi!'),
-  customer: Yup.object({
-    value: Yup.number().required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  so_date: Yup.string().required('Tanggal wajib diisi!'),
-  notes: Yup.string().required('Catatan wajib diisi!'),
-  marketing_products: Yup.array()
-    .of(MarketingProductSchema)
-    .min(1, 'Minimal harus ada 1 produk!')
-    .required('Produk wajib diisi!'),
-});
-
-export const UpdateMarketingSchema = MarketingSchema;
-
-export type MarketingFormValues = Yup.InferType<typeof MarketingSchema>;

src/components/pages/marketing/sales-orders/form/SalesForm.tsx

@@ -1,514 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import Card from '@/components/Card';
-import { FormHeader } from '@/components/helper/form/FormHeader';
-import DateInput from '@/components/input/DateInput';
-import SelectInput, {
-  OptionType,
-  useSelect,
-} from '@/components/input/SelectInput';
-import TextArea from '@/components/input/TextArea';
-import Modal, { useModal } from '@/components/Modal';
-import * as TanStack from '@tanstack/react-table';
-import Table from '@/components/Table'; // Keep this import
-import { cn, formatCurrency, formatNumber } from '@/lib/helper';
-import {
-  CreateMarketingPayload,
-  CreateMarketingProductPayload,
-  Marketing,
-  MarketingProduct,
-} from '@/types/api/marketing/marketing';
-import { Icon } from '@iconify/react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import MarketingProductForm from './repeater/MarketingProductForm';
-import CheckboxInput from '@/components/input/CheckboxInput';
-import { Customer } from '@/types/api/master-data/customer';
-import { CustomerApi } from '@/services/api/master-data';
-import { useFormik } from 'formik';
-import { MarketingFormValues, MarketingSchema } from './SalesForm.schema';
-import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { MarketingApi } from '@/services/api/marketing/marketing';
-import { MarketingProductFormValues } from './repeater/MarketingProduct.schema';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import toast from 'react-hot-toast';
-import { useRouter } from 'next/navigation';
-
-const SalesForm = ({
-  formType = 'add',
-  initialValues,
-}: {
-  formType?: 'add' | 'edit';
-  initialValues?: Marketing;
-}) => {
-  const router = useRouter();
-  const addProductModal = useModal();
-  const deleteModal = useModal();
-
-  const [isLoading, setIsLoading] = useState(false);
-  const [selectedMarketingProduct, setSelectedMarketingProduct] =
-    useState<MarketingProduct | null>(null);
-  const [rawMarketingProducts, setRawMarketingProducts] = useState<
-    MarketingProduct[]
-  >(initialValues?.marketing_products || []);
-  const [selectedCustomer, setSelectedCustomer] = useState<OptionType | null>(
-    initialValues?.customer
-      ? { value: initialValues.customer.id, label: initialValues.customer.name }
-      : null
-  );
-  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
-  const selectedRowIds = Object.keys(rowSelection).map((item) =>
-    parseInt(item)
-  );
-  const [grandTotal, setGrandTotal] = useState<number>(
-    initialValues?.grand_total ?? 0
-  );
-  const marketingProducts = useMemo(
-    () => rawMarketingProducts,
-    [rawMarketingProducts]
-  );
-
-  const {
-    options: customerOptions,
-    rawData: customerRawData,
-    isLoadingOptions: isLoadingCustomerOptions,
-  } = useSelect<Customer>(CustomerApi.basePath, 'id', 'name');
-
-  const handleAddProduct = useCallback(() => {
-    addProductModal.openModal();
-  }, [addProductModal]);
-  const handleDeleteProduct = useCallback((id: number) => {
-    setRawMarketingProducts((prev) => prev.filter((p) => p.id !== id));
-  }, []);
-  const handleBulkDeleteProduct = () => {
-    setRawMarketingProducts((prev) =>
-      prev.filter((product) => !selectedRowIds.includes(product.id))
-    );
-  };
-  const handleDelete = () => {
-    deleteModal.openModal();
-  };
-
-  const handleAddSubmitProduct = useCallback(
-    async (
-      tableValue: CreateMarketingProductPayload,
-      fieldValues: MarketingProductFormValues
-    ) => {
-      const newMarketingProduct: MarketingProduct = {
-        id: rawMarketingProducts.length + 1,
-        product_warehouse: tableValue.product_warehouse!,
-        unit_price: tableValue.unit_price as number,
-        total_weight: tableValue.total_weight as number,
-        qty: tableValue.qty as number,
-        avg_weight: tableValue.avg_weight as number,
-        total_price: tableValue.total_price as number,
-        marketing_delivery_products: {
-          id: rawMarketingProducts.length + 1,
-          vehicle_number: tableValue.vehicle_number as string,
-          delivery_date: tableValue.delivery_date as string,
-          unit_price: tableValue.unit_price as number,
-          total_weight: tableValue.total_weight as number,
-          qty: tableValue.qty as number,
-          avg_weight: tableValue.avg_weight as number,
-          total_price: tableValue.total_price as number,
-        },
-      };
-
-      setRawMarketingProducts((prev) => [...prev, newMarketingProduct]);
-      formik.setValues({
-        ...formik.values,
-        marketing_products: [...formik.values.marketing_products, fieldValues],
-      });
-      setGrandTotal((prev) => prev + (tableValue.total_price as number));
-      addProductModal.closeModal();
-    },
-    [rawMarketingProducts.length, addProductModal]
-  );
-  const handleChangeCustomer = useCallback(
-    (val: OptionType | OptionType[] | null) => {
-      setSelectedCustomer(val as OptionType);
-      formik.setFieldValue('customer_id', (val as OptionType)?.value);
-      formik.setFieldValue('customer', val as OptionType);
-    },
-    [selectedCustomer, setSelectedCustomer]
-  );
-
-  const createMarketingHandler = async (values: CreateMarketingPayload) => {
-    console.log(values);
-    const createMarketingRes = await MarketingApi.create(values);
-    if (isResponseSuccess(createMarketingRes)) {
-      console.log(createMarketingRes);
-    }
-    if (isResponseError(createMarketingRes)) {
-      console.log(createMarketingRes);
-    }
-    toast.success('Successfully created Sales Order!');
-    router.push('/marketing/sales-orders');
-  };
-  const updateMarketingHandler = async (values: CreateMarketingPayload) => {
-    console.log(values);
-    const createMarketingRes = await MarketingApi.update(
-      initialValues?.id as number,
-      values
-    );
-    if (isResponseSuccess(createMarketingRes)) {
-      console.log(createMarketingRes);
-    }
-    if (isResponseError(createMarketingRes)) {
-      console.log(createMarketingRes);
-    }
-    toast.success('Successfully updated Sales Order!');
-    router.push('/marketing/sales-orders');
-  };
-  const deleteMarketingHandler = async () => {
-    setIsLoading(true);
-    console.log(initialValues?.id);
-    const deleteMarketingRes = await MarketingApi.delete(
-      initialValues?.id as number
-    );
-    if (isResponseSuccess(deleteMarketingRes)) {
-      console.log(deleteMarketingRes);
-    }
-    if (isResponseError(deleteMarketingRes)) {
-      console.log(deleteMarketingRes);
-    }
-    toast.success('Successfully deleted Sales Order!');
-    setIsLoading(false);
-    deleteModal.closeModal();
-    router.push('/marketing/sales-orders');
-  };
-
-  const MarketingProductToFieldValues = (
-    product: MarketingProduct
-  ): MarketingProductFormValues => {
-    return {
-      vehicle_number: product.marketing_delivery_products?.vehicle_number,
-      kandang_id: product.product_warehouse.warehouse.id,
-      kandang: {
-        value: product.product_warehouse.warehouse.id,
-        label: product.product_warehouse.warehouse.name,
-      },
-      product_warehouse: {
-        value: product.product_warehouse.product.id,
-        label: product.product_warehouse.product.name,
-      },
-      product_warehouse_id: product.product_warehouse.product.id,
-      unit_price: product.unit_price,
-      total_weight: product.total_weight,
-      qty: product.qty,
-      uom: product.product_warehouse?.product?.uom?.name,
-      avg_weight: product.avg_weight,
-      total_price: product.total_price,
-      delivery_date: product.marketing_delivery_products?.delivery_date,
-    };
-  };
-
-  const formik = useFormik<MarketingFormValues>({
-    enableReinitialize: true,
-    initialValues: {
-      so_date: initialValues?.so_date || undefined,
-      notes: initialValues?.notes || undefined,
-      customer_id: initialValues?.customer?.id || undefined,
-      customer: {
-        value: initialValues?.customer?.id as number,
-        label: initialValues?.customer?.name as string,
-      },
-      marketing_products:
-        initialValues?.marketing_products?.map((product) =>
-          MarketingProductToFieldValues(product)
-        ) ?? [],
-    },
-    validationSchema: MarketingSchema,
-    onSubmit: async (values) => {
-      const payload = {
-        customer_id: values.customer_id as number,
-        date: values.so_date as string,
-        notes: values.notes as string,
-        marketing_products: values.marketing_products,
-      } as CreateMarketingPayload;
-      switch (formType) {
-        case 'add':
-          createMarketingHandler(payload);
-          break;
-        case 'edit':
-          updateMarketingHandler(payload);
-          break;
-        default:
-          break;
-      }
-    },
-  });
-
-  const { setValues: formikSetValues } = formik;
-
-  useEffect(() => {
-    formikSetValues(formik.initialValues);
-  }, [formikSetValues, formik.initialValues]);
-
-  const columns = useMemo(
-    () => [
-      {
-        id: 'select',
-        header: ({ table }: { table: TanStack.Table<MarketingProduct> }) => (
-          <div className='w-full flex flex-row justify-center'>
-            <CheckboxInput
-              name='allRow'
-              checked={table.getIsAllRowsSelected()}
-              indeterminate={table.getIsSomeRowsSelected()}
-              onChange={table.getToggleAllRowsSelectedHandler()}
-            />
-          </div>
-        ),
-        cell: ({ row }: { row: TanStack.Row<MarketingProduct> }) => (
-          <div>
-            <CheckboxInput
-              name='row'
-              checked={row.getIsSelected()}
-              disabled={!row.getCanSelect()}
-              indeterminate={row.getIsSomeSelected()}
-              onChange={row.getToggleSelectedHandler()}
-            />
-          </div>
-        ),
-      },
-      {
-        accessorFn: (row: MarketingProduct) =>
-          row.marketing_delivery_products?.vehicle_number,
-        header: 'No. Polisi',
-      },
-      {
-        accessorFn: (row: MarketingProduct) =>
-          row.product_warehouse.warehouse.name,
-        header: 'Kandang',
-      },
-      {
-        accessorFn: (row: MarketingProduct) =>
-          row.product_warehouse.product.name,
-        header: 'Produk',
-      },
-      {
-        accessorFn: (row: MarketingProduct) => formatCurrency(row.unit_price),
-        header: 'Harga Satuan (Rp)',
-      },
-      {
-        accessorFn: (row: MarketingProduct) => formatNumber(row.total_weight),
-        header: 'Total Bobot (Kg)',
-      },
-      {
-        accessorFn: (row: MarketingProduct) => formatNumber(row.qty),
-        header: 'Kuantitas',
-      },
-      {
-        accessorFn: (row: MarketingProduct) => formatNumber(row.avg_weight),
-        header: 'Avg. Bobot (Kg)',
-      },
-      {
-        accessorFn: (row: MarketingProduct) => formatCurrency(row.total_price),
-        header: 'Total Penjualan (Rp)',
-      },
-      {
-        header: 'Aksi',
-        cell: (props: TanStack.CellContext<MarketingProduct, unknown>) => (
-          <div className='flex flex-row gap-1 items-center justify-end h-full mt-2'>
-            <Button
-              color='error'
-              className='p-1'
-              onClick={() => handleDeleteProduct(props.row.original.id)}
-            >
-              <Icon icon='mdi:trash' width={16} height={16} />
-            </Button>
-          </div>
-        ),
-      },
-    ],
-    [handleDeleteProduct] // dependensi tunggal
-  );
-
-  return (
-    <>
-      <form
-        className='flex flex-col gap-4'
-        onSubmit={formik.handleSubmit}
-        onReset={formik.handleReset}
-      >
-        <FormHeader
-          title={`${formType === 'add' ? 'Tambah' : 'Edit'} Sales Order`}
-          backUrl='/marketing/sales-orders'
-        />
-        <Card
-          title='Informasi Order'
-          className={{
-            wrapper: 'bg-white w-full',
-          }}
-        >
-          <div className='grid grid-cols-2 gap-3 mt-3'>
-            <SelectInput
-              label='Pelanggan'
-              options={customerOptions}
-              isLoading={isLoadingCustomerOptions}
-              value={selectedCustomer}
-              onChange={handleChangeCustomer}
-              isError={
-                formik.touched.customer_id && Boolean(formik.errors.customer_id)
-              }
-              errorMessage={formik.errors.customer_id}
-              isClearable
-              placeholder='Pilih Pelanggan'
-            />
-            <DateInput
-              name='so_date'
-              label='Tanggal'
-              value={formik.values.so_date}
-              onChange={formik.handleChange}
-              isError={formik.touched.so_date && Boolean(formik.errors.so_date)}
-              errorMessage={formik.errors.so_date}
-              placeholder='Pilih Tanggal'
-            />
-          </div>
-        </Card>
-        <Card
-          title='Daftar Produk'
-          className={{
-            wrapper: 'bg-white w-full',
-          }}
-        >
-          <Table<MarketingProduct>
-            rowSelection={rowSelection}
-            setRowSelection={setRowSelection}
-            data={marketingProducts}
-            columns={columns}
-            className={{
-              tableWrapperClassName: 'overflow-x-auto min-h-full!',
-              tableClassName: 'font-inter w-full table-auto  min-h-full!',
-              headerRowClassName: 'border-b border-b-gray-200',
-              headerColumnClassName:
-                'px-2 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end first:flex first:flex-row first:justify-end',
-              bodyRowClassName: 'border-b border-b-gray-200',
-              bodyColumnClassName:
-                'px-2 py-2 last:flex last:flex-row last:justify-end first:flex first:flex-row first:justify-start',
-              paginationClassName: 'hidden',
-            }}
-            emptyContent={
-              <div
-                className={cn(
-                  'w-full h-16 flex flex-col justify-center items-center gap-2'
-                )}
-              >
-                <span className='text-gray-500'>Belum ada data penjualan</span>
-              </div>
-            }
-          />
-          <div className='flex flex-row gap-3 mt-3'>
-            <Button
-              type='button'
-              variant='outline'
-              className='justify-start w-fit py-1 text-sm'
-              onClick={handleAddProduct}
-            >
-              <Icon icon='mdi:plus' width={16} height={16} />
-              Tambah Produk
-            </Button>
-            {selectedRowIds.length > 0 && (
-              <Button
-                type='button'
-                variant='outline'
-                color='error'
-                className='justify-start w-fit py-1 text-sm'
-                onClick={handleBulkDeleteProduct}
-              >
-                <Icon icon='mdi:trash' width={16} height={16} />
-                Hapus
-                {selectedRowIds.length > 0
-                  ? ` (${selectedRowIds.length})`
-                  : ''}{' '}
-                Produk
-              </Button>
-            )}
-          </div>
-        </Card>
-        <div className='grid grid-cols-2 gap-3'>
-          <TextArea
-            required
-            name='notes'
-            label='Catatan'
-            rows={3}
-            placeholder='Masukan catatan penjualan'
-            value={formik.values.notes}
-            onChange={formik.handleChange}
-            isError={formik.touched.notes && Boolean(formik.errors.notes)}
-            errorMessage={formik.errors.notes}
-          />
-          <div className='flex flex-col h-full justify-between items-end py-6'>
-            <span>Total Penjualan</span>
-            <span className='text-lg font-semibold'>
-              {formatCurrency(grandTotal)}
-            </span>
-          </div>
-        </div>
-        <div className='flex flex-row items-start justify-center gap-2 mt-4'>
-          <Button type='reset' color='warning' disabled={formik.isSubmitting}>
-            Reset
-          </Button>
-          <Button
-            type='submit'
-            disabled={!formik.isValid || formik.isSubmitting}
-          >
-            Submit
-          </Button>
-        </div>
-      </form>
-      {formType == 'edit' && (
-        <div className='flex flex-row justify-start'>
-          <Button type='button' color='error' onClick={handleDelete}>
-            <Icon icon='mdi:trash' width={24} height={24} />
-            Hapus
-          </Button>
-        </div>
-      )}
-      <Modal
-        ref={addProductModal.ref}
-        closeOnBackdrop
-        className={{
-          modalBox: 'max-w-4/5 z-100',
-        }}
-      >
-        <div className='flex flex-col gap-4'>
-          <div className='flex flex-row items-center justify-between'>
-            <h3 className='text-lg font-semibold mb-4'>Tambah Produk</h3>
-            <Button
-              variant='ghost'
-              color='error'
-              className='rounded-full'
-              onClick={addProductModal.closeModal}
-            >
-              <Icon icon='mdi:close' width={20} height={20} />
-            </Button>
-          </div>
-          <div>
-            <MarketingProductForm
-              onSubmitForm={handleAddSubmitProduct}
-              modalRef={addProductModal.ref}
-              data={rawMarketingProducts}
-              initialValues={selectedMarketingProduct ?? undefined}
-            />
-          </div>
-        </div>
-      </Modal>
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data penjualan ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          color: 'error',
-          onClick: deleteMarketingHandler,
-        }}
-      />
-    </>
-  );
-};
-
-export default SalesForm;

src/components/pages/master-data/kandang/form/KandangForm.schema.ts

@@ -1,26 +1,48 @@
 import * as Yup from 'yup';
 
-export const KandangFormSchema = Yup.object({
-  name: Yup.string().required('Nama wajib diisi!'),
+type KandangFormSchemaType = {
+  name: string;
+  locationId: number | undefined;
+  location:
+    | {
+        value: number;
+        label: string;
+      }
+    | undefined
+    | null;
+  capacity: number | undefined;
+  picId: number | undefined;
+  pic:
+    | {
+        value: number;
+        label: string;
+      }
+    | undefined
+    | null;
+};
 
-  locationId: Yup.number()
-    .min(1, 'Lokasi wajib diisi!')
-    .required('Lokasi wajib diisi!'),
-  location: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
+export const KandangFormSchema: Yup.ObjectSchema<KandangFormSchemaType> =
+  Yup.object({
+    name: Yup.string().required('Nama wajib diisi!'),
 
-  capacity: Yup.number()
-    .min(1, 'Kapasitas wajib diisi!')
-    .required('Kapasitas wajib diisi!'),
+    locationId: Yup.number()
+      .min(1, 'Lokasi wajib diisi!')
+      .required('Lokasi wajib diisi!'),
+    location: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
 
-  picId: Yup.number().min(1, 'PIC wajib diisi!').required('PIC wajib diisi!'),
-  pic: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-});
+    capacity: Yup.number()
+      .min(1, 'Kapasitas wajib diisi!')
+      .required('Kapasitas wajib diisi!'),
+
+    picId: Yup.number().min(1, 'PIC wajib diisi!').required('PIC wajib diisi!'),
+    pic: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+  });
 
 export const UpdateKandangFormSchema = KandangFormSchema;
 

src/components/pages/master-data/kandang/form/KandangForm.tsx

@@ -82,7 +82,7 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
             label: initialValues.location.name,
           }
         : null,
-      capacity: initialValues?.capacity ?? 0,
+      capacity: initialValues?.capacity,
       picId: initialValues?.pic?.id ?? 0,
       pic: initialValues?.pic
         ? {
@@ -102,9 +102,9 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
 
       const kandangPayload: CreateKandangPayload = {
         name: values.name,
-        location_id: values.locationId,
-        capacity: values.capacity,
-        pic_id: values.picId,
+        location_id: values.locationId!,
+        capacity: values.capacity ? parseInt(values.capacity.toString()) : 0,
+        pic_id: values.picId!,
       };
 
       switch (type) {
@@ -256,7 +256,8 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
               required
               name='capacity'
               label='Kapasitas'
-              value={formik.values.capacity ?? undefined}
+              placeholder='Masukan kapasitas kandang'
+              value={formik.values.capacity}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
               isError={

src/components/pages/master-data/product-category/form/ProductCategoryForm.schema.ts

@@ -1,11 +1,19 @@
 import * as Yup from 'yup';
 
-export const ProductCategoryFormSchema = Yup.object({
-  code: Yup.string()
-    .required('Kode wajib diisi!')
-    .max(3, 'Kode kategori produk melebihi 3 karakter!'),
-  name: Yup.string().required('Nama wajib diisi!'),
-});
+type ProductCategoryFormSchemaType = {
+  code: string;
+  name: string;
+};
+
+export const ProductCategoryFormSchema: Yup.ObjectSchema<ProductCategoryFormSchemaType> =
+  Yup.object({
+    code: Yup.string()
+      .required('Kode wajib diisi!')
+      .max(3, 'Kode kategori produk melebihi 3 karakter!'),
+    name: Yup.string()
+      .required('Nama wajib diisi!')
+      .max(50, 'Nama kategori produk melebihi 50 karakter!'),
+  });
 
 export const UpdateProductCategoryFormSchema = ProductCategoryFormSchema;
 

src/components/pages/master-data/product-category/form/ProductCategoryForm.tsx

@@ -71,12 +71,13 @@ const ProductCategoryForm = ({
     [router]
   );
 
-  const formikInitialValues = useMemo<ProductCategoryFormValues>(() => {
-    return {
+  const formikInitialValues = useMemo<ProductCategoryFormValues>(
+    () => ({
       code: initialValues?.code ?? '',
       name: initialValues?.name ?? '',
-    };
-  }, [initialValues]);
+    }),
+    [initialValues]
+  );
 
   const formik = useFormik<ProductCategoryFormValues>({
     initialValues: formikInitialValues,
@@ -118,7 +119,7 @@ const ProductCategoryForm = ({
     await ProductCategoryApi.delete(initialValues?.id as number);
 
     deleteModal.closeModal();
-    toast.success('Successfully delete Product Category!');
+    toast.success('Berhasil menghapus data Kategori Produk!');
     setIsDeleteLoading(false);
     router.push('/master-data/product-category');
   };
@@ -129,7 +130,7 @@ const ProductCategoryForm = ({
 
   return (
     <>
-      <section className='w-full max-w-xl'>
+      <section className='w-full max-w-2xl'>
         <header className='flex flex-col gap-4'>
           <Button
             href='/master-data/product-category'
@@ -141,9 +142,9 @@ const ProductCategoryForm = ({
           </Button>
 
           <h1 className='text-2xl font-bold text-center'>
-            {type === 'add' && 'Tambah Product Category'}
-            {type === 'edit' && 'Edit Product Category'}
-            {type === 'detail' && 'Detail Product Category'}
+            {type === 'add' && 'Tambah Kategori Produk'}
+            {type === 'edit' && 'Edit Kategori Produk'}
+            {type === 'detail' && 'Detail Kategori Produk'}
           </h1>
         </header>
 
@@ -157,7 +158,7 @@ const ProductCategoryForm = ({
               required
               label='Kode'
               name='code'
-              placeholder='Masukkan kode kategori produk'
+              placeholder='Masukkan kode...'
               value={formik.values.code}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
@@ -169,7 +170,7 @@ const ProductCategoryForm = ({
               required
               label='Nama'
               name='name'
-              placeholder='Masukkan nama kategori produk'
+              placeholder='Masukkan nama...'
               value={formik.values.name}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
@@ -256,7 +257,7 @@ const ProductCategoryForm = ({
         <ConfirmationModal
           ref={deleteModal.ref}
           type='error'
-          text={`Apakah anda yakin ingin menghapus data Product Category ini (${initialValues?.name})?`}
+          text={`Apakah anda yakin ingin menghapus data Kategori Produk ini (${initialValues?.name})?`}
           secondaryButton={{
             text: 'Tidak',
           }}

src/components/pages/master-data/product/form/ProductForm.schema.ts

@@ -1,53 +1,86 @@
 import * as Yup from 'yup';
 
-export const ProductFormSchema = Yup.object({
-  name: Yup.string().required('Nama wajib diisi!'),
-  brand: Yup.string().required('Merek wajib diisi!'),
-  sku: Yup.string().required('SKU wajib diisi!'),
-  uom: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  uom_id: Yup.number()
-    .required('Satuan wajib diisi!')
-    .typeError('Satuan wajib diisi!'),
-  product_category: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  product_category_id: Yup.number()
-    .required('Kategori produk wajib diisi!')
-    .typeError('Kategori produk wajib diisi!'),
-  product_price: Yup.number()
-    .required('Harga produk wajib diisi!')
-    .typeError('Harga produk wajib diisi!')
-    .min(0, 'Harga produk tidak boleh kurang dari 0!'),
-  selling_price: Yup.number()
-    .required('Harga jual wajib diisi!')
-    .typeError('Harga jual wajib diisi!')
-    .min(0, 'Harga jual tidak boleh kurang dari 0!'),
-  tax: Yup.number()
-    .required('Pajak wajib diisi!')
-    .typeError('Pajak wajib diisi!')
-    .min(0, 'Pajak tidak boleh kurang dari 0!')
-    .max(100, 'Pajak tidak boleh lebih dari 100%!'),
-  expiry_period: Yup.number()
-    .required('Periode kadaluarsa wajib diisi!')
-    .typeError('Periode kadaluarsa wajib diisi!')
-    .min(0, 'Periode kadaluarsa tidak boleh kurang dari 0!'),
-  supplier: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  supplier_ids: Yup.array()
-    .of(Yup.number().typeError('Supplier tidak valid!'))
-    .min(1, 'Minimal harus ada 1 supplier!')
-    .required('Supplier wajib diisi!'),
-  flags: Yup.array()
-    .of(Yup.string())
-    .min(1, 'Minimal harus ada 1 flag!')
-    .required('Flag wajib diisi!'),
-});
+type ProductFormSchemaType = {
+  name: string;
+  brand: string;
+  sku: string;
+  uom?: {
+    value: number;
+    label: string;
+  } | null;
+  uom_id: number;
+  product_category?: {
+    value: number;
+    label: string;
+  } | null;
+  product_category_id: number;
+  product_price: number | string;
+  selling_price: number | string;
+  tax: number | string;
+  expiry_period: number | string;
+  supplier_ids: number[];
+  flags: string[];
+};
+
+export const ProductFormSchema: Yup.ObjectSchema<ProductFormSchemaType> =
+  Yup.object({
+    name: Yup.string().required('Nama wajib diisi!'),
+    brand: Yup.string().required('Merek wajib diisi!'),
+    sku: Yup.string().required('SKU wajib diisi!'),
+
+    uom: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    })
+      .nullable()
+      .required('Satuan wajib diisi!'),
+
+    uom_id: Yup.number()
+      .required('Satuan wajib diisi!')
+      .typeError('Satuan wajib diisi!'),
+
+    product_category: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    })
+      .nullable()
+      .required('Kategori produk wajib diisi!'),
+
+    product_category_id: Yup.number()
+      .required('Kategori produk wajib diisi!')
+      .typeError('Kategori produk wajib diisi!'),
+
+    product_price: Yup.number()
+      .required('Harga produk wajib diisi!')
+      .typeError('Harga produk wajib diisi!')
+      .min(0, 'Harga produk tidak boleh kurang dari 0!'),
+
+    selling_price: Yup.number()
+      .required('Harga jual wajib diisi!')
+      .typeError('Harga jual wajib diisi!')
+      .min(0, 'Harga jual tidak boleh kurang dari 0!'),
+
+    tax: Yup.number()
+      .required('Pajak wajib diisi!')
+      .typeError('Pajak wajib diisi!')
+      .min(0, 'Pajak tidak boleh kurang dari 0!')
+      .max(100, 'Pajak tidak boleh lebih dari 100%!'),
+
+    expiry_period: Yup.number()
+      .required('Periode kadaluarsa wajib diisi!')
+      .typeError('Periode kadaluarsa wajib diisi!')
+      .min(0, 'Periode kadaluarsa tidak boleh kurang dari 0!'),
+
+    supplier_ids: Yup.array()
+      .of(Yup.number().required().typeError('Supplier tidak valid!'))
+      .min(1, 'Minimal harus ada 1 supplier!')
+      .required('Supplier wajib diisi!'),
+
+    flags: Yup.array()
+      .of(Yup.string().required())
+      .min(1, 'Minimal harus ada 1 flag!')
+      .required('Flag wajib diisi!'),
+  });
 
 export const UpdateProductFormSchema = ProductFormSchema;
 

src/components/pages/master-data/product/form/ProductForm.tsx

@@ -9,7 +9,11 @@ import useSWR from 'swr';
 import { Icon } from '@iconify/react';
 import Button from '@/components/Button';
 import TextInput from '@/components/input/TextInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import NumberInput from '@/components/input/NumberInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 
@@ -79,20 +83,19 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
       sku: initialValues?.sku ?? '',
       uom: initialValues?.uom
         ? { value: initialValues.uom.id, label: initialValues.uom.name }
-        : null,
+        : undefined,
       uom_id: initialValues?.uom?.id ?? 0,
       product_category: initialValues?.product_category
         ? {
             value: initialValues.product_category.id,
             label: initialValues.product_category.name,
           }
-        : null,
+        : undefined,
       product_category_id: initialValues?.product_category?.id ?? 0,
-      product_price: initialValues?.product_price ?? 0,
-      selling_price: initialValues?.selling_price ?? 0,
-      tax: initialValues?.tax ?? 0,
-      expiry_period: initialValues?.expiry_period ?? 0,
-      supplier: null, // not used for payload, just for UI
+      product_price: initialValues?.product_price ?? '',
+      selling_price: initialValues?.selling_price ?? '',
+      tax: initialValues?.tax ?? '',
+      expiry_period: initialValues?.expiry_period ?? '',
       supplier_ids: initialValues?.suppliers?.map((s) => s.id) ?? [],
       flags: initialValues?.flags ?? [],
     }),
@@ -111,16 +114,14 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
         sku: values.sku,
         uom_id: values.uom_id,
         product_category_id: values.product_category_id,
-        product_price: values.product_price,
-        selling_price: values.selling_price,
-        tax: values.tax,
-        expiry_period: values.expiry_period,
-        supplier_ids: (values.supplier_ids ?? []).filter(
+        product_price: parseInt(values.product_price.toString()) || 0,
+        selling_price: parseInt(values.selling_price.toString()) || 0,
+        tax: parseInt(values.tax.toString()) || 0,
+        expiry_period: parseInt(values.expiry_period.toString()) || 0,
+        supplier_ids: values.supplier_ids.filter(
           (id): id is number => typeof id === 'number'
         ),
-        flags: (values.flags ?? []).filter(
-          (f): f is string => typeof f === 'string'
-        ),
+        flags: values.flags.filter((f): f is string => typeof f === 'string'),
       };
       switch (type) {
         case 'add':
@@ -136,15 +137,11 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
   const { setValues: formikSetValues } = formik;
 
   // UOM
-  const [uomSelectInputValue, setUomSelectInputValue] = useState('');
-  const uomsUrl = `${UomApi.basePath}?${new URLSearchParams({ search: uomSelectInputValue ?? '' }).toString()}`;
-  const { data: uoms, isLoading: isLoadingUoms } = useSWR(
-    uomsUrl,
-    UomApi.getAllFetcher
-  );
-  const uomOptions = isResponseSuccess(uoms)
-    ? uoms?.data.map((uom) => ({ value: uom.id, label: uom.name }))
-    : [];
+  const {
+    setInputValue: setUomSelectInputValue,
+    options: uomOptions,
+    isLoadingOptions: isLoadingUoms,
+  } = useSelect(UomApi.basePath, 'id', 'name');
   const uomChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldTouched('uom', true);
     formik.setFieldValue('uom', val);
@@ -153,15 +150,11 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
   };
 
   // Product Category
-  const [categorySelectInputValue, setCategorySelectInputValue] = useState('');
-  const categoriesUrl = `${ProductCategoryApi.basePath}?${new URLSearchParams({ search: categorySelectInputValue ?? '' }).toString()}`;
-  const { data: categories, isLoading: isLoadingCategories } = useSWR(
-    categoriesUrl,
-    ProductCategoryApi.getAllFetcher
-  );
-  const categoryOptions = isResponseSuccess(categories)
-    ? categories?.data.map((cat) => ({ value: cat.id, label: cat.name }))
-    : [];
+  const {
+    setInputValue: setCategorySelectInputValue,
+    options: categoryOptions,
+    isLoadingOptions: isLoadingCategories,
+  } = useSelect(ProductCategoryApi.basePath, 'id', 'name');
   const categoryChangeHandler = (val: OptionType | OptionType[] | null) => {
     formik.setFieldTouched('product_category', true);
     formik.setFieldValue('product_category', val);
@@ -169,7 +162,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
     formik.setFieldValue('product_category_id', (val as OptionType)?.value);
   };
 
-  // Supplier (multi select)
+  // Supplier (multi select) - using SWR to filter by category
   const [supplierSelectInputValue, setSupplierSelectInputValue] = useState('');
   const suppliersUrl = `${SupplierApi.basePath}?${new URLSearchParams({ search: supplierSelectInputValue ?? '' }).toString()}`;
   const { data: suppliers, isLoading: isLoadingSuppliers } = useSWR(
@@ -209,7 +202,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
 
   return (
     <>
-      <section className='w-full max-w-xl'>
+      <section className='w-full max-w-2xl'>
         <header className='flex flex-col gap-4'>
           <Button
             href='/master-data/product'
@@ -235,7 +228,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               required
               label='Nama'
               name='name'
-              placeholder='Masukkan nama produk'
+              placeholder='Masukkan nama...'
               value={formik.values.name}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
@@ -247,7 +240,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               required
               label='Merek'
               name='brand'
-              placeholder='Masukkan merek produk'
+              placeholder='Masukkan merek...'
               value={formik.values.brand}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
@@ -259,7 +252,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               required
               label='SKU'
               name='sku'
-              placeholder='Masukkan SKU produk'
+              placeholder='Masukkan SKU...'
               value={formik.values.sku}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
@@ -270,6 +263,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
             <SelectInput
               required
               label='Satuan'
+              placeholder='Pilih satuan...'
               value={formik.values.uom ?? undefined}
               onChange={uomChangeHandler}
               options={uomOptions}
@@ -283,6 +277,7 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
             <SelectInput
               required
               label='Kategori Produk'
+              placeholder='Pilih kategori produk...'
               value={formik.values.product_category ?? undefined}
               onChange={categoryChangeHandler}
               options={categoryOptions}
@@ -296,15 +291,19 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               isDisabled={type === 'detail'}
               isClearable
             />
-            <TextInput
+            <NumberInput
               required
               label='Harga Produk'
               name='product_price'
-              type='number'
-              placeholder='Masukkan harga produk'
+              placeholder='Masukkan harga produk...'
               value={formik.values.product_price}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputPrefix='Rp '
               isError={
                 formik.touched.product_price &&
                 Boolean(formik.errors.product_price)
@@ -312,15 +311,19 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               errorMessage={formik.errors.product_price as string}
               readOnly={type === 'detail'}
             />
-            <TextInput
+            <NumberInput
               required
               label='Harga Jual'
               name='selling_price'
-              type='number'
-              placeholder='Masukkan harga jual'
+              placeholder='Masukkan harga jual...'
               value={formik.values.selling_price}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputPrefix='Rp '
               isError={
                 formik.touched.selling_price &&
                 Boolean(formik.errors.selling_price)
@@ -328,28 +331,36 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
               errorMessage={formik.errors.selling_price as string}
               readOnly={type === 'detail'}
             />
-            <TextInput
+            <NumberInput
               required
               label='Pajak (%)'
               name='tax'
-              type='number'
-              placeholder='Masukkan pajak'
+              placeholder='Masukkan pajak...'
               value={formik.values.tax}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
+              decimalScale={2}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputSuffix='%'
               isError={formik.touched.tax && Boolean(formik.errors.tax)}
               errorMessage={formik.errors.tax as string}
               readOnly={type === 'detail'}
             />
-            <TextInput
+            <NumberInput
               required
               label='Periode Kadaluarsa (hari)'
               name='expiry_period'
-              type='number'
-              placeholder='Masukkan periode kadaluarsa'
+              placeholder='Masukkan periode kadaluarsa...'
               value={formik.values.expiry_period}
               onChange={formik.handleChange}
               onBlur={formik.handleBlur}
+              decimalScale={0}
+              allowNegative={false}
+              thousandSeparator=','
+              decimalSeparator='.'
+              inputSuffix='hari'
               isError={
                 formik.touched.expiry_period &&
                 Boolean(formik.errors.expiry_period)
@@ -360,9 +371,10 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
             <SelectInput
               required
               label='Supplier'
+              placeholder='Pilih supplier...'
               isMulti
               value={supplierOptions.filter((opt) =>
-                formik.values.supplier_ids.includes(opt.value)
+                (formik.values.supplier_ids || []).includes(opt.value)
               )}
               onChange={supplierChangeHandler}
               options={supplierOptions}
@@ -379,9 +391,10 @@ const ProductForm = ({ type = 'add', initialValues }: ProductFormProps) => {
             <SelectInput
               required
               label='Flags'
+              placeholder='Pilih flags...'
               isMulti
               value={PRODUCT_FLAG_OPTIONS.filter((opt) =>
-                formik.values.flags.includes(opt.value)
+                (formik.values.flags || []).includes(opt.value)
               )}
               onChange={(val) => {
                 const arr = Array.isArray(val) ? val : val ? [val] : [];

src/components/pages/production/chickin/ChickinTable.tsx

@@ -20,7 +20,6 @@ import { Icon } from '@iconify/react';
 import { CellContext, SortingState } from '@tanstack/react-table';
 import { useState } from 'react';
 import useSWR from 'swr';
-import ChickinForm from './form/ChickinForm';
 
 const ChickinTable = () => {
   const {

src/components/pages/production/chickin/form/ChickinForm.tsx

@@ -45,7 +45,7 @@ const ChickinFormKandang = ({
   return (
     <div className='flex flex-col gap-4'>
       <FormHeader
-        title='Chick In DOC'
+        title={`Chick In ${initialValues.kandang?.name ?? 'Kandang'}`}
         backUrl={`/production/project-flock/chickin/add?projectFlockId=${initialValues?.project_flock?.id}`}
       />
 

src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx

@@ -3,6 +3,7 @@ import Button from '@/components/Button';
 import Card from '@/components/Card';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import PillBadge from '@/components/PillBadge';
 import Table from '@/components/Table';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
@@ -31,12 +32,13 @@ const ChickinLogsView = ({
     confirmModal.openModal();
   };
 
-  const confirmationModalApproveClickHandler = async () => {
+  const confirmationModalApproveClickHandler = async (notes?: string) => {
     setChickinErrorMessage('');
     setIsApproveLoading(true);
     const approveChickinRes = await ChickinApi.singleApproval(
       initialValues?.id as number,
-      'APPROVED'
+      'APPROVED',
+      notes
     );
     if (isResponseSuccess(approveChickinRes)) {
       toast.success(approveChickinRes?.message as string);
@@ -151,7 +153,7 @@ const ChickinLogsView = ({
           </div>
         )}
       </Card>
-      <ConfirmationModal
+      <ConfirmationModalWithNotes
         ref={confirmModal.ref}
         type='success'
         text={`Apakah anda yakin ingin approve data Chickin yang Pending?`}
@@ -161,7 +163,9 @@ const ChickinLogsView = ({
         primaryButton={{
           text: 'Ya',
           color: 'success',
-          onClick: confirmationModalApproveClickHandler,
+          onClick: (notes) => {
+            confirmationModalApproveClickHandler(notes);
+          },
           isLoading: isApproveLoading,
         }}
       />

src/components/pages/production/chickin/form/tabs/ChickinFormView.tsx

@@ -6,10 +6,8 @@ import {
   ChickinFormValues,
   ChickinRequestFormValues,
   ChickinSchema,
-} from '../ChickinForm.schema';
+} from '@/components/pages/production/chickin/form/ChickinForm.schema';
 import DateInput from '@/components/input/DateInput';
-import SelectInput, { OptionType } from '@/components/input/SelectInput';
-import NumberInput from '@/components/input/NumberInput';
 import Button from '@/components/Button';
 import { useCallback, useEffect, useState } from 'react';
 import { useFormik } from 'formik';
@@ -24,7 +22,6 @@ import Alert from '@/components/Alert';
 import { formatNumber } from '@/lib/helper';
 
 const ChickinFormView = ({
-  formType = 'add',
   initialValues,
   afterSubmit,
 }: {
@@ -122,7 +119,7 @@ const ChickinFormView = ({
   return (
     <form
       className='flex flex-col gap-4'
-      onReset={(e) => {
+      onReset={() => {
         handleReset();
       }}
       onSubmit={formik.handleSubmit}

src/components/pages/production/project-flock/ProjectFlockTable.tsx

@@ -6,6 +6,7 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
 import SelectInput, { OptionType } from '@/components/input/SelectInput';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import Table from '@/components/Table';
 import RowCollapseOptions from '@/components/table/RowCollapseOptions';
 import RowDropdownOptions from '@/components/table/RowDropdownOptions';
@@ -144,6 +145,9 @@ const ProjectFlockTable = () => {
     useState<ProjectFlock>();
   const deleteModal = useModal();
   const confirmModal = useModal();
+  const [approvalAction, setApprovalAction] = useState<'APPROVED' | 'REJECTED'>(
+    'APPROVED'
+  );
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [isApproveLoading, setIsApproveLoading] = useState(false);
 
@@ -226,18 +230,21 @@ const ProjectFlockTable = () => {
     updateFilter('search', e.target.value);
   };
 
-  const confirmationModalApproveClickHandler = async () => {
+  const confirmApprovalHandler = async (
+    notes: string,
+    approvalAction: 'APPROVED' | 'REJECTED'
+  ) => {
     setIsApproveLoading(true);
-    const approveProjectFlockRes = await ProjectFlockApi.customRequest<
-      BaseApiResponse<ProjectFlock>,
-      ProjectFlockApprovalPayload
-    >(`/approvals`, {
-      method: 'POST',
-      payload: {
-        action: 'APPROVED',
-        approvable_ids: selectedRowIds.map((id) => id),
-      },
-    });
+    const approveProjectFlockRes =
+      approvalAction === 'APPROVED'
+        ? await ProjectFlockApi.bulkApprove(
+            selectedRowIds.map((id) => id),
+            notes
+          )
+        : await ProjectFlockApi.bulkReject(
+            selectedRowIds.map((id) => id),
+            notes
+          );
 
     if (isResponseSuccess(approveProjectFlockRes)) {
       toast.success('Project Flock berhasil di-approve!');
@@ -271,6 +278,7 @@ const ProjectFlockTable = () => {
                 variant='outline'
                 color='success'
                 onClick={() => {
+                  setApprovalAction('APPROVED');
                   confirmModal.openModal();
                 }}
                 disabled={selectedRowIds.length === 0}
@@ -279,6 +287,19 @@ const ProjectFlockTable = () => {
                 <Icon icon='material-symbols:check' width={24} height={24} />
                 Approve
               </Button>
+              <Button
+                variant='outline'
+                color='error'
+                onClick={() => {
+                  setApprovalAction('REJECTED');
+                  confirmModal.openModal();
+                }}
+                disabled={selectedRowIds.length === 0}
+                className='w-full sm:w-fit'
+              >
+                <Icon icon='mdi:times' width={24} height={24} />
+                Reject
+              </Button>
               <div className='ms-auto w-full sm:w-auto'>
                 <DebouncedTextInput
                   name='search'
@@ -558,7 +579,7 @@ const ProjectFlockTable = () => {
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${selectedProjectFlock?.flock?.name})?`}
+        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${selectedProjectFlock?.flock_name})?`}
         secondaryButton={{
           text: 'Tidak',
         }}
@@ -570,17 +591,19 @@ const ProjectFlockTable = () => {
         }}
       />
 
-      <ConfirmationModal
+      <ConfirmationModalWithNotes
         ref={confirmModal.ref}
-        type='success'
-        text={`Apakah anda yakin ingin approve data Project Flock ini (${selectedRowIds.length} data)?`}
+        type={approvalAction == 'APPROVED' ? 'success' : 'error'}
+        text={`Apakah anda yakin ingin ${approvalAction == 'APPROVED' ? 'approve' : 'reject'} data Project Flock ini (${selectedRowIds.length} data)?`}
         secondaryButton={{
           text: 'Tidak',
         }}
         primaryButton={{
           text: 'Ya',
-          color: 'success',
-          onClick: confirmationModalApproveClickHandler,
+          color: approvalAction == 'APPROVED' ? 'success' : 'error',
+          onClick: (notes) => {
+            confirmApprovalHandler(notes, approvalAction);
+          },
           isLoading: isApproveLoading,
         }}
       />

src/components/pages/production/project-flock/chickin/ProjectFlockChickinDetail.tsx

@@ -14,13 +14,13 @@ import { cn } from '@/lib/helper';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { ProjectFlockKandangApi } from '@/services/api/production';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { Kandang } from '@/types/api/master-data/kandang';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import { Icon } from '@iconify/react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import useSWR from 'swr';
+import { FormHeader } from '@/components/helper/form/FormHeader';
 
 const ProjectFlockChickinDetail = ({
   projectFlockId,
@@ -42,10 +42,7 @@ const ProjectFlockChickinDetail = ({
   const [projectFlock, setProjectFlock] = useState<ProjectFlock>();
 
   // Fetch Data
-  const {
-    data: listProjectFlockKandang,
-    isLoading: isLoadingListProjectFlockKandang,
-  } = useSWR(
+  const { data: listProjectFlockKandang } = useSWR(
     `${ProjectFlockKandangApi.basePath}?${new URLSearchParams({
       search: searchProjectFlock,
       project_flock_id:
@@ -104,6 +101,10 @@ const ProjectFlockChickinDetail = ({
   }, [projectFlockId, listProjectFlock]);
   return (
     <>
+      <FormHeader
+        title={`Chick In ${projectFlock?.flock_name ?? 'Project Flock'}`}
+        backUrl='/production/project-flock'
+      />
       <div className='flex flex-col gap-4 w-full my-4'>
         <div className='max-w-full sm:max-w-1/2 md:max-w-3/5 lg:max-w-2/5'>
           <SelectInput
@@ -118,7 +119,7 @@ const ProjectFlockChickinDetail = ({
             value={
               projectFlock
                 ? {
-                    label: `${projectFlock?.flock?.name}`,
+                    label: `${projectFlock?.flock_name}`,
                     value: projectFlock?.id,
                   }
                 : null
@@ -175,7 +176,7 @@ const ProjectFlockChickinDetail = ({
             },
             {
               header: 'Nama Flock',
-              accessorKey: 'flock.name',
+              accessorKey: 'flock_name',
             },
             {
               header: 'Kategori',
@@ -209,10 +210,6 @@ const ProjectFlockChickinDetail = ({
                 );
               },
             },
-            {
-              header: 'Periode',
-              accessorKey: 'period',
-            },
             {
               header: 'FCR Layer',
               accessorKey: 'fcr.name',
@@ -278,6 +275,10 @@ const ProjectFlockChickinDetail = ({
               accessorKey: 'kandang.capacity',
               header: 'Kapasitas',
             },
+            {
+              accessorFn: () => projectFlock?.period,
+              header: 'Periode',
+            },
             {
               accessorKey: 'approval.step_name',
               header: 'Status',

src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts

@@ -42,11 +42,6 @@ export const ProjectFlockFormSchema = Yup.object({
     .min(1, 'Lokasi wajib diisi!')
     .required('Lokasi wajib diisi!'),
 
-  period: Yup.number()
-    .required('Periode wajib diisi!')
-    .typeError('Periode harus berupa angka')
-    .min(1, 'Minimal periode adalah 1'),
-
   kandang_ids: Yup.array()
     .of(Yup.number().typeError('Kandang tidak valid!'))
     .min(1, 'Minimal harus ada 1 kandang!')

src/components/pages/production/project-flock/form/ProjectFlockForm.tsx

@@ -29,7 +29,6 @@ import {
   ProjectFlock,
 } from '@/types/api/production/project-flock';
 import toast from 'react-hot-toast';
-import TextInput from '@/components/input/TextInput';
 import { Kandang } from '@/types/api/master-data/kandang';
 import Collapse from '@/components/Collapse';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
@@ -42,6 +41,8 @@ import ApprovalSteps, {
   useApprovalSteps,
 } from '@/components/pages/ApprovalSteps';
 import { PROJECT_FLOCK_APPROVAL_LINE } from '@/config/approval-line';
+import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
+import NumberInput from '@/components/input/NumberInput';
 
 interface ProjectFlockFormProps {
   formType?: 'add' | 'edit' | 'detail';
@@ -72,8 +73,11 @@ const ProjectFlockForm = ({
   const [optionsKandang, setOptionsKandang] = useState<Kandang[]>(
     initialValues?.kandangs ?? []
   );
-  const [selectedFlock, setSelectedFlock] = useState<number | undefined>(
-    initialValues?.flock?.id ?? 0
+  const [selectedFlock, setSelectedFlock] = useState<string | undefined>(
+    initialValues?.flock_name?.slice(
+      0,
+      initialValues?.flock_name?.lastIndexOf(' ')
+    ) ?? ''
   );
 
   const deleteModal = useModal();
@@ -102,9 +106,13 @@ const ProjectFlockForm = ({
 
   useEffect(() => {
     if (initialValues?.approval?.step_name) {
-      const approvedDisabled = initialValues.approval.step_name !== 'Pengajuan';
+      const pengajuanRejected =
+        initialValues.approval.step_number == 1 &&
+        initialValues.approval.action == 'REJECTED';
+      const approvedDisabled =
+        initialValues.approval.step_number !== 1 || pengajuanRejected;
       setIsApprovedDisabled(approvedDisabled);
-      setIsRejectedDisabled(!approvedDisabled);
+      setIsRejectedDisabled(!approvedDisabled || pengajuanRejected);
       setApprovalAction(!approvedDisabled ? 'APPROVED' : 'REJECTED');
     }
   }, [initialValues]);
@@ -143,15 +151,14 @@ const ProjectFlockForm = ({
     mutate: refreshKandang,
   } = useSWR(kandangUrl, KandangApi.getAllFetcher);
 
-  const { data: periodFlocks, isLoading: isLoadingPeriodFlocks } = useSWR(
+  const { data: periodFlocks, mutate: refreshPeriodFlocks } = useSWR(
     `${selectedFlock?.toString()}/periods`,
-    (id: string) => ProjectFlockApi.getNextPeriod(id)
+    () => ProjectFlockApi.getNextPeriod(parseInt(selectedLocation as string))
   );
 
   const {
     approvals,
     isLoading: approvalsLoading,
-    rawDataApprovals: rawDataApprovals,
     refresh: refreshApprovals,
   } = useApprovalSteps({
     latestApproval: initialValues?.approval,
@@ -182,6 +189,7 @@ const ProjectFlockForm = ({
           formik.setFieldValue('kandang_ids', selectedRowIds);
         }
       }
+      refreshPeriodFlocks();
     }
   }, [kandang, selectedLocation]);
   useEffect(() => {
@@ -278,13 +286,24 @@ const ProjectFlockForm = ({
 
   // Formik InitialValue
   const formikInitialValues = useMemo<ProjectFlockFormValues>(() => {
+    const trimFlock =
+      initialValues?.flock_name?.slice(
+        0,
+        initialValues?.flock_name?.lastIndexOf(' ')
+      ) ?? '';
     return {
-      name: initialValues?.flock_name,
-      flock: initialValues?.flock
+      flock: initialValues?.flock_name
         ? {
-            value: initialValues?.flock?.id ?? 0,
+            value:
+              optionsFlock.find((flock) => {
+                return flock.label == trimFlock;
+              })?.value ?? 0,
             label:
-              initialValues?.flock?.name ?? initialValues?.flock_name ?? '',
+              formType != 'detail'
+                ? (optionsFlock.find((flock) => {
+                    return flock.label == trimFlock;
+                  })?.label ?? '')
+                : initialValues?.flock_name,
           }
         : null,
       area: initialValues?.area
@@ -311,31 +330,56 @@ const ProjectFlockForm = ({
             label: initialValues.location.name,
           }
         : null,
-      flock_id: initialValues?.flock?.id ?? 0,
-      flock_name: initialValues?.flock_name ?? '',
+      flock_name:
+        optionsFlock.find((flock) => {
+          return (
+            flock.label ==
+            initialValues?.flock_name?.slice(
+              0,
+              initialValues?.flock_name?.lastIndexOf(' ')
+            )
+          );
+        })?.label ?? '',
       area_id: initialValues?.area?.id ?? 0,
       category: initialValues?.category as NonNullable<
         'GROWING' | 'LAYING' | undefined
       >,
       fcr_id: initialValues?.fcr?.id ?? 0,
       location_id: initialValues?.location?.id ?? 0,
-      period: initialValues?.period ?? 1,
       kandang_ids: initialValues?.kandangs?.map((k: Kandang) => k.id) as (
         | number
         | undefined
       )[],
     };
-  }, [initialValues]);
+  }, [initialValues, optionsFlock]);
 
   // Formik
   const formik = useFormik<ProjectFlockFormValues>({
     initialValues: {
-      name: initialValues?.flock_name,
-      flock: initialValues?.flock
+      flock: initialValues?.flock_name
         ? {
-            value: initialValues?.flock?.id ?? 0,
+            value:
+              optionsFlock.find((flock) => {
+                return (
+                  flock.label ==
+                  initialValues?.flock_name?.slice(
+                    0,
+                    initialValues?.flock_name?.lastIndexOf(' ')
+                  )
+                );
+              })?.value ?? 0,
             label:
-              initialValues?.flock?.name ?? initialValues?.flock_name ?? '',
+              formType != 'detail'
+                ? (optionsFlock.find((flock) => {
+                    return (
+                      flock.label ==
+                      initialValues?.flock_name?.slice(
+                        0,
+                        initialValues?.flock_name?.lastIndexOf(' ')
+                      )
+                    );
+                  })?.label ?? '')
+                : initialValues?.flock_name,
           }
         : null,
       area: initialValues?.area
@@ -362,15 +406,24 @@ const ProjectFlockForm = ({
             label: initialValues.location.name,
           }
         : null,
-      flock_id: initialValues?.flock?.id ?? 0,
-      flock_name: initialValues?.flock_name ?? '',
+      flock_name:
+        formType != 'detail'
+          ? optionsFlock.find((flock) => {
+              return (
+                flock.label ==
+                initialValues?.flock_name?.slice(
+                  0,
+                  initialValues?.flock_name?.lastIndexOf(' ')
+                )
+              );
+            })?.label
+          : (initialValues?.flock_name ?? ''),
       area_id: initialValues?.area?.id ?? 0,
       category: initialValues?.category as NonNullable<
         'GROWING' | 'LAYING' | undefined
       >,
       fcr_id: initialValues?.fcr?.id ?? 0,
       location_id: initialValues?.location?.id ?? 0,
-      period: initialValues?.period ?? 1,
       kandang_ids: initialValues?.kandangs?.map((k: Kandang) => k.id) as (
         | number
         | undefined
@@ -385,12 +438,11 @@ const ProjectFlockForm = ({
     onSubmit: async (values) => {
       setProjectFlockFormErrorMessage('');
       const payload: CreateProjectFlockPayload = {
-        flock_name: values.flock?.label as string,
+        flock_name: values.flock_name as string,
         area_id: values.area_id as number,
         category: values.category as string,
         fcr_id: values.fcr_id as number,
         location_id: values.location_id as number,
-        period: values.period as number,
         kandang_ids: values.kandang_ids as number[],
       };
 
@@ -419,8 +471,6 @@ const ProjectFlockForm = ({
       if (initialValues?.area_id) {
         setSelectedArea(initialValues?.area_id.toString() as string);
       }
-
-      formik.setFieldValue('period', initialValues?.period);
     }
   }, [initialValues, setSelectedArea, formType]);
 
@@ -449,15 +499,6 @@ const ProjectFlockForm = ({
     formik.validateForm();
   }, [formik.values]);
 
-  useEffect(() => {
-    if (isResponseSuccess(periodFlocks)) {
-      formik.setFieldValue('period', periodFlocks.data.next_period);
-    }
-    if (isResponseError(periodFlocks)) {
-      console.log(periodFlocks?.message as string);
-    }
-  }, [periodFlocks]);
-
   useEffect(() => {
     const selectedRowIds = Object.keys(rowSelection)
       .filter((id) => rowSelection[id])
@@ -485,42 +526,41 @@ const ProjectFlockForm = ({
     setIsDeleteLoading(false);
   };
 
-  const confirmationModalClickHandler = async ({
-    action = 'APPROVED',
-  }: {
-    action: 'APPROVED' | 'REJECTED';
-  }) => {
+  const confirmApprovalHandler = async (
+    notes: string,
+    approvalAction: 'REJECTED' | 'APPROVED'
+  ) => {
     if (initialValues?.id === undefined) return;
     setIsApproveLoading(true);
-    const approveProjectFlockRes = await ProjectFlockApi.customRequest<
-      BaseApiResponse<ProjectFlock>,
-      ProjectFlockApprovalPayload
-    >(`/approvals`, {
-      method: 'POST',
-      payload: {
-        action: action,
-        approvable_ids: [initialValues?.id],
-      },
-    });
 
-    if (isResponseSuccess(approveProjectFlockRes)) {
-      if (refreshProjectFlocks) {
-        await refreshProjectFlocks();
-      }
-      toast.success(approveProjectFlockRes.message as string);
+    const approvalRes =
+      approvalAction == 'APPROVED'
+        ? await ProjectFlockApi.approve(initialValues?.id, notes)
+        : await ProjectFlockApi.reject(initialValues?.id, notes);
+    if (isResponseSuccess(approvalRes)) {
+      refreshProjectFlocks?.();
+      toast.success(approvalRes.message as string);
     }
-    if (isResponseError(approveProjectFlockRes)) {
-      toast.error(approveProjectFlockRes?.message as string);
+    if (isResponseError(approvalRes)) {
+      toast.error(approvalRes?.message as string);
     }
     refreshApprovals();
     confirmModal.closeModal();
     setIsApproveLoading(false);
   };
 
+  const selectedPeriod = isResponseSuccess(periodFlocks)
+    ? periodFlocks.data.find((kandang) =>
+        formik.values.kandang_ids?.includes(kandang.id)
+      )?.period
+    : undefined;
+  const inputPeriod =
+    (initialValues?.period ?? selectedPeriod == 0) ? 1 : selectedPeriod;
+
   return (
     <>
       <section className='w-full'>
-        <header className='flex flex-col gap-4'>
+        <header className='flex flex-col gap-4 mb-6'>
           <Button
             href='/production/project-flock'
             variant='link'
@@ -532,6 +572,7 @@ const ProjectFlockForm = ({
 
           <h1 className='text-2xl font-bold text-center'>
             {formType === 'add' && 'Tambah Project Flock'}
+            {formType === 'edit' && 'Edit Project Flock'}
             {formType === 'detail' && 'Detail Project Flock'}
           </h1>
         </header>
@@ -555,7 +596,7 @@ const ProjectFlockForm = ({
             </div>
           </div>
         )}
-        {approvals && !approvalsLoading && (
+        {approvals && !approvalsLoading && formType == 'detail' && (
           <ApprovalSteps approvals={approvals} />
         )}
         {formType == 'detail' && (
@@ -615,7 +656,6 @@ const ProjectFlockForm = ({
           <div className='card bg-base-100 shadow w-full mb-6'>
             <div className='card-body'>
               <div className='card-title mb-4'>Informasi Umum</div>
-
               <div className='grid sm:grid-cols-2 gap-4'>
                 <SelectInput
                   required
@@ -634,10 +674,19 @@ const ProjectFlockForm = ({
                 <SelectInput
                   required
                   label='Flock'
-                  value={formik.values.flock as OptionType}
+                  value={
+                    formik.values.flock_name
+                      ? ({
+                          label: formik.values.flock_name,
+                          value: optionsFlock.find((flock) => {
+                            return flock.label === formik.values.flock_name;
+                          })?.value,
+                        } as OptionType)
+                      : undefined
+                  }
                   onChange={(val) => {
                     optionChangeHandler(val, 'flock');
-                    setSelectedFlock((val as OptionType)?.value as number);
+                    setSelectedFlock((val as OptionType)?.label);
                     formik.setFieldValue(
                       'flock_name',
                       (val as OptionType)?.label
@@ -701,21 +750,13 @@ const ProjectFlockForm = ({
                   isClearable
                   isDisabled={formType === 'detail'}
                 />
-                <TextInput
-                  required
-                  type='number'
+                <NumberInput
                   name='period'
                   label='Periode'
-                  placeholder='Masukkan periode yang project'
-                  value={formik.values.period ?? (1 as number)}
-                  onChange={formik.handleChange}
-                  isError={
-                    formik.touched.period && Boolean(formik.errors.period)
-                  }
-                  errorMessage={formik.errors.period as string}
-                  readOnly={formType === 'detail'}
-                  disabled={true}
-                  isLoading={isLoadingPeriodFlocks}
+                  disabled
+                  readOnly
+                  placeholder='Period'
+                  value={selectedLocation ? inputPeriod : ''}
                 />
               </div>
             </div>
@@ -750,12 +791,15 @@ const ProjectFlockForm = ({
                     <span className='loading loading-dots loading-xl'></span>
                   )}
                   <ProjectFlockKandangTable
+                    listPeriods={
+                      isResponseSuccess(periodFlocks) ? periodFlocks.data : []
+                    }
                     listKandang={optionsKandang}
                     rowSelection={rowSelection}
                     setRowSelection={setRowSelection}
                     selectedIds={formik.values.kandang_ids}
                     formType={formType}
-                    initialValues={initialValues?.kandangs ?? []}
+                    initialValues={initialValues}
                   />
                 </div>
               </Collapse>
@@ -832,7 +876,7 @@ const ProjectFlockForm = ({
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${initialValues?.flock?.name} - ${initialValues?.area?.name})?`}
+        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${initialValues?.flock_name} - ${initialValues?.area?.name})?`}
         secondaryButton={{
           text: 'Tidak',
         }}
@@ -844,12 +888,12 @@ const ProjectFlockForm = ({
         }}
       />
 
-      <ConfirmationModal
+      <ConfirmationModalWithNotes
         ref={confirmModal.ref}
         type={approvalAction == 'APPROVED' ? 'success' : 'error'}
         text={`Apakah anda yakin ingin ${
           approvalAction == 'APPROVED' ? 'approve' : 'reject'
-        } Project Flock berikut? (${initialValues?.flock?.name} - ${
+        } Project Flock berikut? (${initialValues?.flock_name} - ${
           initialValues?.area?.name
         })?`}
         secondaryButton={{
@@ -859,10 +903,8 @@ const ProjectFlockForm = ({
           text: 'Ya',
           color: approvalAction == 'APPROVED' ? 'success' : 'error',
           isLoading: isApproveLoading,
-          onClick: () => {
-            confirmationModalClickHandler({
-              action: approvalAction,
-            });
+          onClick: (notes) => {
+            confirmApprovalHandler(notes, approvalAction);
           },
         }}
       />

src/components/pages/production/project-flock/form/ProjectFlockKandangTable.tsx

@@ -5,10 +5,15 @@ import PillBadge from '@/components/PillBadge';
 import Table from '@/components/Table';
 import { cn } from '@/lib/helper';
 import { Kandang } from '@/types/api/master-data/kandang';
+import {
+  ProjectFlock,
+  ProjectFlockPeriods,
+} from '@/types/api/production/project-flock';
 import { OnChangeFn, Row } from '@tanstack/react-table';
 import { useMemo } from 'react';
 
 const ProjectFlockKandangTable = ({
+  listPeriods,
   listKandang,
   rowSelection,
   setRowSelection,
@@ -16,15 +21,16 @@ const ProjectFlockKandangTable = ({
   initialValues,
   formType = 'add',
 }: {
+  listPeriods: ProjectFlockPeriods;
   listKandang: Kandang[];
   rowSelection: Record<string, boolean>;
   setRowSelection: OnChangeFn<Record<string, boolean>>;
   selectedIds: (number | undefined)[];
-  initialValues?: Kandang[];
+  initialValues?: ProjectFlock;
   formType: 'add' | 'edit' | 'detail';
 }) => {
   const initialKandangIdSet = useMemo(() => {
-    return initialValues?.map((k) => k.id) ?? [];
+    return initialValues?.kandangs.map((k) => k.id) ?? [];
   }, [initialValues]);
   const isRowEnabled = (row: Row<Kandang>) => {
     const isDisabled =
@@ -134,6 +140,30 @@ const ProjectFlockKandangTable = ({
             accessorFn: (row) => row.capacity,
             header: 'Kapasitas',
           },
+          {
+            accessorFn: (row) => row.location?.name,
+            header: 'Periode',
+            cell: (props) => {
+              console.log('listPeriods');
+              console.log(listPeriods);
+              const period =
+                listPeriods.length > 0
+                  ? listPeriods.find((p) => p.id == props.row.original.id)
+                  : undefined;
+              const calcPeriod = period?.period == 0 ? 1 : period?.period;
+              const selected = props.row.getIsSelected();
+              const initPeriod = initialValues?.period;
+              return formType == 'detail'
+                ? selected
+                  ? initPeriod
+                  : '-'
+                : formType == 'add'
+                  ? (calcPeriod ?? '-')
+                  : selected
+                    ? (initPeriod ?? '-')
+                    : (calcPeriod ?? '-');
+            },
+          },
           {
             accessorFn: (row) => row.pic?.name,
             header: 'Penanggung Jawab',

src/components/pages/production/recording/form/RecordingForm.schema.ts

@@ -1,212 +1,320 @@
 import * as Yup from 'yup';
-import { RECORDING_FLAG_OPTIONS } from '@/config/constant';
-import { Recording } from '@/types/api/production/recording';
+import {
+  Recording,
+  CreateGrowingRecordingPayload,
+  CreateLayingRecordingPayload,
+  CreateEggPayload,
+  CreateGradingPayload,
+} from '@/types/api/production/recording';
 
-export const RecordingFormSchema = Yup.object({
-  flock: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  flock_id: Yup.number()
-    .default(0)
-    .typeError('Flock wajib diisi!')
-    .test(
-      'is-valid-flock',
-      'Flock wajib diisi!',
-      (value) => value !== undefined && value !== null && value > 0
-    )
-    .required('Flock wajib diisi!'),
-  location: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  location_id: Yup.number()
-    .default(0)
-    .typeError('Lokasi wajib diisi!')
-    .test(
-      'is-valid-location',
-      'Lokasi wajib diisi!',
-      (value) => value !== undefined && value !== null && value > 0
-    )
-    .required('Lokasi wajib diisi!'),
-  coop: Yup.object({
-    value: Yup.number().min(1).required(),
-    label: Yup.string().required(),
-  }).nullable(),
-  coop_id: Yup.number()
-    .default(0)
-    .typeError('Kandang wajib diisi!')
-    .test(
-      'is-valid-coop',
-      'Kandang wajib diisi!',
-      (value) => value !== undefined && value !== null && value > 0
-    )
-    .required('Kandang wajib diisi!'),
-  recording_date: Yup.date()
-    .required('Tanggal recording wajib diisi')
-    .typeError('Format tanggal tidak valid'),
-  feed_data: Yup.array()
-    .of(
-      Yup.object({
-        feed_id: Yup.string().required('Nama pakan wajib diisi!'),
-        feed_qty: Yup.mixed<number | ''>().notRequired(),
-        feed_stock: Yup.number()
-          .required('Jumlah pakan yang digunakan wajib diisi!')
-          .min(1, 'Jumlah pakan minimal 1!')
-          .typeError('Jumlah pakan yang digunakan harus berupa angka!')
-          .test(
-            'is-not-exceed-qty',
-            'Jumlah pakan yang digunakan tidak boleh melebihi stok tersedia!',
-            function (value) {
-              const { feed_qty } = this.parent;
-              if (value === undefined) return true;
-              if (
-                feed_qty === undefined ||
-                feed_qty === '' ||
-                typeof feed_qty !== 'number'
-              )
-                return true;
-              return value <= feed_qty;
-            }
-          ),
-      })
-    )
-    .min(1, 'Minimal harus ada 1 data pakan!')
-    .required('Data pakan wajib diisi!'),
-  body_weight: Yup.array()
-    .of(
-      Yup.object({
-        chicken_weight: Yup.number()
-          .required('Berat ayam wajib diisi!')
-          .min(1, 'Berat ayam minimal 1 gram!')
-          .typeError('Berat ayam harus berupa angka!'),
-        chicken_count: Yup.number()
-          .required('Jumlah ayam wajib diisi!')
-          .min(1, 'Jumlah ayam minimal 1 ekor!')
-          .typeError('Jumlah ayam harus berupa angka!'),
-        average_chicken_weight: Yup.number()
-          .required('Rata-rata berat ayam wajib diisi!')
-          .min(1, 'Rata-rata berat ayam minimal 1 gram!')
-          .typeError('Rata-rata berat ayam harus berupa angka!'),
-      })
-    )
-    .min(1, 'Minimal harus ada 1 data bobot badan!')
-    .required('Data bobot badan wajib diisi!'),
-  vaccination: Yup.array()
-    .of(
-      Yup.object({
-        vaccine_id: Yup.string().required('Nama vaksin wajib diisi!'),
-        total_stock: Yup.mixed<number | ''>().notRequired(),
-        used_stock: Yup.number()
-          .required('Jumlah vaksin yang digunakan wajib diisi!')
-          .min(1, 'Jumlah vaksin minimal 1!')
-          .typeError('Jumlah vaksin yang digunakan harus berupa angka!')
-          .test(
-            'is-not-exceed-total',
-            'Jumlah vaksin yang digunakan tidak boleh melebihi stok tersedia!',
-            function (value) {
-              const { total_stock } = this.parent;
-              if (value === undefined) return true;
-              if (
-                total_stock === undefined ||
-                total_stock === '' ||
-                typeof total_stock !== 'number'
-              )
-                return true;
-              return value <= total_stock;
-            }
-          ),
-      })
-    )
-    .min(1, 'Minimal harus ada 1 data vaksinasi!')
-    .required('Data vaksinasi wajib diisi!'),
-  mortality: Yup.array()
-    .of(
-      Yup.object({
-        condition: Yup.mixed<string>()
-          .oneOf(
-            RECORDING_FLAG_OPTIONS.map((opt) => opt.value),
-            'Kondisi tidak valid!'
-          )
-          .required('Kondisi wajib diisi!'),
-        count: Yup.number()
-          .required('Jumlah mortalitas wajib diisi!')
-          .min(1, 'Jumlah mortalitas minimal 1 ekor!')
-          .typeError('Jumlah mortalitas harus berupa angka!'),
-      })
-    )
-    .min(1, 'Minimal harus ada 1 data mortalitas!')
-    .required('Data mortalitas wajib diisi!'),
+type RecordingGrowingFormSchemaType = {
+  project_flock_kandang: {
+    value: number;
+    label: string;
+  } | null;
+  project_flock_kandang_id: number;
+  body_weights: {
+    weight: number | string;
+    avg_weight: number | string;
+    qty: number | string;
+  }[];
+  stocks: {
+    product_warehouse_id: number;
+    qty: number | string;
+  }[];
+  depletions: {
+    product_warehouse_id: number;
+    qty: number | string;
+  }[];
+};
+
+type RecordingLayingFormSchemaType = RecordingGrowingFormSchemaType & {
+  eggs: {
+    product_warehouse_id: number;
+    qty: number | string;
+  }[];
+};
+
+type RecordingGradingFormSchemaType = {
+  eggs_grading: {
+    recording_egg_id: number;
+    grade: string;
+    qty: number | string;
+  }[];
+};
+
+export type BodyWeightSchema = {
+  weight: number | string;
+  avg_weight: number | string;
+  qty: number | string;
+};
+
+export type StockSchema = {
+  product_warehouse_id: number;
+  qty: number | string;
+};
+
+export type DepletionSchema = {
+  product_warehouse_id: number;
+  qty: number | string;
+};
+
+export type EggSchema = {
+  product_warehouse_id: number;
+  qty: number | string;
+};
+
+const BodyWeightObjectSchema: Yup.ObjectSchema<BodyWeightSchema> = Yup.object({
+  weight: Yup.number()
+    .required('Berat ayam total wajib diisi!')
+    .min(1, 'Berat ayam total minimal 1 gram!')
+    .typeError('Berat ayam total harus berupa angka!'),
+  avg_weight: Yup.number()
+    .required('Berat ayam rata-rata wajib diisi!')
+    .typeError('Berat ayam rata-rata harus berupa angka!'),
+  qty: Yup.number()
+    .required('Jumlah ayam wajib diisi!')
+    .min(1, 'Jumlah ayam minimal 1 ekor!')
+    .typeError('Jumlah ayam harus berupa angka!'),
 });
 
-export const UpdateRecordingFormSchema = RecordingFormSchema;
+const StockObjectSchema: Yup.ObjectSchema<StockSchema> = Yup.object({
+  product_warehouse_id: Yup.number()
+    .required('Produk wajib diisi!')
+    .min(1, 'Produk wajib diisi!')
+    .typeError('Produk harus berupa angka!'),
+  qty: Yup.number()
+    .required('Jumlah penggunaan wajib diisi!')
+    .min(1, 'Jumlah penggunaan tidak boleh 0!')
+    .typeError('Jumlah penggunaan harus berupa angka!'),
+});
 
-export type RecordingFormValues = Yup.InferType<typeof RecordingFormSchema>;
+const DepletionObjectSchema: Yup.ObjectSchema<DepletionSchema> = Yup.object({
+  product_warehouse_id: Yup.number()
+    .required('Produk depletions wajib diisi!')
+    .min(1, 'Produk depletions wajib diisi!')
+    .typeError('Produk depletions harus berupa angka!'),
+  qty: Yup.number()
+    .required('Jumlah depletions wajib diisi!')
+    .min(1, 'Jumlah depletions minimal 1!')
+    .typeError('Jumlah depletions harus berupa angka!'),
+});
 
-export const getRecordingFormInitialValues = (
-  initialValues?: Recording
-): RecordingFormValues => ({
-  flock: initialValues?.flock
+const EggObjectSchema: Yup.ObjectSchema<EggSchema> = Yup.object({
+  product_warehouse_id: Yup.number()
+    .required('Kondisi telur wajib diisi!')
+    .min(1, 'Kondisi telur wajib diisi!')
+    .typeError('Kondisi telur harus berupa angka!'),
+  qty: Yup.number()
+    .required('Jumlah telur wajib diisi!')
+    .min(1, 'Jumlah telur tidak boleh 0!')
+    .typeError('Jumlah telur harus berupa angka!'),
+});
+
+export const RecordingGrowingFormSchema: Yup.ObjectSchema<RecordingGrowingFormSchemaType> =
+  Yup.object({
+    project_flock_kandang: Yup.object({
+      value: Yup.number().min(1).required(),
+      label: Yup.string().required(),
+    }).nullable(),
+    project_flock_kandang_id: Yup.number()
+      .default(0)
+      .typeError('Project Flock Kandang wajib diisi!')
+      .test(
+        'is-valid-project-flock-kandang',
+        'Project Flock Kandang wajib diisi!',
+        (value) => value !== undefined && value !== null && value > 0
+      )
+      .required('Project Flock Kandang wajib diisi!')
+      .test(
+        'not-already-recorded',
+        'Project Flock ini sudah direcord hari ini!',
+        function (value) {
+          const recordedProjectFlockIds = this.options.context
+            ?.recordedProjectFlockIds as Set<number>;
+          const formType = this.options.context?.type as
+            | 'add'
+            | 'edit'
+            | 'detail';
+          if (formType !== 'add') return true;
+          if (value && recordedProjectFlockIds?.has(value)) {
+            return false;
+          }
+          return true;
+        }
+      ),
+    body_weights: Yup.array()
+      .of(BodyWeightObjectSchema)
+      .min(1, 'Minimal harus ada 1 data bobot badan!')
+      .required('Data bobot badan wajib diisi!'),
+    stocks: Yup.array()
+      .of(StockObjectSchema)
+      .min(1, 'Minimal harus ada 1 data stok!')
+      .required('Data stok wajib diisi!'),
+    depletions: Yup.array()
+      .of(DepletionObjectSchema)
+      .min(1, 'Minimal harus ada 1 data depletions!')
+      .required('Data depletions wajib diisi!'),
+  });
+
+export const RecordingLayingFormSchema: Yup.ObjectSchema<RecordingLayingFormSchemaType> =
+  RecordingGrowingFormSchema.shape({
+    eggs: Yup.array()
+      .of(EggObjectSchema)
+      .min(1, 'Minimal harus ada 1 data telur!')
+      .required('Data telur wajib diisi!'),
+  });
+
+export const UpdateRecordingGrowingFormSchema =
+  RecordingGrowingFormSchema.shape({
+    project_flock_kandang_id: Yup.number()
+      .default(0)
+      .typeError('Project Flock Kandang wajib diisi!')
+      .test(
+        'is-valid-project-flock-kandang',
+        'Project Flock Kandang wajib diisi!',
+        (value) => value !== undefined && value !== null && value > 0
+      )
+      .required('Project Flock Kandang wajib diisi!'),
+  });
+
+export const UpdateRecordingLayingFormSchema = RecordingLayingFormSchema.shape({
+  project_flock_kandang_id: Yup.number()
+    .default(0)
+    .typeError('Project Flock Kandang wajib diisi!')
+    .test(
+      'is-valid-project-flock-kandang',
+      'Project Flock Kandang wajib diisi!',
+      (value) => value !== undefined && value !== null && value > 0
+    )
+    .required('Project Flock Kandang wajib diisi!'),
+});
+
+export const RecordingGradingFormSchema: Yup.ObjectSchema<RecordingGradingFormSchemaType> =
+  Yup.object({
+    eggs_grading: Yup.array()
+      .of(
+        Yup.object({
+          recording_egg_id: Yup.number()
+            .required('Recording Egg ID wajib diisi!')
+            .min(1, 'Recording Egg ID minimal 1!')
+            .typeError('Recording Egg ID harus berupa angka!'),
+          grade: Yup.string()
+            .required('Grade telur wajib diisi!')
+            .typeError('Grade telur harus berupa string!'),
+          qty: Yup.number()
+            .required('Jumlah telur wajib diisi!')
+            .min(1, 'Jumlah telur minimal 1!')
+            .typeError('Jumlah telur harus berupa angka!'),
+        })
+      )
+      .min(1, 'Minimal harus ada 1 data grading telur!')
+      .required('Data grading telur wajib diisi!'),
+  });
+
+export const UpdateRecordingGradingFormSchema = RecordingGradingFormSchema;
+
+export type RecordingGrowingFormValues = Yup.InferType<
+  typeof RecordingGrowingFormSchema
+>;
+
+export type RecordingLayingFormValues = Yup.InferType<
+  typeof RecordingLayingFormSchema
+>;
+
+export type RecordingGradingFormValues = Yup.InferType<
+  typeof RecordingGradingFormSchema
+>;
+
+type RecordingFormData = Partial<Recording> & {
+  body_weights?: CreateGrowingRecordingPayload['body_weights'];
+  stocks?: CreateGrowingRecordingPayload['stocks'] | Recording['stocks'];
+  depletions?:
+    | CreateGrowingRecordingPayload['depletions']
+    | Recording['depletions'];
+  eggs?: CreateLayingRecordingPayload['eggs'] | Recording['eggs'];
+  project_flock_kandang_id?: number;
+  project_flock_category?: string;
+};
+
+export const getRecordingGrowingFormInitialValues = (
+  initialValues?: RecordingFormData
+): RecordingGrowingFormValues => ({
+  project_flock_kandang: initialValues?.project_flock_kandang_id
     ? {
-        value: initialValues.flock.id,
-        label: initialValues.flock.name,
+        value: initialValues.project_flock_kandang_id,
+        label: `Project Flock #${initialValues.project_flock_kandang_id}`,
       }
     : null,
-  flock_id: initialValues?.flock?.id ?? 0,
-  location: initialValues?.location
-    ? {
-        value: initialValues.location.id,
-        label: initialValues.location.name,
-      }
-    : null,
-  location_id: initialValues?.location?.id ?? 0,
-  coop: initialValues?.coop
-    ? {
-        value: initialValues.coop.id,
-        label: initialValues.coop.name,
-      }
-    : null,
-  coop_id: initialValues?.coop?.id ?? 0,
-  recording_date: initialValues?.recording_date
-    ? new Date(initialValues.recording_date)
-    : new Date(),
-  feed_data: initialValues?.feed_data
-    ? initialValues.feed_data.map((feed) => ({
-        feed_id: feed.feed_name,
-        feed_qty: feed.feed_qty,
-        feed_stock: feed.feed_stock,
-      }))
-    : [
-        {
-          feed_id: '',
-          feed_qty: '',
-          feed_stock: 0,
-        },
-      ],
-  body_weight: initialValues?.body_weight ?? [
+  project_flock_kandang_id: initialValues?.project_flock_kandang_id ?? 0,
+  body_weights: initialValues?.body_weights?.map(
+    (bw: NonNullable<CreateGrowingRecordingPayload['body_weights']>[0]) => ({
+      weight: bw.avg_weight * bw.qty,
+      avg_weight: bw.avg_weight,
+      qty: bw.qty,
+    })
+  ) ?? [
     {
-      chicken_weight: 0,
-      chicken_count: 0,
-      average_chicken_weight: 0,
+      weight: '',
+      avg_weight: '',
+      qty: '',
     },
   ],
-  vaccination: initialValues?.vaccination
-    ? initialValues.vaccination.map((vaccine) => ({
-        vaccine_id: vaccine.vaccine_name,
-        total_stock: vaccine.total_stock,
-        used_stock: vaccine.used_stock,
-      }))
-    : [
-        {
-          vaccine_id: '',
-          total_stock: '',
-          used_stock: 0,
-        },
-      ],
-  mortality: initialValues?.mortality ?? [
+  stocks: initialValues?.stocks?.map((stock) => ({
+    product_warehouse_id: stock.product_warehouse_id,
+    qty:
+      (stock as { qty?: number; usage_amount?: number }).qty ||
+      (stock as { qty?: number; usage_amount?: number }).usage_amount ||
+      '',
+  })) ?? [
     {
-      condition: '',
-      count: 0,
+      product_warehouse_id: 0,
+      qty: '',
+    },
+  ],
+  depletions: initialValues?.depletions?.map(
+    (
+      depletion: NonNullable<CreateGrowingRecordingPayload['depletions']>[0]
+    ) => ({
+      product_warehouse_id: depletion.product_warehouse_id,
+      qty: depletion.qty,
+    })
+  ) ?? [
+    {
+      product_warehouse_id: 0,
+      qty: '',
+    },
+  ],
+});
+
+export const getRecordingLayingFormInitialValues = (
+  initialValues?: RecordingFormData
+): RecordingLayingFormValues => ({
+  ...getRecordingGrowingFormInitialValues(initialValues),
+
+  eggs: initialValues?.eggs?.map((egg: CreateEggPayload) => ({
+    product_warehouse_id: egg.product_warehouse_id,
+    qty: egg.qty,
+  })) ?? [
+    {
+      product_warehouse_id: 0,
+      qty: '',
+    },
+  ],
+});
+
+export const getRecordingGradingFormInitialValues = (
+  initialValues?: Partial<CreateGradingPayload> & { recording_egg_id?: number }
+): RecordingGradingFormValues => ({
+  eggs_grading: initialValues?.eggs_grading?.map((grading) => ({
+    recording_egg_id: grading.recording_egg_id,
+    grade: grading.grade,
+    qty: grading.qty,
+  })) ?? [
+    {
+      recording_egg_id: initialValues?.recording_egg_id ?? 0,
+      grade: '',
+      qty: '',
     },
   ],
 });

src/components/pages/production/recording/form/useRecordingFormHandlers.ts

@@ -1,70 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { toast } from 'react-hot-toast';
-import { useModal } from '@/components/Modal';
-import { RecordingApi } from '@/services/api/production';
-import {
-  CreateRecordingPayload,
-  UpdateRecordingPayload,
-} from '@/types/api/production/recording';
-import { isResponseError } from '@/lib/api-helper';
-
-export const useRecordingFormHandlers = (initialValuesId?: number) => {
-  const router = useRouter();
-  const deleteModal = useModal();
-  const [recordingFormErrorMessage, setRecordingFormErrorMessage] =
-    useState('');
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-
-  const createRecordingHandler = useCallback(
-    async (payload: CreateRecordingPayload) => {
-      const res = await RecordingApi.create(payload);
-      if (isResponseError(res)) {
-        setRecordingFormErrorMessage(res.message);
-        return;
-      }
-      toast.success(res?.message as string);
-      router.push('/flock/recording');
-    },
-    [router]
-  );
-
-  const updateRecordingHandler = useCallback(
-    async (recordingId: number, payload: UpdateRecordingPayload) => {
-      const res = await RecordingApi.update(recordingId, payload);
-      if (res?.status === 'error') {
-        setRecordingFormErrorMessage(res.message);
-        return;
-      }
-      toast.success(res?.message as string);
-      router.refresh();
-      router.push('/flock/recording');
-    },
-    [router]
-  );
-
-  const deleteRecordingClickHandler = useCallback(() => {
-    deleteModal.openModal();
-  }, [deleteModal]);
-
-  const confirmationModalDeleteClickHandler = useCallback(async () => {
-    if (!initialValuesId) return;
-
-    setIsDeleteLoading(true);
-    await RecordingApi.delete(initialValuesId);
-    deleteModal.closeModal();
-    toast.success('Successfully delete Recording!');
-    setIsDeleteLoading(false);
-    router.push('/flock/recording');
-  }, [deleteModal, initialValuesId, router]);
-
-  return {
-    deleteModal,
-    recordingFormErrorMessage,
-    isDeleteLoading,
-    createRecordingHandler,
-    updateRecordingHandler,
-    deleteRecordingClickHandler,
-    confirmationModalDeleteClickHandler,
-  };
-};