Skip to content

Revert " Product Bundle Search bar" #3

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
Ashkar7 merged 1 commit into from
Jul 7, 2025
Merged

Revert " Product Bundle Search bar" #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 0 additions & 39 deletions posawesome/posawesome/api/posapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,45 +2531,6 @@ def get_sales_invoice_child_table(sales_invoice, sales_invoice_item):
)
return child_doc

@frappe.whitelist()
def search_product_bundle(search_term, pos_profile=None):
"""Search for product bundles by search term"""
try:
if not search_term:
return []

# Parse pos_profile if it's a string
if isinstance(pos_profile, str):
pos_profile = json.loads(pos_profile)

# Search for product bundles that match the search term
bundles = frappe.db.sql("""
SELECT
pb.name,
pb.new_item_code as item_code,
pb.description,
i.item_name
FROM `tabProduct Bundle` pb
INNER JOIN `tabItem` i ON i.name = pb.new_item_code
WHERE pb.disabled = 0
AND (
pb.new_item_code LIKE %(search_term)s
OR pb.name LIKE %(search_term)s
OR i.item_name LIKE %(search_term)s
OR i.custom_oem_part_number LIKE %(search_term)s
)
ORDER BY pb.name
LIMIT 10
""", {
'search_term': f"%{search_term}%"
}, as_dict=True)

return bundles

except Exception as e:
frappe.log_error(f"Error searching product bundle for {search_term}: {str(e)}")
return []

@frappe.whitelist()
def update_invoice_from_order(data):
data = json.loads(data)
Expand Down
148 changes: 20 additions & 128 deletions posawesome/public/js/posapp/components/pos/ItemsSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,113 +323,7 @@ export default {
/**
* Unified method to handle barcode search from both manual input and scanning
*/

async handleProductBundleSearch(searchValue) {
if (!searchValue || searchValue.trim() === '') {
console.warn('No search value provided for product bundle search');
return false;
}

console.log(`Searching for product bundle: ${searchValue}`);

try {
// First, check if the search term matches any item that might be a product bundle
const potentialBundleItem = this.items.find(item =>
item.item_code === searchValue ||
item.item_code.toLowerCase() === searchValue.toLowerCase() ||
item.item_name.toLowerCase().includes(searchValue.toLowerCase())
);

if (potentialBundleItem) {
console.log('Found potential bundle item:', potentialBundleItem);

// Check if this item has a product bundle
const bundleResult = await this.processProductBundle(potentialBundleItem.item_code, this.qty || 1);

if (bundleResult) {
// Bundle was processed successfully
this.clearSearchForm();

frappe.show_alert({
message: `Product bundle added: ${potentialBundleItem.item_name}`,
indicator: 'green'
}, 3);

return true;
} else {
// Not a bundle, treat as regular item
console.log('Item is not a product bundle, adding as regular item');
this.addItemFromSearch(potentialBundleItem, searchValue);
return true;
}
} else {
// Try direct product bundle search via API
return await this.searchAndAddProductBundle(searchValue);
}

} catch (error) {
console.error('Error in product bundle search:', error);
this.eventBus.emit("show_message", {
title: `Error searching for product bundle: ${error.message}`,
color: "error",
});
return false;
}
},

async searchAndAddProductBundle(searchTerm) {
try {
console.log(`Searching for product bundle via API: ${searchTerm}`);



const response = await new Promise((resolve, reject) => {
frappe.call({
method: "posawesome.posawesome.api.posapp.search_product_bundle",
args: {
search_term: searchTerm,
pos_profile: this.pos_profile
},
callback: function(r) {
resolve(r);
},
error: function(err) {
reject(err);
}
});
});

if (response.message && response.message.length > 0) {
const bundle = response.message[0]; // Take the first match
console.log('Found product bundle via API:', bundle);

// Process the found bundle
const bundleResult = await this.processProductBundle(bundle.item_code, this.qty || 1);

if (bundleResult) {
this.clearSearchForm();

frappe.show_alert({
message: `Product bundle added: ${bundle.name}`,
indicator: 'green'
}, 3);

return true;
}
}

console.log(`No product bundle found for: ${searchTerm}`);
return false;

} catch (error) {
console.error('Error searching product bundle via API:', error);
// Don't show error message here, let the calling function handle it
return false;
}
},


async handleBarcodeSearch(searchValue = null, isScanned = false) {
handleBarcodeSearch(searchValue = null, isScanned = false) {
// Use provided value or get from search field
const barcodeValue = searchValue || this.first_search || this.search;

Expand All @@ -453,15 +347,6 @@ async searchAndAddProductBundle(searchTerm) {
}, 2);
}

if (this.pos_profile.custom_product_bundle) {
console.log('Product bundle enabled, checking for bundles first...');

const bundleFound = await this.handleProductBundleSearch(barcodeValue);
if (bundleFound) {
return; // Bundle was found and processed, exit early
}
}

// First, try to find exact barcode match
let foundItem = this.findItemByBarcode(barcodeValue);

Expand All @@ -481,7 +366,7 @@ async searchAndAddProductBundle(searchTerm) {
console.log('Found item by item code match:', foundItem);
this.addItemFromSearch(foundItem, barcodeValue);
return;
}
}

// For scale barcodes (if configured)
if (this.pos_profile.posa_scale_barcode_start &&
Expand Down Expand Up @@ -530,7 +415,7 @@ async searchAndAddProductBundle(searchTerm) {
} else {
// No item found
this.handleItemNotFound(barcodeValue, isScanned);
}
}
},

findItemByBarcode(barcode) {
Expand Down Expand Up @@ -832,7 +717,11 @@ async searchAndAddProductBundle(searchTerm) {
if (product_bundle && product_bundle.items && Array.isArray(product_bundle.items)) {
console.log('Product bundle found:', product_bundle);


// Show loading message
this.eventBus.emit("show_message", {
title: `Processing product bundle: ${product_bundle.name}`,
color: "info",
});

let allItemsAdded = true;
let addedCount = 0;
Expand Down Expand Up @@ -912,7 +801,10 @@ async searchAndAddProductBundle(searchTerm) {

} catch (error) {
console.error('Error processing product bundle:', error);

this.eventBus.emit("show_message", {
title: `Failed to process product bundle: ${error.message}`,
color: "error",
});
return false;
}
},
Expand Down Expand Up @@ -1862,16 +1754,16 @@ async searchAndAddProductBundle(searchTerm) {

if (filtred_list.length === 0) {
// Fallback to partial fuzzy match on name
const search_combinations = this.generateWordCombinations(this.search);
filtred_list = filtred_group_list.filter(item => {
const nameLower = item.item_name.toLowerCase();
const search_combinations = this.generateWordCombinations(this.search);
filtred_list = filtred_group_list.filter(item => {
const nameLower = item.item_name.toLowerCase();
return search_combinations.some(element => {
element = element.toLowerCase().trim();
const element_regex = new RegExp(`.*${element.split('').join('.*')}.*`);
return element_regex.test(nameLower);
element = element.toLowerCase().trim();
const element_regex = new RegExp(`.*${element.split('').join('.*')}.*`);
return element_regex.test(nameLower);
});
});
});
}
}

if (
filtred_list.length === 0 &&
Expand Down
Loading