From f9c9772f241ac9fd710abe6733292ce5d7d32b14 Mon Sep 17 00:00:00 2001 From: Yujith Isura Date: Mon, 23 Mar 2020 17:23:34 +0530 Subject: [PATCH 1/2] add local time zone --- client/Dockerfile | 2 ++ server/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/client/Dockerfile b/client/Dockerfile index 4524121d..8a8d8a27 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -11,6 +11,8 @@ ENV REACT_APP_PDF_GENARATION_SERVICE_URL=https://apim-gateway.ecdev.opensource.l ENV REACT_APP_AUTH_BASE_URL=https://nominations.ecdev.opensource.lk ENV REACT_APP_NOMINATION_URL=https://nominations.ecdev.opensource.lk RUN npm run build +RUN rm /etc/localtime +RUN ln -s /usr/share/zoneinfo/Asia/Colombo /etc/localtime FROM nginx:1.15 diff --git a/server/Dockerfile b/server/Dockerfile index 8fda0044..8fa7712a 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -45,6 +45,8 @@ COPY --from=build /home/builder/Nomination/build/ /home/lsf/Nomination/build/ COPY --from=build /home/builder/Nomination/src/config/development.json /home/lsf/Nomination/prod.json RUN chown lsf:lsf /home/lsf/Nomination/build/uploads RUN chown lsf:lsf /home/lsf/Nomination/build/partySymbols +RUN rm /etc/localtime +RUN ln -s /usr/share/zoneinfo/Asia/Colombo /etc/localtime ENV APP_ID 'nomination-api' From 96d75add9da14763451eb85837a8c2448e330ad8 Mon Sep 17 00:00:00 2001 From: Yujith Isura Date: Mon, 23 Mar 2020 17:24:13 +0530 Subject: [PATCH 2/2] bug fixed in payment update --- client/src/components/NominationPaymentUpdate/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/NominationPaymentUpdate/index.js b/client/src/components/NominationPaymentUpdate/index.js index e41653a7..6420c5b9 100644 --- a/client/src/components/NominationPaymentUpdate/index.js +++ b/client/src/components/NominationPaymentUpdate/index.js @@ -298,7 +298,7 @@ class NominationPayments extends React.Component { if(party_type === 'RPP'){ party_type='candidate payment rpp'; this.setState({partyType:'candidate payment rpp'}); - }else if (party_type === 'IG') { + }else if (party_type === 'IND') { party_type='candidate payment ig'; this.setState({partyType:'candidate payment ig'}); }