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/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 = (props) => {
{t('base.student_number')} {t('bill.sort_asc')}
{t('base.bill_number')} {t('bill.sort_desc')}
{t('base.bill_number')} {t('bill.sort_asc')}
- {t('bill.title_paid_at')} {t('bill.sort_desc')}
- {t('bill.title_paid_at')} {t('bill.sort_asc')}
+ {t('bill.title_initiated_paid_at')} {t('bill.sort_desc')}
+ {t('bill.title_initiated_paid_at')} {t('bill.sort_asc')}
- {t('bill.title_create_at')} {t('bill.sort_desc')}
- {t('bill.title_create_at')} {t('bill.sort_asc')}
+ {t('bill.title_delivered_at')} {t('bill.sort_desc')}
+ {t('bill.title_delivered_at')} {t('bill.sort_asc')}
@@ -155,6 +155,7 @@ const SearchForm: React.FC = (props) => {
{
@@ -125,7 +126,7 @@ const BillQuery = () => {
operationRender={operation} operationRenderWidth={180}
beforeTotalAmount={
- {/**/}
+