Feature/mobile UI ux

cleanup_rename.py

@@ -0,0 +1,32 @@
+
+import os
+
+target_dir = os.path.abspath("shop")
+
+replacements = {
+    "webshop_settings": "shop_settings",
+    "Webshop": "Shop",
+    "webshop_cart": "shop_cart",
+    "webshop-web.bundle": "shop-web.bundle"
+}
+
+print(f"Scanning {target_dir}...")
+
+for root, dirs, files in os.walk(target_dir):
+    for f_name in files:
+        if f_name.endswith(('.py', '.js', '.json', '.html', '.css', '.scss', '.md', '.txt')):
+            f_path = os.path.join(root, f_name)
+            try:
+                with open(f_path, 'r', encoding='utf-8') as f:
+                    content = f.read()
+
+                new_content = content
+                for old, new in replacements.items():
+                    new_content = new_content.replace(old, new)
+
+                if new_content != content:
+                    print(f"Modifying content in {f_name}")
+                    with open(f_path, 'w', encoding='utf-8') as f:
+                        f.write(new_content)
+            except Exception as e:
+                print(f"Skipping {f_path}: {e}")

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "webshop"
+name = "shop"
 authors = [
     { name = "Frappe Technologies Pvt. Ltd.", email = "contact@frappe.io"}
 ]

rename_app.py

@@ -0,0 +1,62 @@
+
+import os
+
+target_dir = os.path.abspath("shop")
+
+# Content Replacements
+replacements = {
+    "webshop.webshop": "shop.shop",
+    # 'app_name = "webshop"': 'app_name = "shop"', # Handled
+    "from webshop": "from shop",
+    "import webshop": "import shop",
+    '"module": "Webshop"': '"module": "Shop"',
+    "webshop.patches": "shop.patches",
+    "webshop-web.bundle.css": "shop-web.bundle.css",
+    "webshop-web.bundle.scss": "shop-web.bundle.scss",
+    "webshop_cart.scss": "shop_cart.scss",
+    # Javascript namespace
+    "frappe.provide(\"webshop.webshop": "frappe.provide(\"shop.shop",
+    "webshop.webshop.shopping_cart": "shop.shop.shopping_cart",
+    "webshop.webshop.": "shop.shop."
+}
+
+print(f"Scanning {target_dir}...")
+
+# 1. Replace Content
+for root, dirs, files in os.walk(target_dir):
+    for f_name in files:
+        if f_name.endswith(('.py', '.js', '.json', '.html', '.css', '.scss', '.md', '.txt')):
+            f_path = os.path.join(root, f_name)
+            try:
+                with open(f_path, 'r', encoding='utf-8') as f:
+                    content = f.read()
+
+                new_content = content
+                for old, new in replacements.items():
+                    new_content = new_content.replace(old, new)
+
+                if new_content != content:
+                    print(f"Modifying content in {f_name}")
+                    with open(f_path, 'w', encoding='utf-8') as f:
+                        f.write(new_content)
+            except Exception as e:
+                print(f"Skipping {f_path}: {e}")
+
+# 2. Rename Files and Directories
+# Process bottom-up to handle children before parents
+for root, dirs, files in os.walk(target_dir, topdown=False):
+    for f_name in files:
+        if "webshop" in f_name:
+            new_name = f_name.replace("webshop", "shop")
+            old_path = os.path.join(root, f_name)
+            new_path = os.path.join(root, new_name)
+            print(f"Renaming file {old_path} -> {new_path}")
+            os.rename(old_path, new_path)
+
+    for d_name in dirs:
+        if "webshop" in d_name:
+            new_name = d_name.replace("webshop", "shop")
+            old_path = os.path.join(root, d_name)
+            new_path = os.path.join(root, new_name)
+            print(f"Renaming directory {old_path} -> {new_path}")
+            os.rename(old_path, new_path)

shop/hooks.py

