@openmrs/esm-billing-app 1.0.2-pre.790 → 1.0.2-pre.796

package/dist/openmrs-esm-billing-app.js.buildmanifest.json

@@ -71,9 +71,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1174852,
+      "size": 1172991,
       "sizes": {
-        "javascript": 1174810,
+        "javascript": 1172949,
         "consume-shared": 42
       },
       "names": [],
@@ -87,7 +87,7 @@
       "auxiliaryFiles": [
         "942.js.map"
       ],
-      "hash": "8082026a6dee408f",
+      "hash": "7b6c48d2956841c8",
       "childrenByOrder": {}
     },
     {
@@ -1209,10 +1209,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5472682,
+      "size": 5470821,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5450027,
+        "javascript": 5448166,
         "share-init": 336,
         "runtime": 22109
       },
@@ -1229,7 +1229,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "d65a262accf2442c",
+      "hash": "23b91a0469319368",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"},"featureFlag":"billing"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing history"},"featureFlag":"billing"},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm","featureFlag":"billing"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemModal","online":true,"offline":true}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.790"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.24.0","fhir2":">=1.2"},"pages":[{"component":"billableServicesHome","route":"billable-services"}],"extensions":[{"component":"billingDashboardLink","name":"billing-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"billing","title":"billing","slot":"billing-dashboard-slot"},"featureFlag":"billing"},{"component":"root","name":"billing-dashboard-root","slot":"billing-dashboard-slot"},{"name":"billing-patient-summary","component":"billingPatientSummary","slot":"patient-chart-billing-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"billing-summary-dashboard-link","component":"billingSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-billing-dashboard-slot","path":"Billing history"},"featureFlag":"billing"},{"name":"billable-services-app-menu-item","component":"billableServicesAppMenuItem","slot":"app-menu-item-slot","meta":{"name":"Billable Services"}},{"name":"billing-checkin-form","slot":"extra-visit-attribute-slot","component":"billingCheckInForm","featureFlag":"billing"},{"slot":"system-admin-page-card-link-slot","component":"billableServicesCardLink","name":"billable-services-admin-card-link"},{"name":"patient-banner-billing-tags","component":"visitAttributeTags","slot":"patient-banner-tags-slot","order":2},{"name":"billing-home-tiles-ext","slot":"billing-home-tiles-slot","component":"serviceMetrics"},{"name":"edit-bill-line-item-dialog","component":"editBillLineItemModal","online":true,"offline":true}],"modals":[{"name":"add-cash-point-modal","component":"addCashPointModal"},{"name":"add-payment-mode-modal","component":"addPaymentModeModal"},{"name":"delete-payment-mode-modal","component":"deletePaymentModeModal"},{"name":"edit-bill-item-modal","component":"editBillLineItemModal"},{"name":"edit-billable-service-modal","component":"editBillableServiceModal"},{"name":"require-billing-modal","component":"requirePaymentModal"}],"workspaces":[{"name":"billing-form-workspace","title":"billingForm","component":"billingFormWorkspace","type":"form"}],"featureFlags":[{"flagName":"billing","label":"Billing module","description":"This feature introduces navigation links on the patient chart and home page to allow accessing the billing module features"}],"version":"1.0.2-pre.796"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-billing-app",
-  "version": "1.0.2-pre.790",
+  "version": "1.0.2-pre.796",
   "description": "O3 frontend module for handling billing concerns in healthcare settings",
   "browser": "dist/openmrs-esm-billing-app.js",
   "main": "src/index.ts",

package/src/invoice/invoice-table.component.tsx

@@ -128,7 +128,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
   }
 
   return (
-    <>
+    <div className={styles.lineItemsWrapper}>
       <DataTable headers={tableHeaders} rows={tableRows} size={responsiveSize} useZebraStyles>
         {({ rows, headers, getRowProps, getTableProps }) => (
           <TableContainer
@@ -187,7 +187,7 @@ const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isLoadingBill }) => {
           </Layer>
         </div>
       )}
-    </>
+    </div>
   );
 };
 

package/src/invoice/invoice-table.scss

@@ -3,6 +3,13 @@
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+.lineItemsWrapper {
+  border: 1px solid colors.$gray-20;
+  border-radius: 4px;
+  background-color: colors.$white;
+  margin-bottom: layout.$spacing-05;
+}
+
 .filterEmptyState {
   align-items: center;
   background-color: white;

package/src/invoice/invoice.component.tsx

@@ -124,8 +124,10 @@ const Invoice: React.FC = () => {
         </div>
       </div>
 
-      <InvoiceTable bill={bill} isLoadingBill={isLoadingBill} />
-      <Payments bill={bill} mutate={mutate} />
+      <div className={styles.invoiceContent}>
+        <InvoiceTable bill={bill} isLoadingBill={isLoadingBill} />
+        <Payments bill={bill} mutate={mutate} />
+      </div>
 
       {bill && patient && (
         <div className={styles.printContainer}>

package/src/invoice/invoice.scss

@@ -73,6 +73,10 @@
   flex-direction: row;
 }
 
+.invoiceContent {
+  margin: layout.$spacing-05;
+}
+
 .billDetail {
   font-weight: bold;
   color: colors.$cool-gray-90;

package/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss

@@ -5,25 +5,25 @@
 .invoiceBreakdown {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  align-items: flex-end;
-  margin: layout.$spacing-02 0;
+  align-items: center;
+  margin: layout.$spacing-03 0;
 }
 
 .label {
-  @include type.type-style('heading-03');
+  @include type.type-style('body-compact-01');
   color: colors.$gray-100;
-  text-align: end;
+  text-align: left;
 }
 
 .value {
-  @extend .label;
-  font-weight: bold;
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-100;
+  text-align: left;
   margin-left: layout.$spacing-03;
-  text-align: start;
 }
 
 .extendedLabel {
-  @extend .label;
-  font-weight: bold;
+  @include type.type-style('heading-compact-01');
   color: crimson;
+  text-align: left;
 }

package/src/invoice/payments/payments.scss

@@ -15,7 +15,7 @@
 
 .paymentContainer {
   margin: layout.$layout-01 0;
-  padding: layout.$layout-01;
+  padding: layout.$layout-01 0;
   width: 70%;
 }
 
@@ -32,14 +32,15 @@
 }
 
 .paymentTotals {
-  margin: layout.$spacing-05 0;
+  margin: layout.$spacing-05 auto;
   padding: layout.$spacing-07 layout.$spacing-05;
+  max-width: 90%;
 }
 
 .processPayments {
   display: flex;
   justify-content: flex-end;
-  margin: layout.$spacing-05;
+  margin: layout.$spacing-05 0;
   padding-top: layout.$spacing-05;
   column-gap: layout.$spacing-04;
   border-top: 1px solid colors.$cool-gray-40;