fix: group overview in GST sales register beta by category (#2002)

* fix: group overview in GST sales register beta by category * fix: better way to override datatable totals
resilient-tech · Apr 10, 2024 · bc06faa · bc06faa
1 parent 8814d5f
commit bc06faa
Show file tree

Hide file tree

Showing 2 changed files with 181 additions and 72 deletions.
diff --git a/india_compliance/gst_india/report/gst_sales_register_beta/gst_sales_register_beta.js b/india_compliance/gst_india/report/gst_sales_register_beta/gst_sales_register_beta.js
@@ -1,17 +1,24 @@
 // Copyright (c) 2024, Resilient Tech and contributors
 // For license information, please see license.txt
 const INVOICE_TYPE = {
-    "B2B,SEZ,DE": ["B2B Regular", "B2B Reverse Charge", "SEZWP", "SEZWOP", "Deemed Exports"],
+    "B2B, SEZ, DE": [
+        "B2B Regular",
+        "B2B Reverse Charge",
+        "SEZWP",
+        "SEZWOP",
+        "Deemed Exports",
+    ],
     "B2C (Large)": ["B2C (Large)"],
-    "Exports": ["EXPWP", "EXPWOP"],
+    Exports: ["EXPWP", "EXPWOP"],
     "B2C (Others)": ["B2C (Others)"],
-    "Nil-Rated,Exempted,Non-GST": ["Nil-Rated", "Exempted", "Non-GST"],
+    "Nil-Rated, Exempted, Non-GST": ["Nil-Rated", "Exempted", "Non-GST"],
     "Credit/Debit Notes (Registered)": ["CDNR"],
     "Credit/Debit Notes (Unregistered)": ["CDNUR"],
-}
+};
 
 frappe.query_reports["GST Sales Register Beta"] = {
     onload: set_sub_category_options,
+
     filters: [
         {
             fieldname: "company",
@@ -46,42 +53,80 @@ frappe.query_reports["GST Sales Register Beta"] = {
             fieldname: "date_range",
             label: __("Date Range"),
             fieldtype: "DateRange",
-            default: [india_compliance.last_month_start(), india_compliance.last_month_end()],
-            width: "80"
+            default: [
+                india_compliance.last_month_start(),
+                india_compliance.last_month_end(),
+            ],
+            width: "80",
         },
         {
             fieldtype: "Select",
             fieldname: "summary_by",
             label: __("Summary By"),
             options: "Overview\nSummary by HSN\nSummary by Item",
-            default: "Summary by Item"
+            default: "Summary by Item",
         },
         {
             fieldtype: "Autocomplete",
             fieldname: "invoice_category",
             label: __("Invoice Category"),
-            options: "B2B,SEZ,DE\nB2C (Large)\nExports\nB2C (Others)\nNil-Rated,Exempted,Non-GST\nCredit/Debit Notes (Registered)\nCredit/Debit Notes (Unregistered)",
+            options:
+                "B2B, SEZ, DE\nB2C (Large)\nExports\nB2C (Others)\nNil-Rated, Exempted, Non-GST\nCredit/Debit Notes (Registered)\nCredit/Debit Notes (Unregistered)",
             on_change(report) {
-                report.set_filter_value('invoice_sub_category', "");
+                report.set_filter_value("invoice_sub_category", "");
                 set_sub_category_options(report);
             },
-            depends_on: 'eval:doc.summary_by=="Summary by HSN" || doc.summary_by=="Summary by Item"'
+            depends_on:
+                'eval:doc.summary_by=="Summary by HSN" || doc.summary_by=="Summary by Item"',
         },
         {
             fieldtype: "Autocomplete",
             fieldname: "invoice_sub_category",
             label: __("Invoice Sub Category"),
-            depends_on: 'eval:doc.summary_by=="Summary by HSN" || doc.summary_by=="Summary by Item"'
+            depends_on:
+                'eval:doc.summary_by=="Summary by HSN" || doc.summary_by=="Summary by Item"',
+        },
+    ],
+
+    formatter: (value, row, column, data, default_formatter) => {
+        value = default_formatter(value, row, column, data);
+        if (data && data.indent === 0) {
+            let $value = $(`<span>${value}</span>`).css("font-weight", "bold");
+            value = $value.wrap("<p></p>").parent().html();
         }
-    ]
+
+        return value;
+    },
 };
 
 function set_sub_category_options(report) {
     const invoice_category = frappe.query_report.get_filter_value("invoice_category");
-    report.get_filter('invoice_sub_category').set_data(INVOICE_TYPE[invoice_category] || []);
+    report
+        .get_filter("invoice_sub_category")
+        .set_data(INVOICE_TYPE[invoice_category] || []);
 
     if (invoice_category && INVOICE_TYPE[invoice_category].length === 1) {
-        report.set_filter_value("invoice_sub_category", INVOICE_TYPE[invoice_category][0])
+        report.set_filter_value(
+            "invoice_sub_category",
+            INVOICE_TYPE[invoice_category][0]
+        );
     }
 }
 
+frappe_report_column_total = frappe.utils.report_column_total;
+
+// Override datatable hook for column total calculation
+frappe.utils.report_column_total = function (...args) {
+    const summary_by = frappe.query_report.get_filter_value("summary_by");
+    if (summary_by !== "Overview") return frappe_report_column_total.apply(this, args);
+
+    const column_field = args[1].column.fieldname;
+    if (column_field === "description") return;
+
+    const total = this.datamanager.data.reduce((acc, row) => {
+        if (row.indent !== 1) acc += row[column_field] || 0;
+        return acc;
+    }, 0);
+
+    return total;
+};