Merge branch 'feat/separate-price-calc' into develop

src/stores/product-service/types.ts

@@ -160,6 +160,10 @@ export interface Product {
   calcVat: boolean;
   expenseType: string;
   vatIncluded: boolean;
+  agentPriceVatIncluded: boolean;
+  agentPriceCalcVat: boolean;
+  serviceChargeVatIncluded: boolean;
+  serviceChargeCalcVat: boolean;
   remark: string;
   updatedAt: string;
   updatedBy: UpdatedBy;
@@ -189,8 +193,12 @@ export interface ProductCreate {
   productGroupId: string;
   remark: string;
   serviceCharge: number;
+  serviceChargeCalcVat: boolean;
+  serviceChargeVatIncluded: boolean;
   calcVat?: boolean;
   agentPrice: number;
+  agentPriceCalcVat: boolean;
+  agentPriceVatIncluded: boolean;
   price: number;
   process: number;
   detail: string;

src/stores/quotations/index.ts

@@ -120,7 +120,7 @@ export const useQuotationStore = defineStore('quotation-store', () => {
   }
 
   async function editQuotation(data: QuotationPayload & { id: string }) {
-    const { _count, ...payload } = data;
+    const { _count, agentPrice, ...payload } = data;
     const res = await api.put(`/quotation/${data.id}`, {
       ...payload,
       quotationStatus:

src/stores/quotations/types.ts

@@ -143,6 +143,10 @@ export type ProductRelation = {
   serviceCharge: number;
   vatIncluded: boolean;
   calcVat: boolean;
+  agentPriceVatIncluded: boolean;
+  agentPriceCalcVat: boolean;
+  serviceChargeVatIncluded: boolean;
+  serviceChargeCalcVat: boolean;
   expenseType: string;
   status: Status;
   statusOrder: number;
@@ -367,6 +371,7 @@ export type QuotationPayload = {
   status?: Status;
   remark?: string;
   quotationStatus?: QuotationStatus;
+  agentPrice?: boolean;
 };
 
 export type EmployeeWorker = {