diff --git a/app/Controllers/Admin/OrderController.php b/app/Controllers/Admin/OrderController.php index a32b0b6..8c5572d 100644 --- a/app/Controllers/Admin/OrderController.php +++ b/app/Controllers/Admin/OrderController.php @@ -44,7 +44,7 @@ class OrderController extends AdminController } final public function getFieldBatchFilters(): array { - return ["status"]; + return []; } //가격이나,할인가,수량 변경했을경우 다시 계산해서 Price에 넣기위해 diff --git a/app/Language/ko/Order.php b/app/Language/ko/Order.php index babaab6..6326c2e 100644 --- a/app/Language/ko/Order.php +++ b/app/Language/ko/Order.php @@ -23,7 +23,6 @@ return [ "STATUS" => [ "use" => "장바구니", "unuse" => "사용해지", - "cancel" => "주문취소", "rental" => "월이용권", "onetime" => "일회성" ], diff --git a/app/Views/admin/order/index.php b/app/Views/admin/order/index.php index 1de04a0..50b7e1f 100644 --- a/app/Views/admin/order/index.php +++ b/app/Views/admin/order/index.php @@ -22,25 +22,24 @@ status != DEFAULTS['STATUS'] ? 'class="table-danger" rowcolor="red"' : 'rowcolor="red"' ?> onClick="indexRowCheckBoxToggle(this)"> - "checkbox_uid_{$entity->getPrimaryKey()}", "name" => "batchjob_uids[]", "value" => $entity->getPrimaryKey(), "class" => "batchjobuids_checkboxs"]); ?> - getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> + status == DEFAULTS['STATUS']) : ?> + getPrimaryKey(), $viewDatas['total_count'] - (($viewDatas['page'] - 1) * $viewDatas['per_page'] + $cnt), ["target" => "_self"]) ?> + - getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> + + status == DEFAULTS['STATUS']) : ?> + getPrimaryKey(), ICONS['DELETE'], ["class" => "btn btn-sm btn-danger btn-circle", "target" => "_self"]) ?> + +
-