PayGov Changes and missing commits

egovernments · Jul 1, 2024 · 498b79b · 498b79b
1 parent eeec5a6
commit 498b79b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart b/frontend/mgramseva/lib/screeens/add_expense/expense_details.dart
@@ -579,7 +579,7 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
                                                 onChanged: expensesDetailsProvider
                                                             .expenditureDetails
                                                             .allowEdit ==
-                                                        true
+                                                        true && expensesDetailsProvider.expenditureDetails.isBillPaid == false
                                                     ? expensesDetailsProvider
                                                         .onChangeOfCheckBox
                                                     : null),
@@ -594,7 +594,7 @@ class _ExpenseDetailsState extends State<ExpenseDetails> {
                                                   color: expensesDetailsProvider
                                                               .expenditureDetails
                                                               .allowEdit ==
-                                                          true
+                                                          true && expensesDetailsProvider.expenditureDetails.isBillPaid == false
                                                       ? Colors.black
                                                       : Colors.grey,
                                                   fontWeight:

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss b/frontend/micro-ui/web/micro-ui-internals/packages/css/src/components/textfields.scss
@@ -11,10 +11,10 @@
 }
 
 .employee-card-input-only {
-  @apply mb-lg pl-sm outline-none block border w-full h-12 border-input-border border-solid bg-white leading-10 text-form-field text-text-primary;
 }
 .employee-card-input-only .employee-card-input  {
   border: none;
+  @apply mb-lg pl-sm outline-none block border w-full h-12 border-input-border border-solid bg-white leading-10 text-form-field text-text-primary;
 }
 
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/index.js
@@ -42,10 +42,7 @@ const EmployeeApp = ({ path, url, userType }) => {
             </Link>{" "}
             / <span>{location.pathname ===  `/${window?.contextPath}/employee/hrms/inbox` ? t("HR_COMMON_HEADER") : t("HR_COMMON_HEADER")}</span>
           </p>
-          <button className="clear-search" style={{ marginLeft: "15px",
-            marginBottom: "5px",
-            padding: "8px",
-            borderRadius: "5px" }}  onClick={() => history.goBack()}>{t("HR_COMMON_BACK_ROUTE")}</button>
+          <div class="back-btn2 " onClick={() => history.goBack()}><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black" width="19px"><path d="M24 0v24H0V0h24z" fill="none" opacity=".87"></path><path d="M14 7l-5 5 5 5V7z"></path></svg><p>Back</p></div> 
 
           <PrivateRoute
             path={`${path}/inbox`}