From bfa104a634455104e9ff1e58fc38df16ee2ccd0e Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Mon, 12 Aug 2024 21:02:35 +0800
Subject: [PATCH] update bill query field

---
 compose.yaml                        | 3 ++-
 nginx.conf                          | 2 +-
 src/components/bill/search-form.tsx | 9 +++++----
 src/pages/bill/query.tsx            | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 44bc1b9..0e33cae 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -17,11 +17,12 @@ services:
     container_name: hkchc-payment-frontend
     environment:
       APP_API_URL: "10.10.0.152:50000" # payment backend service
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
     working_dir: /etc/nginx/conf.d/
     ports:
       - "50001:80"
     command: [
-      "sed -i \"s~<!--app_url-->~<script>const APP_SITE_URL='${APP_SITE_URL}';</script>~\" /app/index.html && envsubst '$APP_API_URL' < default.conf.template > default.conf && cat default.conf",
       "nginx -g daemon off;"
     ]
     <<: *common
\ No newline at end of file
diff --git a/nginx.conf b/nginx.conf
index 7ef663b..801d907 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -26,7 +26,7 @@ server {
     }
 
     location ^~/api {
-        proxy_pass http://payment_backend;
+        proxy_pass https://test-payment-be.hkchc.team;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/src/components/bill/search-form.tsx b/src/components/bill/search-form.tsx
index 3969ae3..9d3224e 100644
--- a/src/components/bill/search-form.tsx
+++ b/src/components/bill/search-form.tsx
@@ -138,11 +138,11 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
                             <Form.Select.Option value="student_number asc">{t('base.student_number')} {t('bill.sort_asc')}</Form.Select.Option>
                             <Form.Select.Option value="application_number desc">{t('base.bill_number')} {t('bill.sort_desc')}</Form.Select.Option>
                             <Form.Select.Option value="application_number asc">{t('base.bill_number')} {t('bill.sort_asc')}</Form.Select.Option>
-                            <Form.Select.Option value="paid_at desc">{t('bill.title_paid_at')} {t('bill.sort_desc')}</Form.Select.Option>
-                            <Form.Select.Option value="paid_at asc">{t('bill.title_paid_at')} {t('bill.sort_asc')}</Form.Select.Option>
+                            <Form.Select.Option value="initiated_paid_at desc">{t('bill.title_initiated_paid_at')} {t('bill.sort_desc')}</Form.Select.Option>
+                            <Form.Select.Option value="initiated_paid_at asc">{t('bill.title_initiated_paid_at')} {t('bill.sort_asc')}</Form.Select.Option>
 
-                            <Form.Select.Option value="create_at desc">{t('bill.title_create_at')} {t('bill.sort_desc')}</Form.Select.Option>
-                            <Form.Select.Option value="create_at asc">{t('bill.title_create_at')} {t('bill.sort_asc')}</Form.Select.Option>
+                            <Form.Select.Option value="delivered_at desc">{t('bill.title_delivered_at')} {t('bill.sort_desc')}</Form.Select.Option>
+                            <Form.Select.Option value="delivered_at asc">{t('bill.title_delivered_at')} {t('bill.sort_asc')}</Form.Select.Option>
                         </Form.Select>
                     </Col>
                     <Col xxl={4} xl={6} md={8}>
@@ -155,6 +155,7 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
                     </Col>
                     <Col xxl={4} xl={6} md={8}>
                         <Form.Select
+                            showClear
                             field="confirm_bill_type" style={{width: '100%'}}
                             label={t('manual.bill_type')}
                             placeholder={t('manual.bill_type')}
diff --git a/src/pages/bill/query.tsx b/src/pages/bill/query.tsx
index f9217ae..1b53b33 100644
--- a/src/pages/bill/query.tsx
+++ b/src/pages/bill/query.tsx
@@ -14,6 +14,7 @@ import {BillTypeConfirmModal} from "@/pages/bill/components/bill_type_confirm.ts
 import {saveAs} from "file-saver";
 // import {AddBillModal} from "@/pages/bill/components/add_bill_modal.tsx";
 import {BillTypeConfirmBatch} from "@/pages/bill/components/bill_type_confirm_batch.tsx";
+import {AddBillModal} from "@/pages/bill/components/add_bill_modal.tsx";
 
 
 const DownloadButton = ({bill, text}: { bill: BillModel; text: string }) => {
@@ -125,7 +126,7 @@ const BillQuery = () => {
 			operationRender={operation} operationRenderWidth={180}
 			beforeTotalAmount={<Space>
 				<BillTypeConfirmBatch data={data} selectKeys={selectKeys} onConfirm={refresh}/>
-				{/*<AddBillModal onConfirm={refresh}/>*/}
+				<AddBillModal onConfirm={refresh}/>
 				<ButtonGroup style={{marginRight: 20}} theme={'solid'}>
 					<Button onClick={onImportExcel}>{t('bill.import_excel')}</Button>
 					<Button loading={state.exporting} onClick={onExportExcel}>{t('bill.export_excel')}</Button>