feat(Contract): update & edit (#909)

ayasofyazilim-clomerce · Dec 3, 2024 · 24d153a · 24d153a
2 parents b27675b + 42baf64
commit 24d153a
Show file tree

Hide file tree

Showing 8 changed files with 223 additions and 208 deletions.
diff --git a/...rties/[partyName]/[partyId]/contracts/[contractId]/[section]/contract/contract-header.tsx b/...rties/[partyName]/[partyId]/contracts/[contractId]/[section]/contract/contract-header.tsx
@@ -2,7 +2,7 @@
 
 import type {
   UniRefund_ContractService_ContractsForMerchant_ContractHeaders_ContractHeaderDetailForMerchantDto as ContractHeaderDetailForMerchantDto,
-  UniRefund_ContractService_ContractsForMerchant_ContractHeaders_ContractHeaderForMerchantUpdateDto as ContractHeaderForMerchantUpdateDto,
+  UniRefund_ContractService_Refunds_RefundTableHeaders_RefundTableHeaderDto as RefundTableHeaderDto,
 } from "@ayasofyazilim/saas/ContractService";
 import type { UniRefund_LocationService_AddressCommonDatas_AddressCommonDataDto as AddressCommonDataDto } from "@ayasofyazilim/saas/LocationService";
 import type { ContractServiceResource } from "src/language-data/ContractService";
@@ -14,35 +14,29 @@ export function ContractHeader({
   partyId,
   addressList,
   languageData,
+  refundTableHeaders,
 }: {
   contractHeaderDetails: ContractHeaderDetailForMerchantDto;
   partyName: "merchants";
   partyId: string;
   addressList: AddressCommonDataDto[];
+  refundTableHeaders: RefundTableHeaderDto[];
   languageData: ContractServiceResource;
 }) {
-  const refundTableHeaders =
-    contractHeaderDetails.contractHeaderRefundTableHeaders.map((header) => {
-      return {
-        refundTableHeaderId: header.refundTableHeader.id,
-        validFrom: header.validFrom,
-        validTo: header.validTo,
-        isDefault: header.isDefault,
-      };
-    });
   return (
-    <ContractHeaderForm<ContractHeaderForMerchantUpdateDto>
+    <ContractHeaderForm
       addresses={addressList}
+      contractId={contractHeaderDetails.id}
       formData={{
         ...contractHeaderDetails,
         status: contractHeaderDetails.status || "None",
         addressCommonDataId: contractHeaderDetails.addressCommonData.id,
-        refundTableHeaders,
       }}
-      formType="Update"
+      formType="update"
       languageData={languageData}
       partyId={partyId}
       partyName={partyName}
+      refundTableHeaders={refundTableHeaders}
     />
   );
 }
diff --git a/...parties/[partyName]/[partyId]/contracts/[contractId]/[section]/contract/contract-page.tsx b/...parties/[partyName]/[partyId]/contracts/[contractId]/[section]/contract/contract-page.tsx
@@ -1,6 +1,8 @@
 import type { UniRefund_ContractService_ContractsForMerchant_ContractHeaders_ContractHeaderDetailForMerchantDto as ContractHeaderDetailForMerchantDto } from "@ayasofyazilim/saas/ContractService";
 import type { UniRefund_LocationService_AddressCommonDatas_AddressCommonDataDto as AddressCommonDataDto } from "@ayasofyazilim/saas/LocationService";
+import { notFound } from "next/navigation";
 import { getResourceData } from "src/language-data/ContractService";
+import { getRefundTableHeadersApi } from "src/app/[lang]/app/actions/ContractService/action";
 import { ContractHeader } from "./contract-header";
 
 export default async function ContractPage({
@@ -17,13 +19,16 @@ export default async function ContractPage({
   addressList: AddressCommonDataDto[];
 }) {
   const { languageData } = await getResourceData(lang);
+  const refundTableHeaders = await getRefundTableHeadersApi({});
+  if (refundTableHeaders.type !== "success") return notFound();
   return (
     <ContractHeader
       addressList={addressList}
       contractHeaderDetails={contractHeaderDetails}
       languageData={languageData}
       partyId={partyId}
       partyName={partyName}
+      refundTableHeaders={refundTableHeaders.data.items || []}
     />
   );
 }