@@ -0,0 +1,78 @@
+from . import __version__ as _version
+
+app_name = "shop"
+app_title = "Shop"
+app_publisher = "Frappe Technologies Pvt. Ltd."
+app_description = "Open Source eCommerce Platform"
+app_email = "contact@frappe.io"
+app_license = "GNU General Public License (v3)"
+app_version = _version
+
+required_apps = ["payments", "erpnext"]
+
+web_include_css = "shop-web.bundle.css"
+
+web_include_js = "web.bundle.js"
+
+after_install = "shop.setup.install.after_install"
+on_logout = "shop.shop.shopping_cart.utils.clear_cart_count"
+on_session_creation = [
+    "shop.shop.utils.portal.update_debtors_account",
+    "shop.shop.shopping_cart.utils.set_cart_count",
+]
+update_website_context = [
+    "shop.shop.shopping_cart.utils.update_website_context",
+]
+
+website_generators = ["Website Item", "Item Group"]
+
+override_doctype_class = {
+    "Payment Request": "shop.shop.doctype.override_doctype.payment_request.PaymentRequest",
+    "Item Group": "shop.shop.doctype.override_doctype.item_group.ShopItemGroup",
+    "Item": "shop.shop.doctype.override_doctype.item.ShopItem",
+}
+
+doctype_js = {
+    "Item": "public/js/override/item.js",
+    "Homepage": "public/js/override/homepage.js",
+}
+
+doc_events = {
+    "Item": {
+        "on_update": [
+            "shop.shop.crud_events.item.update_website_item.execute",
+            "shop.shop.crud_events.item.invalidate_item_variants_cache.execute",
+        ],
+        "before_rename": [
+            "shop.shop.crud_events.item.validate_duplicate_website_item.execute",
+        ],
+        "after_rename": [
+            "shop.shop.crud_events.item.invalidate_item_variants_cache.execute",
+        ],
+    },
+    "Sales Taxes and Charges Template": {
+        "on_update": [
+            "shop.shop.doctype.shop_settings.shop_settings.validate_cart_settings",
+        ],
+    },
+    "Quotation": {
+        "validate": [
+            "shop.shop.crud_events.quotation.validate_shopping_cart_items.execute",
+        ],
+    },
+    "Price List": {
+        "validate": [
+            "shop.shop.crud_events.price_list.check_impact_on_cart.execute"
+        ],
+    },
+    "Tax Rule": {
+        "validate": [
+            "shop.shop.crud_events.tax_rule.validate_use_for_cart.execute",
+        ],
+    },
+}
+
+has_website_permission = {
+    "Website Item": "shop.shop.doctype.website_item.website_item.has_website_permission_for_website_item",
+    "Item Group": "shop.shop.doctype.website_item.website_item.has_website_permission_for_item_group"
+}

shop/modules.txt

@@ -0,0 +1 @@
+Shop

shop/patches.txt

@@ -0,0 +1,9 @@
+[pre_model_sync]
+
+[post_model_sync]
+
+shop.patches.add_homepage_field #09-05-2024
+shop.patches.enable_allow_to_guest_view_for_item_group
+shop.patches.clear_cache_for_item_group_route
+shop.patches.add_shipping_rule_state_field
+shop.patches.add_upi_fields_to_sales_order

shop/patches/add_shipping_rule_state_field.py

@@ -0,0 +1,6 @@
+import frappe
+from shop.setup.install import add_custom_fields
+
+def execute():
+	frappe.reload_doc("shop", "doctype", "shipping_rule_state")
+	add_custom_fields()

shop/patches/add_upi_fields_to_sales_order.py

@@ -0,0 +1,46 @@
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+def execute():
+	"""Add UPI payment tracking fields to Sales Order."""
+	custom_fields = {
+		"Sales Order": [
+			{
+				"fieldname": "upi_payment_section",
+				"fieldtype": "Section Break",
+				"label": "UPI Payment Details",
+				"insert_after": "payment_schedule",
+				"collapsible": 1,
+			},
+			{
+				"fieldname": "upi_transaction_id",
+				"fieldtype": "Data",
+				"label": "UPI Transaction ID",
+				"insert_after": "upi_payment_section",
+				"read_only": 1,
+			},
+			{
+				"fieldname": "upi_payment_date",
+				"fieldtype": "Datetime",
+				"label": "UPI Payment Date",
+				"insert_after": "upi_transaction_id",
+				"read_only": 1,
+			},
+			{
+				"fieldname": "column_break_upi",
+				"fieldtype": "Column Break",
+				"insert_after": "upi_payment_date",
+			},
+			{
+				"fieldname": "upi_payment_status",
+				"fieldtype": "Select",
+				"label": "UPI Payment Status",
+				"options": "\nPending\nPaid",
+				"insert_after": "column_break_upi",
+				"read_only": 1,
+				"in_list_view": 1,
+			},
+		]
+	}
+
+	create_custom_fields(custom_fields)

webshop/patches/convert_to_website_item_in_item_card_group_template.py → shop/patches/convert_to_website_item_in_item_card_group_template.py

@@ -3,15 +3,15 @@
 
 import frappe
 
-from webshop.webshop.doctype.website_item.website_item import make_website_item
+from shop.shop.doctype.website_item.website_item import make_website_item
 
 
 def execute():
 	"""
 	Convert all Item links to Website Item link values in
 	exisitng 'Item Card Group' Web Page Block data.
 	"""
