sboulahtit/orion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(loyalty): use Code 128 barcode for retail scanner compatibility

Browse Source 
Switch wallet pass barcodes from QR to Code 128 format using the
card_number (digits only), so standard retail barcode scanners can
read loyalty cards. Apple Wallet keeps QR as fallback in barcodes
array. Also fix stale Vendor.loyalty_program relationship (now
company-based), add parent init calls in vendor JS components,
and update module docs to reflect Phase 2 completion.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Samir Boulahtit
2026-02-06 18:55:20 +01:00
parent df784d718b
commit 74bbf84702
10 changed files with 116 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/modules/loyalty/services/apple_wallet_service.py
View File

@@ -125,16 +125,23 @@ class AppleWalletService:
"authenticationToken": card.apple_auth_token,
"webServiceURL": self._get_web_service_url(),
"barcode": {
"message": card.qr_code_data,
"format": "PKBarcodeFormatQR",
"message": card.card_number.replace("-", ""),
"format": "PKBarcodeFormatCode128",
"messageEncoding": "iso-8859-1",
"altText": card.card_number,
},
"barcodes": [
{
"message": card.card_number.replace("-", ""),
"format": "PKBarcodeFormatCode128",
"messageEncoding": "iso-8859-1",
"altText": card.card_number,
},
{
"message": card.qr_code_data,
"format": "PKBarcodeFormatQR",
"messageEncoding": "iso-8859-1",
}
},
],
}

5
app/modules/loyalty/services/google_wallet_service.py
View File

@@ -275,8 +275,9 @@ class GoogleWalletService:
"accountId": card.card_number,
"accountName": card.card_number,
"barcode": {
"type": "QR_CODE",
"value": card.qr_code_data,
"type": "CODE_128",
"value": card.card_number.replace("-", ""),
"alternateText": card.card_number,
},
}

6
app/modules/loyalty/static/vendor/js/loyalty-card-detail.js vendored
View File

@@ -20,6 +20,12 @@ function vendorLoyaltyCardDetail() {
if (window._loyaltyCardDetailInitialized) return;
window._loyaltyCardDetailInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
// Extract card ID from URL
const pathParts = window.location.pathname.split('/');
const cardsIndex = pathParts.indexOf('cards');

6
app/modules/loyalty/static/vendor/js/loyalty-cards.js vendored
View File

@@ -41,6 +41,12 @@ function vendorLoyaltyCards() {
if (window._loyaltyCardsInitialized) return;
window._loyaltyCardsInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
if (window.PlatformSettings) {
this.pagination.per_page = await window.PlatformSettings.getRowsPerPage();
}

6
app/modules/loyalty/static/vendor/js/loyalty-enroll.js vendored
View File

@@ -29,6 +29,12 @@ function vendorLoyaltyEnroll() {
if (window._loyaltyEnrollInitialized) return;
window._loyaltyEnrollInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
await this.loadProgram();
loyaltyEnrollLog.info('=== LOYALTY ENROLL PAGE INITIALIZATION COMPLETE ===');
},

6
app/modules/loyalty/static/vendor/js/loyalty-settings.js vendored
View File

@@ -30,6 +30,12 @@ function vendorLoyaltySettings() {
if (window._loyaltySettingsInitialized) return;
window._loyaltySettingsInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
await this.loadSettings();
loyaltySettingsLog.info('=== LOYALTY SETTINGS PAGE INITIALIZATION COMPLETE ===');
},

6
app/modules/loyalty/static/vendor/js/loyalty-stats.js vendored
View File

@@ -29,6 +29,12 @@ function vendorLoyaltyStats() {
if (window._loyaltyStatsInitialized) return;
window._loyaltyStatsInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
await this.loadStats();
loyaltyStatsLog.info('=== LOYALTY STATS PAGE INITIALIZATION COMPLETE ===');
},

6
app/modules/loyalty/static/vendor/js/loyalty-terminal.js vendored
View File

@@ -52,6 +52,12 @@ function vendorLoyaltyTerminal() {
}
window._loyaltyTerminalInitialized = true;
// IMPORTANT: Call parent init first to set vendorCode from URL
const parentInit = data().init;
if (parentInit) {
await parentInit.call(this);
}
await this.loadData();
loyaltyTerminalLog.info('=== LOYALTY TERMINAL INITIALIZATION COMPLETE ===');

8
app/modules/tenancy/models/vendor.py
View File

@@ -253,14 +253,6 @@ class Vendor(Base, TimestampMixin):
cascade="all, delete-orphan",
)
# Loyalty program (one-to-one)
loyalty_program = relationship(
"LoyaltyProgram",
back_populates="vendor",
uselist=False,
cascade="all, delete-orphan",
)
def __repr__(self):
"""String representation of the Vendor object."""
return f"<Vendor(id={self.id}, vendor_code='{self.vendor_code}', name='{self.name}', subdomain='{self.subdomain}')>"