From 192d0baf3344276c4308d0912030646bbfcc1517 Mon Sep 17 00:00:00 2001
From: yusualhashash <yusufalhashash2018@gmail.com>
Date: Fri, 9 Aug 2024 15:49:44 +0300
Subject: [PATCH 1/4] feat: send the fileds of table from template page to
 table page

---
 .../app/[type]/template/rebate/page.tsx       | 169 ++++++++++++------
 1 file changed, 116 insertions(+), 53 deletions(-)

diff --git a/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx b/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
index a7df3f6b6..951c21bac 100644
--- a/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
+++ b/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
@@ -74,9 +74,52 @@ function AmountCell({ getValue, row: { index }, column: { id }, table }: any) {
   );
 }
 
+const feescolumns: ColumnDef<Record<string, any>>[] = [
+  {
+    id: "select",
+    header: ({ table }) => (
+      <Checkbox
+        aria-label="Select all"
+        checked={table.getIsAllPageRowsSelected()}
+        onCheckedChange={(value) => {
+          table.toggleAllPageRowsSelected(Boolean(value));
+        }}
+      />
+    ),
+    cell: ({ row }) => (
+      <Checkbox
+        aria-label="Select row"
+        checked={row.getIsSelected()}
+        onCheckedChange={() => {
+          row.toggleSelected();
+        }}
+      />
+    ),
+  },
+  {
+    accessorKey: "name",
+    header: () => <div className="text-center">Name</div>,
+    cell: (props) => <NameCell {...props} />,
+  },
+  {
+    accessorKey: "amount",
+    header: () => <div className="text-center">Amount</div>,
+    cell: (props) => <AmountCell {...props} />,
+  },
+  {
+    accessorKey: "actions",
+    enableHiding: false,
+    cell: () => (
+      <Button variant="ghost">
+        <TrashIcon className="w-4 h-4 text-red-500" />
+      </Button>
+    ),
+  },
+];
+
 function SetupCell({ getValue, row: { index }, column: { id }, table }: any) {
-  const initialValue = getValue() as string | undefined;
-  const [value, setValue] = useState<string | undefined>(initialValue);
+  const setupValue = getValue() as string | undefined;
+  const [value, setValue] = useState<string | undefined>(setupValue);
 
   const onChange = (newValue: string): void => {
     setValue(newValue);
@@ -84,8 +127,8 @@ function SetupCell({ getValue, row: { index }, column: { id }, table }: any) {
   };
 
   useEffect(() => {
-    setValue(initialValue);
-  }, [initialValue]);
+    setValue(setupValue);
+  }, [setupValue]);
 
   return (
     <Select onValueChange={onChange} value={value}>
@@ -107,17 +150,17 @@ function SetupCell({ getValue, row: { index }, column: { id }, table }: any) {
   );
 }
 
-function PercentCell({ getValue, row: { index }, column: { id }, table }: any) {
-  const initialValue = getValue();
-  const [value, setValue] = useState(initialValue);
+function Fixedfee({ getValue, row: { index }, column: { id }, table }: any) {
+  const fixedFeeValue = getValue();
+  const [value, setValue] = useState(fixedFeeValue);
 
   const onBlur = (): void => {
     table.options.meta?.updateData(index, id, value);
   };
 
   useEffect(() => {
-    setValue(initialValue);
-  }, [initialValue]);
+    setValue(fixedFeeValue);
+  }, [fixedFeeValue]);
 
   return (
     <Input
@@ -131,48 +174,57 @@ function PercentCell({ getValue, row: { index }, column: { id }, table }: any) {
   );
 }
 