-	frappe.reload_doc("webshop", "web_template", "item_card_group")
+	frappe.reload_doc("shop", "web_template", "item_card_group")
 
 	blocks = frappe.db.get_all(
 		"Web Page Block",

webshop/patches/copy_custom_field_filters_to_website_item.py → shop/patches/copy_custom_field_filters_to_website_item.py

@@ -1,7 +1,7 @@
 import frappe
 from frappe.custom.doctype.custom_field.custom_field import create_custom_field
 
-from webshop.webshop.utils.setup import has_ecommerce_fields
+from shop.shop.utils.setup import has_ecommerce_fields
 
 def execute():
 	"Add Field Filters, that are not standard fields in Website Item, as Custom Fields."
@@ -42,7 +42,7 @@ def get_table_multiselect_data(docfield):
 
 		return table_multiselect_data
 
-	settings_doctype = "E Commerce Settings" if has_ecommerce_fields() else "Webshop Settings"
+	settings_doctype = "E Commerce Settings" if has_ecommerce_fields() else "Shop Settings"
 
 	settings = frappe.get_doc(settings_doctype)
 

webshop/patches/create_website_items.py → shop/patches/create_website_items.py

@@ -1,17 +1,17 @@
 import frappe
 
-from webshop.webshop.doctype.website_item.website_item import make_website_item
+from shop.shop.doctype.website_item.website_item import make_website_item
 
 
 def execute():
 	if frappe.get_all("Website Item", limit=1):
 		return
 
-	frappe.reload_doc("webshop", "doctype", "website_item")
-	frappe.reload_doc("webshop", "doctype", "website_item_tabbed_section")
-	frappe.reload_doc("webshop", "doctype", "website_offer")
-	frappe.reload_doc("webshop", "doctype", "recommended_items")
-	frappe.reload_doc("webshop", "doctype", "webshop_settings")
+	frappe.reload_doc("shop", "doctype", "website_item")
+	frappe.reload_doc("shop", "doctype", "website_item_tabbed_section")
+	frappe.reload_doc("shop", "doctype", "website_offer")
+	frappe.reload_doc("shop", "doctype", "recommended_items")
+	frappe.reload_doc("shop", "doctype", "shop_settings")
 	frappe.reload_doc("stock", "doctype", "item")
 
 	item_fields = [

webshop/patches/populate_e_commerce_settings.py → shop/patches/populate_e_commerce_settings.py

@@ -1,10 +1,10 @@
 import frappe
 from frappe.utils import cint
 
-from webshop.webshop.utils.setup import has_ecommerce_fields
+from shop.shop.utils.setup import has_ecommerce_fields
 
 def execute():
-	frappe.reload_doc("webshop", "doctype", "webshop_settings")
+	frappe.reload_doc("shop", "doctype", "shop_settings")
 	frappe.reload_doc("portal", "doctype", "website_filter_field")
 	frappe.reload_doc("portal", "doctype", "website_attribute")
 
@@ -35,7 +35,7 @@ def execute():
 		"save_quotations_as_draft",
 	]
 
-	settings_doctype = "E Commerce Settings" if has_ecommerce_fields() else "Webshop Settings"
+	settings_doctype = "E Commerce Settings" if has_ecommerce_fields() else "Shop Settings"
 
 	settings = frappe.get_doc(settings_doctype)
 

webshop/public/js/customer_reviews.js → shop/public/js/customer_reviews.js

@@ -28,7 +28,7 @@ $(() => {
 					primary_action: function() {
 						let data = d.get_values();
 						frappe.call({
-							method: "webshop.webshop.doctype.item_review.item_review.add_item_review",
+							method: "shop.shop.doctype.item_review.item_review.add_item_review",
 							args: {
 								web_item: $btn.attr('data-web-item'),
 								title: data.title,
@@ -66,7 +66,7 @@ $(() => {
 				let me = this;
 
 				frappe.call({
-					method: "webshop.webshop.doctype.item_review.item_review.get_item_reviews",
+					method: "shop.shop.doctype.item_review.item_review.get_item_reviews",
 					args: {
 						web_item: $btn.attr('data-web-item'),
 						start: me.start,

shop/public/js/init.js

@@ -0,0 +1,2 @@
+if (!window.shop) window.shop = {}
+if (!frappe.boot) frappe.boot = {}

webshop/public/js/override/item.js → shop/public/js/override/item.js

@@ -4,7 +4,7 @@ frappe.ui.form.on("Item", {
 			if (!frm.doc.published_in_website) {
 				frm.add_custom_button(__("Publish in Website"), function() {
 					frappe.call({
-						method: "webshop.webshop.doctype.website_item.website_item.make_website_item",
+						method: "shop.shop.doctype.website_item.website_item.make_website_item",
 						args: {
 							doc: frm.doc,
 						},

webshop/public/js/product_ui/grid.js → shop/public/js/product_ui/grid.js

@@ -1,7 +1,7 @@
-webshop.ProductGrid = class {
+shop.ProductGrid = class {
 	/* Options:
 		- items: Items
-		- settings: Webshop Settings
+		- settings: Shop Settings
 		- products_section: Products Wrapper
 		- preference: If preference is not grid view, render but hide
 	*/