Skip to content

Feature/magento integration split #356

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.

Sign up for GitHub

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

Merged
MohamedAliSmk merged 5 commits into from
Aug 17, 2026
Merged

Feature/magento integration split #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bea423
refactor: migrate Magento loyalty integration to a new registry syste…
Aug 4, 2026
674be97
feat: enhance free item promotion handling in POS, refining discount …
Aug 5, 2026
24073c1
test: enhance customer balance checks in smoke tests by verifying bal…
Aug 9, 2026
f90bf38
fix: Error applying offers: local variable 'txn_result' referenced be…
Aug 16, 2026
58dde0d
refactor: update loyalty program integration in sales invoice hooks
Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion POS/src/components/sale/InvoiceCart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,7 @@ const customerLpInfo = ref({
});

const customerLpResource = createResource({
url: "pos_next.api.magento_loyalty.get_lp_balance_for_customer",
url: "magento_integration.api.magento_loyalty.get_lp_balance_for_customer",
makeParams() {
const customerName = props.customer?.name || props.customer;
return {
Expand Down
8 changes: 2 additions & 6 deletions pos_next/api/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,9 @@ def _get_pos_settings(pos_profile_doc):
)
settings["disable_rounded_total"] = pos_profile_doc.disable_rounded_total or 0

from pos_next.api.pos_profile import _is_magento_loyalty_available
from pos_next.integrations.registry import extend_bootstrap_settings

settings["magento_loyalty_available"] = _is_magento_loyalty_available(pos_profile_doc.name)

from pos_next.services.miraaya_loyalty import is_miraaya_loyalty_available

settings["miraaya_installed"] = is_miraaya_loyalty_available()
extend_bootstrap_settings(settings, pos_profile_doc.name)

return settings
except Exception:
Expand Down
180 changes: 22 additions & 158 deletions pos_next/api/customers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,128 +5,12 @@

import frappe
from frappe import _
from pos_next.services.miraaya_loyalty import is_miraaya_loyalty_available, register_customer_pos

MAGENTO_EMAIL_FIELDS = ("custom_email", "email", "email_id")


def _set_customer_magento_email_fields(customer_name: str, email_id: str) -> None:
"""Populate Customer email fields that masar_miraaya may read for Magento sync."""
email_id = (email_id or "").strip()
if not email_id:
return

meta = frappe.get_meta("Customer")
for fieldname in MAGENTO_EMAIL_FIELDS:
if meta.has_field(fieldname):
frappe.db.set_value("Customer", customer_name, fieldname, email_id, update_modified=False)


def _ensure_customer_primary_contact_email(
customer,
email_id: str,
mobile_no: str | None = None,
first_name: str | None = None,
last_name: str | None = None,
) -> None:
"""Ensure the customer's primary Contact exists and has the Magento email."""
from erpnext.selling.doctype.customer.customer import make_contact

email_id = (email_id or "").strip()
if not email_id:
return

contact_name = frappe.db.get_value("Customer", customer.name, "customer_primary_contact")
if contact_name:
contact = frappe.get_doc("Contact", contact_name)
existing_emails = {(row.email_id or "").strip().lower() for row in contact.email_ids}
contact_updated = False
if email_id.lower() not in existing_emails:
contact.add_email(email_id, is_primary=1)
contact_updated = True
if first_name and not (contact.first_name or "").strip():
contact.first_name = first_name.strip()
contact_updated = True
if last_name and not (contact.last_name or "").strip():
contact.last_name = last_name.strip()
contact_updated = True
if contact_updated:
contact.save(ignore_permissions=True)
return

customer.email_id = email_id
if mobile_no:
customer.mobile_no = mobile_no
if first_name:
customer.first_name = first_name.strip()
if last_name:
customer.last_name = last_name.strip()

contact = make_contact(customer)
frappe.db.set_value(
"Customer",
customer.name,
"customer_primary_contact",
contact.name,
update_modified=False,
)


def _prepare_customer_for_magento_publish(
customer,
email_id: str,
mobile_no: str | None = None,
first_name: str | None = None,
last_name: str | None = None,
) -> None:
"""Make sure email is on Customer + Contact before masar_miraaya validate runs."""
email_id = (email_id or "").strip()
# if not email_id:
# frappe.throw(_("Email is required for Magento customer sync"))

_ensure_customer_primary_contact_email(
customer,
email_id=email_id,
mobile_no=mobile_no,
first_name=first_name,
last_name=last_name,
)
_set_customer_magento_email_fields(customer.name, email_id)
customer.reload()


def _finalize_magento_customer_registration(
customer,
magento_registration: dict,
email_id: str | None = None,
mobile_no: str | None = None,
first_name: str | None = None,
last_name: str | None = None,
) -> None:
"""Persist Magento registration without Customer.save().

Old masar_miraaya validate calls create_new_customer whenever
custom_is_publish=1 on save. Using db.set_value avoids that second Magento call.
"""
resolved_email = (magento_registration.get("email") or email_id or "").strip()
if resolved_email:
_prepare_customer_for_magento_publish(
customer,
email_id=resolved_email,
mobile_no=mobile_no,
first_name=first_name,
last_name=last_name,
)

update_fields = {"custom_is_publish": 1}
customer_id = magento_registration.get("customer_id")
if customer_id:
update_fields["custom_customer_id"] = customer_id

frappe.db.set_value("Customer", customer.name, update_fields, update_modified=False)
customer.reload()


from pos_next.integrations.registry import (
after_customer_insert,
prepare_customer_doc,
validate_customer_create,
)
@frappe.whitelist()
def get_customers(search_term="", pos_profile=None, limit=20, modified_since=None):
"""
Expand Down Expand Up @@ -234,13 +118,12 @@ def create_customer(
if not customer_name:
frappe.throw(_("Customer name is required"))

if is_miraaya_loyalty_available():
if not (custom_first_name or "").strip():
frappe.throw(_("First name is required"))
if not (custom_last_name or "").strip():
frappe.throw(_("Last name is required"))
# if not (email_id or "").strip():
# frappe.throw(_("Email is required for Magento customer sync"))
validate_customer_create(
customer_name=customer_name,
email_id=email_id,
custom_first_name=custom_first_name,
custom_last_name=custom_last_name,
)

loyalty_program = get_default_loyalty_program_from_settings(
company=company,
Expand Down Expand Up @@ -279,44 +162,25 @@ def create_customer(
}
)

if is_miraaya_loyalty_available():
publish_to_magento = int(custom_is_publish or 0)
customer_fields = {}
if frappe.get_meta("Customer").has_field("custom_first_name"):
customer_fields["custom_first_name"] = (custom_first_name or "").strip()
if frappe.get_meta("Customer").has_field("custom_last_name"):
customer_fields["custom_last_name"] = (custom_last_name or "").strip()
if frappe.get_meta("Customer").has_field("custom_is_publish"):
# Defer Magento sync until after insert creates the primary Contact
# (masar_miraaya validate runs before ERPNext creates Contact/email).
customer_fields["custom_is_publish"] = 0
customer.update(customer_fields)
else:
publish_to_magento = False
publish_to_magento = prepare_customer_doc(
customer,
custom_first_name=custom_first_name,
custom_last_name=custom_last_name,
custom_is_publish=custom_is_publish,
)

frappe.flags.pos_next_customer_company = company
frappe.flags.pos_next_customer_pos_profile = pos_profile
try:
# Insert with custom_is_publish=0 so old masar_miraaya validate does NOT
# call create_new_customer (which would duplicate Magento create).
customer.insert()
if publish_to_magento and frappe.get_meta("Customer").has_field("custom_is_publish"):
# Sole Magento create path — register_customer_pos (POST).
# Persist publish/id with db.set_value so Customer.validate never runs.
magento_registration = register_customer_pos(
customer=customer.name,
firstname=custom_first_name,
lastname=custom_last_name,
phone=mobile_no,
email=email_id,
) or {}
_finalize_magento_customer_registration(
if publish_to_magento:
after_customer_insert(
customer,
magento_registration,
email_id=email_id,
mobile_no=mobile_no,
first_name=custom_first_name,
last_name=custom_last_name,
custom_first_name=custom_first_name,
custom_last_name=custom_last_name,
custom_is_publish=custom_is_publish,
)
finally:
frappe.flags.pos_next_customer_company = None
Expand Down
20 changes: 4 additions & 16 deletions pos_next/api/invoices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2230,14 +2230,14 @@ def submit_invoice(invoice=None, data=None):
invoice_doc.submit()
invoice_submitted = True

from pos_next.services.miraaya_loyalty import is_magento_loyalty_mode
from pos_next.integrations.registry import is_external_loyalty_mode

magento_loyalty_mode = is_magento_loyalty_mode(pos_profile)
external_loyalty_mode = is_external_loyalty_mode(pos_profile)

# Handle wallet transaction reversal for returns
wallet_reversal_ok = False
if (
not magento_loyalty_mode
not external_loyalty_mode
and invoice_doc.get("is_return")
and invoice_doc.get("return_against")
):
Expand Down Expand Up @@ -2270,7 +2270,7 @@ def submit_invoice(invoice=None, data=None):
# Credit return amount to customer wallet when "Add to Customer Credit Balance" is enabled.
# Only proceed if the wallet reversal above succeeded (or was not needed) to
# avoid double-crediting the customer when reversal fails.
if invoice_doc.get("is_return") and not magento_loyalty_mode:
if invoice_doc.get("is_return") and not external_loyalty_mode:
add_to_customer_balance = invoice.get("add_to_customer_balance")
has_return_against = bool(invoice_doc.get("return_against"))
if add_to_customer_balance and (wallet_reversal_ok or not has_return_against):
Expand Down Expand Up @@ -2319,18 +2319,6 @@ def submit_invoice(invoice=None, data=None):
indicator="orange",
)

# Handle Magento LP redemption after successful submission
if not invoice_doc.get("is_return"):
try:
from pos_next.api.magento_loyalty import redeem_magento_lp_after_submit

redeem_magento_lp_after_submit(invoice_doc)
except Exception as lp_redeem_error:
frappe.log_error(
title="Magento LP Redeem Error",
message=f"Invoice: {invoice_doc.name}, Error: {lp_redeem_error!s}\n{frappe.get_traceback()}",
)

# Log manual rate edits for audit trail (only after successful submission)
if doctype == DOCTYPE_SALES_INVOICE:
incoming_items = invoice.get("items") or []
Expand Down
Loading
Loading