Merge pull request #27 from kainotomo/bug/user-permissions

Author: phalouvas

invoice2erpnext/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
 

invoice2erpnext/invoice2erpnext/doctype/invoice2erpnext_log/invoice2erpnext_log.json

@@ -97,7 +97,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-04-01 09:13:06.986016",
+ "modified": "2025-04-07 09:35:29.661482",
  "modified_by": "Administrator",
  "module": "Invoice2Erpnext",
  "name": "Invoice2Erpnext Log",
@@ -114,6 +114,29 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
+   "write": 1
   }
  ],
  "sort_field": "modified",

invoice2erpnext/invoice2erpnext/doctype/invoice2erpnext_settings/invoice2erpnext_settings.js

@@ -28,5 +28,48 @@ frappe.ui.form.on('Invoice2Erpnext Settings', {
             });
         });
 
+        // Populate the available_credits HTML field
+        frappe.call({
+            method: "invoice2erpnext.invoice2erpnext.doctype.invoice2erpnext_settings.invoice2erpnext_settings.get_available_credits",
+            callback: function(r) {
+                if (r.message && r.message.value !== undefined) {
+                    // Get credits value
+                    let credits = r.message.value;
+                    
+                    // Format manually without using frappe.format for currency
+                    let currencySymbol = frappe.boot.sysdefaults.currency_symbol || '€';
+                    let formattedValue = parseFloat(credits).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+                    let formattedCredits = currencySymbol + ' ' + formattedValue;
+                    
+                    // Create a clean, simple HTML structure
+                    let html = `
+                        <div style="padding: 15px 0;">
+                            <div style="font-size: 24px; font-weight: 600; color: #2490EF; text-align: left;">${formattedCredits}</div>
+                            <div style="margin-top: 15px;">
+                                <a href="https://kainotomo.com/invoice2erpnext/shop" target="_blank" 
+                                   class="btn btn-primary btn-sm">Buy Credits</a>
+                            </div>
+                        </div>
+                    `;
+                    
+                    // Set the HTML in the available_credits field
+                    $(frm.fields_dict.available_credits.wrapper).html(html);
+                } else {
+                    // Handle error or zero credits case
+                    let currencySymbol = frappe.boot.sysdefaults.currency_symbol || '€';
+                    let formattedCredits = currencySymbol + ' 0.00';
+                    
+                    $(frm.fields_dict.available_credits.wrapper).html(`
+                        <div style="padding: 15px 0;">
+                            <div style="font-size: 24px; font-weight: 600; color: #8D99A6; text-align: left;">${formattedCredits}</div>
+                            <div style="margin-top: 15px;">
+                                <a href="https://kainotomo.com/invoice2erpnext/shop" target="_blank" 
+                                   class="btn btn-primary btn-sm">Buy Credits</a>
+                            </div>
+                        </div>
+                    `);
+                }
+            }
+        });
     },
 });

invoice2erpnext/invoice2erpnext/doctype/invoice2erpnext_settings/invoice2erpnext_settings.json

@@ -5,6 +5,10 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
+  "credits_section",
+  "column_break_ttnt",
+  "available_credits",
+  "column_break_hyuy",
   "api_credentials_section",
   "api_key",
   "enabled",
@@ -99,12 +103,30 @@
    "fieldname": "defaults_section_section",
    "fieldtype": "Section Break",
    "label": "Defaults"
+  },
+  {
+   "fieldname": "credits_section",
+   "fieldtype": "Section Break",
+   "label": "Credits"
+  },
+  {
+   "fieldname": "available_credits",
+   "fieldtype": "HTML",
+   "label": "Available Credits"
+  },
+  {
+   "fieldname": "column_break_ttnt",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_hyuy",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-04-05 16:43:36.071064",
+ "modified": "2025-04-07 10:25:54.056689",
  "modified_by": "Administrator",
  "module": "Invoice2Erpnext",
  "name": "Invoice2Erpnext Settings",
@@ -119,6 +141,21 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Accounts User",
+   "share": 1
   }
  ],
  "sort_field": "modified",

invoice2erpnext/invoice2erpnext/doctype/invoice2erpnext_settings/invoice2erpnext_settings.py

@@ -97,4 +97,53 @@ def test_connection(self):
 
         self.save()
 