-const feescolumns: ColumnDef<Record<string, any>>[] = [
-  {
-    id: "select",
-    header: ({ table }) => (
-      <Checkbox
-        aria-label="Select all"
-        checked={table.getIsAllPageRowsSelected()}
-        onCheckedChange={(value) => {
-          table.toggleAllPageRowsSelected(Boolean(value));
-        }}
-      />
-    ),
-    cell: ({ row }) => (
-      <Checkbox
-        aria-label="Select row"
-        checked={row.getIsSelected()}
-        onCheckedChange={() => {
-          row.toggleSelected();
-        }}
-      />
-    ),
-  },
-  {
-    accessorKey: "name",
-    header: () => <div className="text-center">Name</div>,
-    cell: (props) => <NameCell {...props} />,
-  },
-  {
-    accessorKey: "amount",
-    header: () => <div className="text-center">Amount</div>,
-    cell: (props) => <AmountCell {...props} />,
-  },
-  {
-    accessorKey: "actions",
-    enableHiding: false,
-    cell: () => (
-      <Button variant="ghost">
-        <TrashIcon className="w-4 h-4 text-red-500" />
-      </Button>
-    ),
-  },
-];
+function Variablefee({ getValue, row: { index }, column: { id }, table }: any) {
+  const variableFeeValue = getValue() as string | undefined;
+  const [value, setValue] = useState<string | undefined>(variableFeeValue);
+
+  const onChange = (newValue: string): void => {
+    setValue(newValue);
+    table.options.meta?.updateData(index, id, newValue);
+  };
+
+  useEffect(() => {
+    setValue(variableFeeValue);
+  }, [variableFeeValue]);
+
+  return (
+    <Select onValueChange={onChange} value={value}>
+      <SelectTrigger className="w-full text-center">
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value="All">% of GC</SelectItem>
+        <SelectItem value="Cash">% of GC without VAT</SelectItem>
+        <SelectItem value="Alipay">% of VAT</SelectItem>
+        <SelectItem value="WeChat">% of SIS</SelectItem>
+      </SelectContent>
+    </Select>
+  );
+}
+
+function PercentCell({ getValue, row: { index }, column: { id }, table }: any) {
+  const percentValue = getValue();
+  const [value, setValue] = useState(percentValue);
+
+  const onBlur = (): void => {
+    table.options.meta?.updateData(index, id, value);
+  };
+
+  useEffect(() => {
+    setValue(percentValue);
+  }, [percentValue]);
+
+  return (
+    <Input
+      onBlur={onBlur}
+      onChange={(e) => {
+        setValue(e.target.value);
+      }}
+      type="number"
+      value={value as string}
+    />
+  );
+}
 
 const setupcolumns: ColumnDef<Record<string, any>>[] = [
   {
@@ -202,12 +254,12 @@ const setupcolumns: ColumnDef<Record<string, any>>[] = [
   {
     accessorKey: "fixedfee",
     header: () => <div className="text-center">Fixed fee</div>,
-    cell: (props) => <AmountCell {...props} />,
+    cell: (props) => <Fixedfee {...props} />,
   },
   {
     accessorKey: "variablefee",
     header: () => <div className="text-center">Variable fee</div>,
-    cell: (props) => <SetupCell {...props} />,
+    cell: (props) => <Variablefee {...props} />,
   },
   {
     accessorKey: "percent",
@@ -255,6 +307,15 @@ function Rebate() {
     return Object.values(row).every((value) => value === "" || value === null);
   };
 
+  const feesHeaders = { name: "", amount: "" };
+
+  const setupHeaders = {
+    refundmethod: "",
+    fixedfee: "",
+    variablefee: "",
+    percent: "",
+  };
+
   return (
     <div className="flex flex-row w-full h-full ">
       <Card className="bg-transparent border-0 shadow-none w-full overflow-auto pb-16 m-0">
@@ -282,6 +343,7 @@ function Rebate() {
             </div>
             <div className="overflow-auto">
               <DataTable
+                Headertable={feesHeaders}
                 columnsData={{
                   type: "Custom",
                   data: feescolumns,
@@ -300,6 +362,7 @@ function Rebate() {
             </div>
             <div className="overflow-auto">
               <DataTable
+                Headertable={setupHeaders}
                 columnsData={{
                   type: "Custom",
                   data: setupcolumns,

From c03e33fdd821617af98e54c4b195636b56615614 Mon Sep 17 00:00:00 2001
From: yusualhashash <yusufalhashash2018@gmail.com>
Date: Mon, 12 Aug 2024 14:56:17 +0300
Subject: [PATCH 2/4] chore: edit the position of calculate button

---
 .../web/src/app/[lang]/app/[type]/template/preview/page.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/[lang]/app/[type]/template/preview/page.tsx b/apps/web/src/app/[lang]/app/[type]/template/preview/page.tsx
index 3ad8cd3da..7e0ad84f4 100644
--- a/apps/web/src/app/[lang]/app/[type]/template/preview/page.tsx
+++ b/apps/web/src/app/[lang]/app/[type]/template/preview/page.tsx
@@ -310,9 +310,9 @@ const data = [
 function MyDataTable() {
   return (
     <div>
-      <div className="mt-4  flex justify-end-between">
-        <Input placeholder="SIS" />
-        <Button className="mx-9">Calculate</Button>
+      <div className="mt-4 flex justify-end-between">
+        <Input placeholder="SIS" type="number" />
+        <Button className="ml-9">Calculate</Button>
       </div>
       <DataTable
         columnsData={{

From 3606b6f362f9a69bf7c6b11f8970981a75403f8a Mon Sep 17 00:00:00 2001
From: yusualhashash <yusufalhashash2018@gmail.com>
Date: Mon, 12 Aug 2024 15:31:16 +0300
Subject: [PATCH 3/4] feat: make handlesubmit function enable to send the data
 from autofrma nd table

---
 .../app/[type]/template/rebate/page.tsx       | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx b/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
index 951c21bac..bac277b6a 100644
--- a/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
+++ b/apps/web/src/app/[lang]/app/[type]/template/rebate/page.tsx
@@ -109,8 +109,13 @@ const feescolumns: ColumnDef<Record<string, any>>[] = [
   {
     accessorKey: "actions",
     enableHiding: false,
-    cell: () => (
-      <Button variant="ghost">
+    cell: ({ row, table }) => (
+      <Button
+        onClick={() => {
+          table.options.meta?.removeRow(row.index, "actions", null);
+        }}
+        variant="ghost"
+      >
         <TrashIcon className="w-4 h-4 text-red-500" />
       </Button>
     ),
@@ -193,10 +198,10 @@ function Variablefee({ getValue, row: { index }, column: { id }, table }: any) {
         <SelectValue />
       </SelectTrigger>
       <SelectContent>
-        <SelectItem value="All">% of GC</SelectItem>
-        <SelectItem value="Cash">% of GC without VAT</SelectItem>
-        <SelectItem value="Alipay">% of VAT</SelectItem>
-        <SelectItem value="WeChat">% of SIS</SelectItem>
+        <SelectItem value="% of GC">% of GC</SelectItem>
+        <SelectItem value="% of GC without VAT">% of GC without VAT</SelectItem>
+        <SelectItem value="% of VAT">% of VAT</SelectItem>
+        <SelectItem value="% of SIS">% of SIS</SelectItem>
       </SelectContent>
     </Select>
   );
@@ -269,8 +274,13 @@ const setupcolumns: ColumnDef<Record<string, any>>[] = [
   {
     accessorKey: "actions",
     enableHiding: false,
-    cell: () => (
-      <Button variant="ghost">
+    cell: ({ row, table }) => (
+      <Button
+        onClick={() => {
+          table.options.meta?.removeRow(row.index, "actions", null);
+        }}
+        variant="ghost"
+      >
         <Trash2Icon className="w-4 h-4 text-red-500" />
       </Button>
     ),
@@ -279,28 +289,23 @@ const setupcolumns: ColumnDef<Record<string, any>>[] = [
 
 function Rebate() {
   const [autoFormData, setAutoFormData] = useState<Record<string, any>>({});
-  const [feesData] = useState(initialFeesData);
-  const [setupData] = useState(initialSetupData);
+  const [feesData, setFeesData] = useState(initialFeesData);
+  const [setupData, setSetupData] = useState(initialSetupData);
 
   const handleFormChange = (newFormData: any): void => {
     setAutoFormData(newFormData);
   };
 
-  const handleSubmit = (): void => {
+  const handleSubmit = () => {
     const filteredFeesData = feesData.filter((row) => !isRowEmpty(row));
     const filteredSetupData = setupData.filter((row) => !isRowEmpty(row));
 
     const payload: any = {
       autoFormData,
+      feesData: filteredFeesData,
+      setupData: filteredSetupData,
     };
-
-    if (filteredFeesData.length > 0) {
-      payload.feesData = filteredFeesData;
-    }
-
-    if (filteredSetupData.length > 0) {
-      payload.setupData = filteredSetupData;
-    }
+    return payload;
   };
 
   const isRowEmpty = (row: any): boolean => {
@@ -320,7 +325,8 @@ function Rebate() {
     <div className="flex flex-row w-full h-full ">
       <Card className="bg-transparent border-0 shadow-none w-full overflow-auto pb-16 m-0">
         <CardHeader className="text-2xl font-bold flex flex-row gap-2 items-center">
-          <EditIcon className="text-slate-600 w-6" /> Edit Template Information
+          <EditIcon className="text-slate-600 w-6" />
+          Edit Template Information
         </CardHeader>
         <CardContent>
           <div className="px-9 [&>div>form>div]:space-y-4">
@@ -350,6 +356,7 @@ function Rebate() {
                 }}
                 data={feesData}
                 editable
+                onDataUpdate={() => { setFeesData(initialFeesData); }}
                 showView={false}
               />
             </div>
@@ -369,6 +376,7 @@ function Rebate() {
                 }}
                 data={setupData}
                 editable
+                onDataUpdate={() => { setSetupData(initialSetupData); }}
                 showView={false}
               />
             </div>

From 3dab0a437a075920755410eac78464af86991a68 Mon Sep 17 00:00:00 2001
From: yusualhashash <yusufalhashash2018@gmail.com>
Date: Mon, 12 Aug 2024 15:33:48 +0300
Subject: [PATCH 4/4] chore: update ui

---
 packages/ayasofyazilim-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ayasofyazilim-ui b/packages/ayasofyazilim-ui
index 0573d4cd4..d6018e98e 160000
--- a/packages/ayasofyazilim-ui
+++ b/packages/ayasofyazilim-ui
@@ -1 +1 @@
-Subproject commit 0573d4cd4fada3a89990b766714d1a89f412dc4f
+Subproject commit d6018e98e047ad335309d705f481c1e819913cf8