From 3dec0ab56453b81b9889eb4da0d25328a3fe0080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0git=20config=20git=20config=20-?=
 =?UTF-8?q?-helpgit=20config=20--global=20user=2Ename=20=EC=B5=9C=EC=A4=80?=
 =?UTF-8?q?=ED=9D=A0?= <choi.jh@withidc.jp>
Date: Wed, 16 Aug 2023 21:00:43 +0900
Subject: [PATCH] shoppingmallv2 init...

---
 app/Controllers/Front/ProductController.php |  7 -------
 app/Database/shoppingmall.sql               |  8 +++-----
 app/Language/ko/Billing.php                 | 11 +++++++----
 app/Language/ko/Order.php                   | 12 ++++--------
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/app/Controllers/Front/ProductController.php b/app/Controllers/Front/ProductController.php
index 8818d8c..f7765eb 100644
--- a/app/Controllers/Front/ProductController.php
+++ b/app/Controllers/Front/ProductController.php
@@ -73,11 +73,4 @@ class ProductController extends FrontController
         $this->_model->where("status", DEFAULTS['STATUS']);
         parent::index_setCondition();
     }
-    //Download관련
-    public function download_process($entity)
-    {
-        //권한체크
-        $this->isRole('download', $entity);
-        return parent::download_process($entity);
-    }
 }
diff --git a/app/Database/shoppingmall.sql b/app/Database/shoppingmall.sql
index 3369290..7321d4c 100644
--- a/app/Database/shoppingmall.sql
+++ b/app/Database/shoppingmall.sql
@@ -146,7 +146,7 @@ CREATE TABLE shoppingmall.tw_order (
     price int(10) UNSIGNED NOT NULL COMMENT '결제액',
     quantity varchar(255) NOT NULL COMMENT '수량',
     paymentday int(2) UNSIGNED NULL COMMENT '결제일',
-    status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 결제하기, unuse: 주문취소, deposit:무통장입금, paid:결제완료 등등',
+    status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 장바구니, unuse: 사용해지, rental:월이용권, onetime:판매,일회성',
     updated_at timestamp NULL DEFAULT NULL,
     created_at timestamp NOT NULL DEFAULT current_timestamp(),
     deleted_at timestamp NULL DEFAULT NULL,
@@ -158,15 +158,13 @@ CREATE TABLE shoppingmall.tw_order (
 DROP TABLE IF EXISTS shoppingmall.tw_billing;
 CREATE TABLE shoppingmall.tw_billing (
     uid int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-    order_uid varchar(36) NOT NULL COMMENT '주문 정보',
     user_uid varchar(36) NOT NULL COMMENT '사용자 정보',
-    email varchar(50) NOT NULL,
-    phone varchar(20) NULL COMMENT '연락처',
     title varchar(255) NOT NULL COMMENT '청구서제목',
+    price int(10) UNSIGNED NOT NULL COMMENT '청구금액',
     content text NOT NULL COMMENT '정구서내용',
     upload_file varchar(255) NULL COMMENT '파일명',
     response text NULL COMMENT '결제처리결과',
-    status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 사용, unuse: 사용않함 등등',
+    status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 미납, unuse: 납부완료 등등',
     updated_at timestamp NULL DEFAULT NULL,
     created_at timestamp NOT NULL DEFAULT current_timestamp(),
     deleted_at timestamp NULL DEFAULT NULL,
diff --git a/app/Language/ko/Billing.php b/app/Language/ko/Billing.php
index 9594e23..81fe474 100644
--- a/app/Language/ko/Billing.php
+++ b/app/Language/ko/Billing.php
@@ -5,9 +5,8 @@ return [
     'uid' => "청구서번호",
     'order_uid' => "주문정보",
     'user_uid' => "사용자정보",
-    'email' => '이메일',
-    'phone' => '연락처',
     'title' => "청구서명",
+    'price' => "청구금액",
     'upload_file' => "청구서파일",
     'response' => "결제처리결과",
     'status' => "상태",
@@ -15,7 +14,11 @@ return [
     'created_at' => "작성일"
   ],
   "STATUS" => [
-    "use" => "사용",
-    "unuse" => "사용않함",
+    "use" => "미납",
+    "unuse" => "납부완료",
   ],
+  "PAYMENT" => [
+    'CARD' => " 카 드 결 제",
+    'DEPOSIT' => " 무통장입금",
+  ]
 ];
diff --git a/app/Language/ko/Order.php b/app/Language/ko/Order.php
index 849096d..babaab6 100644
--- a/app/Language/ko/Order.php
+++ b/app/Language/ko/Order.php
@@ -22,13 +22,9 @@ return [
   ],
   "STATUS" => [
     "use" => "장바구니",
-    "unuse" => "주문취소",
-    "Deposit" => "무통장입금",
-    "Card" => "카드결제",
-    "paid" => "결제완료"
+    "unuse" => "사용해지",
+    "cancel" => "주문취소",
+    "rental" => "월이용권",
+    "onetime" => "일회성"
   ],
-  "PAYMENT" => [
-    'CARD' => " 카 드 결 제",
-    'DEPOSIT' => " 무통장입금",
-  ]
 ];