Merge branch 'master' of https://git.shiblysolution.id/TPAY/dashboard

.gitignore

@@ -33,3 +33,4 @@ package-lock.json
 package.json
 yarn.lock
 package-lock.json
+package-lock.json

.woodpecker.yml

@@ -0,0 +1,46 @@
+steps:
+    - name: setup
+      image: node:22-alpine
+      commands:
+          - apk update && apk add git
+          - npm i typescript -g
+          - npm install
+          - echo '✅ success setup project'
+      when:
+          branch:
+              - main
+
+    - name: build-swagger
+      image: node:22-alpine
+      environment:
+          NODE_ENV: prod
+      commands:
+          - npm run swagger
+      when:
+          branch:
+              - main
+
+    - name: build-src
+      image: node:22-alpine
+      environment:
+          NODE_ENV: prod
+      commands:
+          - npm i typescript -g
+          - npm run build:production
+          - echo '✅ success compile typescript and ready to deploy'
+      when:
+          branch:
+              - main
+
+    - name: deploy
+      image: docker
+      commands:
+          - docker builder prune -f
+          - docker container prune -f
+          - docker-compose build
+          - docker-compose up -d --no-deps --build --remove-orphans
+      volumes:
+          - /var/run/docker.sock:/var/run/docker.sock
+      when:
+          branch:
+              - main

Dockerfile

@@ -0,0 +1,39 @@
+FROM node:22-alpine AS base
+
+RUN apk update && apk add git
+
+COPY package.json ./
+
+RUN npm install
+RUN npm install typescript -g
+
+# add folder if needs more
+COPY src ./src
+COPY public ./public
+
+COPY tsconfig.json ./tsconfig.json
+COPY tsconfig.node.json ./tsconfig.node.json
+COPY vite.config.ts ./vite.config.ts
+COPY tailwind.config.js ./tailwind.config.js
+COPY postcss.config.js ./postcss.config.js
+COPY eslint.config.mjs ./eslint.config.mjs
+COPY .env.production ./.env.production
+COPY .prettierrc ./.prettierrc
+COPY index.html ./index.html
+
+RUN npm run build:production
+
+FROM node:22-alpine
+
+# Copy node modules and build directory from base image to new image
+COPY --from=base ./node_modules ./node_modules
+COPY --from=base ./package.json ./package.json
+COPY --from=base /dist /dist
+COPY --from=base /src /src
+COPY --from=base /public /public
+
+# Expose required port
+FROM nginx:alpine
+COPY --from=base /dist /usr/share/nginx/html
+
+CMD ["nginx", "-g", "daemon off;"]

docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3.9'
+
+services:
+  api:
+    image: app-dashboard:1.0.1
+    restart: always
+    container_name: app-dashboard
+    build: .
+    ports:
+      - '4040:80' # Specify the exposed port, we will need this to access the app from local machine
+

package.json

@@ -80,7 +80,7 @@
     "styled-components": "^6.1.13",
     "stylis": "^4.3.4",
     "stylis-plugin-rtl": "^2.1.1",
-    "sweetalert2": "^11.19.1",
+    "sweetalert2": "^11.21.0",
     "tabs": "^0.2.0",
     "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",

src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx

@@ -501,6 +501,11 @@ const DetailTransaction = () => {
                                     <div>
                                         <p className="text-sm text-gray-500">Phone Number</p>
                                         <p className="font-medium">{transactionDetails?.origin_msisdn}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}</p>
+                                    </div>
+                                    <div>
+                                        <p className="text-sm text-gray-500">Phone Number</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.msisdn ?? transactionDetails?.origin_msisdn}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Email</p>

src/pages/wallet/wallet-history/hooks/ManageWalletHistoryContext.tsx

@@ -182,16 +182,16 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode }
           headerClassName: 'w-[200px]'
         }
       },
-      {
+      // {
-        accessorFn: (row) => row.group?.is_bank,
+      //   accessorFn: (row) => row.group?.is_bank,
-        id: 'is_bank',
+      //   id: 'is_bank',
-        header: ({ column }) => <DataGridColumnHeader title="Is Bank" column={column} />,
+      //   header: ({ column }) => <DataGridColumnHeader title="Is Bank" column={column} />,
-        enableSorting: false,
+      //   enableSorting: false,
-        enableHiding: false,
+      //   enableHiding: false,
-        meta: {
+      //   meta: {
-          headerClassName: 'w-[200px]'
+      //     headerClassName: 'w-[200px]'
-        }
+      //   }
-      }
+      // }
     ],
     []
   );