-        return result
+        return result
+
+
+# Add a global function that doesn't require document permissions
+@frappe.whitelist(allow_guest=False)
+def get_available_credits():
+    """Get available credits - accessible to all authenticated users"""
+    try:
+        # Check if settings exists - don't need document permissions for this check
+        if not frappe.db.exists("Invoice2Erpnext Settings", "Invoice2Erpnext Settings"):
+            return {
+                "value": 0,
+                "fieldtype": "Currency",
+            }
+        
+        # Create a new instance without checking permissions
+        settings = frappe.new_doc("Invoice2Erpnext Settings")
+        settings.flags.ignore_permissions = True
+        
+        # Load the document values from DB directly
+        settings_dict = frappe.db.get_singles_dict("Invoice2Erpnext Settings")
+        for key, value in settings_dict.items():
+            if key != "doctype":
+                settings.set(key, value)
+        
+        # Get credentials explicitly from DB
+        for field in ["api_key", "api_secret"]:
+            value = frappe.db.get_value("__Auth", {"doctype": "Invoice2Erpnext Settings", "fieldname": field}, "password")
+            if value:
+                settings.set(field, value)
+        
+        # Get credits using the instance method
+        result = settings.get_credits()
+        
+        # Extract credits from result if successful
+        credits = 0
+        if result.get("success") and "credits" in result:
+            credits = result["credits"]
+        
+        # Return formatted response for number card
+        return {
+            "value": credits,
+            "fieldtype": "Currency",
+        }
+    except Exception as e:
+        frappe.log_error(f"Error fetching credits for all users: {str(e)}", "Invoice2Erpnext Credits")
+        return {
+            "value": 0,
+            "fieldtype": "Currency",
+        }

invoice2erpnext/invoice2erpnext/number_card/available_credits/available_credits.json

@@ -1,6 +1,6 @@
 {
  "charts": [],
-"content": "[{\"id\":\"sxJmXGFSt6\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">Invoice2Erpnext</span>\",\"col\":12}},{\"id\":\"3sCUU4rAB6\",\"type\":\"number_card\",\"data\":{\"number_card_name\":\"Available Credits\",\"col\":4}},{\"id\":\"rAHLFl3j3O\",\"type\":\"paragraph\",\"data\":{\"text\":\"<a href=\\\"https://kainotomo.com/invoice2erpnext/shop\\\" class=\\\"btn btn-lg btn-primary\\\" target=\\\"_blank\\\">Purchase Credits</a>\",\"col\":12}},{\"id\":\"w1IJ8kd86B\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"jhv7lDXtTh\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Logs\",\"col\":3}},{\"id\":\"1AWrWcS5a1\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Settings\",\"col\":3}}]",
+ "content": "[{\"id\":\"sxJmXGFSt6\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">Invoice2Erpnext</span>\",\"col\":12}},{\"id\":\"jhv7lDXtTh\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Logs\",\"col\":3}},{\"id\":\"1AWrWcS5a1\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Settings\",\"col\":3}}]",
  "creation": "2023-09-02 07:58:22.131565",
  "custom_blocks": [],
  "docstatus": 0,
@@ -12,16 +12,11 @@
  "is_hidden": 0,
  "label": "Invoice2Erpnext",
  "links": [],
- "modified": "2025-04-04 07:23:43.673812",
+ "modified": "2025-04-07 10:32:54.850098",
  "modified_by": "Administrator",
  "module": "Invoice2Erpnext",
  "name": "Invoice2Erpnext",
- "number_cards": [
-  {
-   "label": "Available Credits",
-   "number_card_name": "Available Credits"
-  }
- ],
+ "number_cards": [],
  "owner": "Administrator",
  "parent_page": "",
  "public": 1,

invoice2erpnext/invoice2erpnext/number_card/available_credits/available_credits.py

@@ -1,14 +1,9 @@
 frappe.listview_settings['Purchase Invoice'] = {
     onload: function(listview) {
         // Check if integration is enabled before showing the upload button
-        frappe.call({
-            method: 'frappe.client.get_single_value',
-            args: {
-                doctype: 'Invoice2Erpnext Settings',
-                field: 'enabled'
-            },
-            callback: function(r) {
-                if (r.message === 1) {
+        frappe.xcall('invoice2erpnext.utils.check_settings_enabled')
+            .then(enabled => {
+                if (enabled) {
                     // Add the upload option under a dropdown menu
                     listview.page.add_menu_item(__('Upload (Auto)'), function() {
                         new frappe.ui.FileUploader({
@@ -29,8 +24,10 @@ frappe.listview_settings['Purchase Invoice'] = {
                         });
                     });
                 }
-            }
-        });
+            })
+            .catch(() => {
+                // Silently fail - don't show buttons if there's an error
+            });
     }
 };
 

invoice2erpnext/invoice2erpnext/workspace/invoice2erpnext/invoice2erpnext.json

@@ -49,4 +49,17 @@ def format_currency_value(value):
         # Default format if none of the above
         formatted_value = value_str
 
-    return formatted_value
+    return formatted_value
+
+@frappe.whitelist()
+def check_settings_enabled():
+    """Safely check if Invoice2Erpnext is enabled without permission errors"""
+    # First check if user has permission to read the settings
+    if not frappe.has_permission("Invoice2Erpnext Settings", "read"):
+        return 0
+    
+    try:
+        return frappe.db.get_single_value('Invoice2Erpnext Settings', 'enabled')
+    except:
+        # Return 0 (disabled) if any error occurs
+        return 0