Feature-checklist #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

amnuoo wants to merge 32 commits into ury-erp:develop from amnuoo:feature

ury/hooks.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,7 +18,8 @@
  
        "/assets/ury/js/quick_entry.js",

        "/assets/ury/js/pos_print.js",

        "/assets/ury/js/restrict_qty_edit_pos.js",

        "/assets/ury/js/ury_pos_kot.js"

        "/assets/ury/js/ury_pos_kot.js",

        "/assets/ury/js/quality_review.js"

    ]

    # include js, css files in header of web template

    @@ -35,12 +36,12 @@
  
    # include js in page

    page_js = {"point-of-sale": ["public/js/pos_extend.js"]}

    # include js in doctype views

    # doctype_js = {"POS Invoive" : "public/js/pos_print.js"}

    # doctype_list_js = {"doctype" : "public/js/doctype_list.js"}

    # doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}

    # doctype_calendar_js = {"doctype" : "public/js/doctype_calendar.js"}

    # Splash Image in Website Settings

    website_context = {"splash_image": "/assets/ury/Images/ury-logo.jpg"}

    @@ -121,30 +122,45 @@
  
        "POS Invoice": {

            "before_insert": "ury.ury.hooks.ury_pos_invoice.before_insert",

            "validate": "ury.ury.hooks.ury_pos_invoice.validate",

            "after_insert":"ury.ury.api.ury_kot_order_number.set_order_number",

            "after_insert": "ury.ury.api.ury_kot_order_number.set_order_number",

            "before_submit": "ury.ury.hooks.ury_pos_invoice.before_submit",

            "on_cancel": "ury.ury.hooks.ury_pos_invoice.on_trash",

            "on_trash": "ury.ury.hooks.ury_pos_invoice.on_trash",

        },

        "POS Profile": {"validate": "ury.ury.hooks.ury_pos_profile.validate"},

        "POS Profile": {

            "validate": "ury.ury.hooks.ury_pos_profile.validate"

        },

        "Sales Invoice": {

            "before_insert": "ury.ury.hooks.ury_sales_invoice.before_insert",

            "on_update":"ury.ury.hooks.ury_sales_invoice.on_update",

            },

        "Customer": {"before_save": "ury.ury.hooks.ury_customer.before_insert"},

        "Item": {"validate": "ury.ury.hooks.ury_item.validate"},

            "on_update": "ury.ury.hooks.ury_sales_invoice.on_update",

        },

        "Customer": {

            "before_save": "ury.ury.hooks.ury_customer.before_insert"

        },

        "Item": {

            "validate": "ury.ury.hooks.ury_item.validate"

        },

        "POS Opening Entry": {

            "validate":"ury.ury.hooks.ury_pos_opening_entry.set_cashier_room",

            "validate": "ury.ury.hooks.ury_pos_opening_entry.validate",

            "before_save": "ury.ury.hooks.ury_pos_opening_entry.before_save",

            "before_insert":"ury.ury.api.ury_kot_order_number.set_last_invoice_in_pos_open",

            },

            "before_insert": "ury.ury.api.ury_kot_order_number.set_last_invoice_in_pos_open",

        },

        "POS Closing Entry": {

            "before_save": "ury.ury.hooks.ury_pos_closing_entry.before_save",

            "validate":"ury.ury.hooks.ury_pos_closing_entry.validate"

            },

            "validate": "ury.ury.hooks.ury_pos_closing_entry.validate",

            "before_submit": "ury.ury.hooks.ury_pos_closing_entry.validate_pos_closing_quality_review",

        },

        "URY Menu Course": {

    		"validate": "ury.ury.api.ury_menu_course_validation.validate_priority",

    	}    

            "validate": "ury.ury.api.ury_menu_course_validation.validate_priority",

        }

    }

    # Scheduled Tasks

    @@ -373,4 +389,4 @@
  
        },

        {"dt": "Role", "filters": [["role_name", "like", "URY %"]]},

        "Client Script",

    ]

    ]

ury/public/js/quality_review.js

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    frappe.ui.form.on("Quality Review", {
+        setup(frm) {
+            frm.set_query("goal", function () {
+                return {
+                    query: "ury.ury.api.quality_goal.quality_goal_for_current_user"
+                };
+            });
+        }
+    });

ury/ury/api/pos_checklist.py

-Original file line number
+Diff line change
@@ -0,0 +1,76 @@
+    import frappe
+    from frappe.utils import flt, get_datetime, today
+    from ury.ury_pos.api import getBranch
+    @frappe.whitelist()
+    def checklist(**kwargs):
+        today_date = today()
+        employee = frappe.session.user
+        branchName = getBranch()
+        pos_opening_list = frappe.get_all(
+            "POS Opening Entry",
+            filters={
+                "branch": branchName,
+                "docstatus": 1,
+                "status": "Open"
+            },
+            fields=["posting_date"]
+        )
+        if pos_opening_list:
+            pos_open = 1
+            pos_posting_date = pos_opening_list[0].posting_date
+        else:
+            pos_open = 0
+            pos_posting_date = today_date
+        user_roles = frappe.get_roles(employee)
+        pos_profile_name = frappe.get_value(
+            "POS Profile",
+            {"branch": branchName},
+            "name"
+        )
+        if not pos_profile_name:
+             return {
+                "pos_open": pos_open,
+                "checklist": 1
+            }
+        pos_profile = frappe.get_doc("POS Profile", pos_profile_name)
+        daily_quality_checklist = pos_profile.custom_daily_quality_checking
+        if not daily_quality_checklist:
+            return {
+                "pos_open": pos_open,
+                "checklist": 1
+            }
+        to_submit_checklists = []
+        for checklist in daily_quality_checklist:
+            for user_role in user_roles:
+                if checklist.role == user_role:
+                    to_submit_checklists.append(checklist)
+        if not to_submit_checklists:
+            return {
+                "pos_open": pos_open,
+                "checklist": 1
+            }
+        is_checklist_submitted = frappe.db.exists({
+            "doctype": "Quality Review",
+            "date": pos_posting_date,
+            "status": ["in", ["Open", "Passed"]],
+            "owner": employee
+        })
+        return {
+            "pos_open": pos_open,
+            "checklist": 1 if is_checklist_submitted else 0,
+            "checklist_name": [check.checklist for check in to_submit_checklists],
+            "pos_posting_date": pos_posting_date
+        }

ury/ury/api/quality_goal.py

-Original file line number
+Diff line change
@@ -0,0 +1,32 @@
+    import frappe
+    @frappe.whitelist()
+    def quality_goal_for_current_user(
+        doctype, txt, searchfield, start, page_len, filters
+    ):
+        user = frappe.session.user
+        if user == "Administrator":
+            return frappe.db.sql("""
+                SELECT name
+                FROM `tabQuality Goal`
+                WHERE name LIKE %s
+                ORDER BY modified DESC
+                LIMIT %s, %s
+            """, (f"%{txt}%", start, page_len))
+        roles = frappe.get_roles(user)
+        if not roles:
+            return []
+        placeholders = ", ".join(["%s"] * len(roles))
+        return frappe.db.sql(f"""
+            SELECT name
+            FROM `tabQuality Goal`
+            WHERE
+                name LIKE %s
+                AND custom_assigned_role IN ({placeholders})
+            ORDER BY modified DESC
+            LIMIT %s, %s
+        """, tuple([f"%{txt}%"] + roles + [start, page_len]))

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature-checklist #74

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Feature-checklist #74

Are you sure you want to change the base?

Uh oh!

Feature-checklist #74

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!