From 555ad29ecfabb3a011d9796f3d843505f6414252 Mon Sep 17 00:00:00 2001
From: rai <96561881+r4ai@users.noreply.github.com>
Date: Wed, 20 Nov 2024 21:54:31 +0900
Subject: [PATCH] chore: resolve confolicts

---
 app/crud/crud_details.ts                                      | 2 --
 app/routes/kitchen.tsx                                        | 3 ---
 app/routes/order_table.tsx                                    | 1 -
 app/routes/reception.tsx                                      | 4 ----
 .../20241119063028_add_memo_in_order_details/migration.sql    | 2 --
 prisma/schema.prisma                                          | 1 -
 6 files changed, 13 deletions(-)
 delete mode 100644 prisma/migrations/20241119063028_add_memo_in_order_details/migration.sql

diff --git a/app/crud/crud_details.ts b/app/crud/crud_details.ts
index 91e6991..ea8ef7d 100644
--- a/app/crud/crud_details.ts
+++ b/app/crud/crud_details.ts
@@ -8,14 +8,12 @@ export async function createOrderDetail(data: {
   order_id: number
   product_id: number
   quantity: number
-  memo?: string
 }) {
   return await prisma.order_details.create({
     data: {
       order_id: data.order_id,
       product_id: data.product_id,
       quantity: data.quantity,
-      memo: data.memo || "",
     },
   })
 }
diff --git a/app/routes/kitchen.tsx b/app/routes/kitchen.tsx
index 5707613..435b460 100644
--- a/app/routes/kitchen.tsx
+++ b/app/routes/kitchen.tsx
@@ -69,10 +69,7 @@ export default function Kitchen() {
             return {
               productName: product?.product_name || "",
               quantity: detail.quantity,
-<<<<<<< HEAD
               deleted: product?.deleted_at != null,
-=======
->>>>>>> main
             }
           })
 
diff --git a/app/routes/order_table.tsx b/app/routes/order_table.tsx
index 8f13127..cb1a458 100644
--- a/app/routes/order_table.tsx
+++ b/app/routes/order_table.tsx
@@ -82,7 +82,6 @@ export default function OrderTable() {
                   minute: "2-digit",
                 },
               )
-              console.log({ productIds, filteredProducts })
 
               return (
                 <Tr key={order.order_id}>
diff --git a/app/routes/reception.tsx b/app/routes/reception.tsx
index 426d7aa..7bb9930 100644
--- a/app/routes/reception.tsx
+++ b/app/routes/reception.tsx
@@ -40,7 +40,6 @@ type TypeOrderDetail = {
   product_id: number
   quantity: number
   price: number
-  memo?: string
 }
 
 type ActionData = {
@@ -281,7 +280,6 @@ export const action: ActionFunction = async ({
 
   const product_ids = formData.getAll("product_id").map(Number)
   const quantities = formData.getAll("quantity").map(Number)
-  const memos = formData.getAll("memo") as string[]
   const table_number = Number(formData.get("table_number"))
   const order_memo = formData.get("order_memo") as string
 
@@ -298,14 +296,12 @@ export const action: ActionFunction = async ({
 
     product_ids.map(async (product_id, index) => {
       const quantity = quantities[index]
-      const memo = memos[index]
       const product = products.find((p) => p.product_id === product_id)
 
       await createOrderDetail({
         order_id: order.order_id,
         product_id: product_id,
         quantity: quantity,
-        memo: memo || "",
       })
 
       await updateStock({
diff --git a/prisma/migrations/20241119063028_add_memo_in_order_details/migration.sql b/prisma/migrations/20241119063028_add_memo_in_order_details/migration.sql
deleted file mode 100644
index 4602f7c..0000000
--- a/prisma/migrations/20241119063028_add_memo_in_order_details/migration.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Order_details" ADD COLUMN "memo" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 9767a67..b59bd88 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,7 +27,6 @@ model Order_details {
   order_id        Int
   product_id      Int
   quantity        Int
-  memo            String?
   orders          Orders   @relation(fields: [order_id], references: [order_id])
   products        Products @relation(fields: [product_id], references: [product_id])
 }