${this.get_discount_icon()} ${__('Add Discount')}
@@ -470,6 +522,35 @@ this.highlight_checkout_btn(true);
if(!this.discount_field || can_edit_discount) this.show_discount_control();
});
+ this.$component.on('click', '.add-branch-wrapper', function () {
+ const $wrapper = $(this); // Store reference to the clicked element
+
+ // Create a div container for the link field
+ const branchFieldWrapper = $('
');
+
+ // Replace the wrapper with the new div
+ $wrapper.replaceWith(branchFieldWrapper);
+
+ // Create a Frappe Link Field dynamically
+ let branchField = new frappe.ui.form.ControlLink({
+ df: {
+ fieldtype: 'Link',
+ options: 'Branch', // Link to Branch Doctype
+ fieldname: 'branch',
+ label: 'Branch',
+ placeholder: 'Select Branch',
+ },
+ parent: branchFieldWrapper, // Append inside the same container
+ value: '',
+ change: function (value) {
+ console.log('Selected Branch:', value);
+ }
+ });
+
+ // Render the field
+ branchField.refresh();
+ });
+
frappe.ui.form.on("Sales Invoice", "paid_amount", frm => {
// called when discount is applied
this.update_totals_section(frm);
@@ -529,6 +610,8 @@ this.highlight_checkout_btn(true);
ignore_inputs: true,
page: cur_page.page.page
});
+
+
frappe.ui.keys.on("escape", () => {
const item_cart_visible = this.$component.is(":visible");
if (item_cart_visible && this.discount_field && this.discount_field.parent.is(":visible")) {
@@ -870,7 +953,6 @@ this.highlight_checkout_btn(true);
}
render_cart_item(item_data, $item_to_update) {
-
const currency = this.events.get_frm().doc.currency;
const me = this;
@@ -936,6 +1018,27 @@ this.highlight_checkout_btn(true);
render_input: true,
});
}
+ if(me.show_batch_in_cart){
+ this[item_data.item_code + "_batch"] = frappe.ui.form.make_control({
+ df: {
+ fieldname: "batch",
+ fieldtype: "Link",
+ options: "Batch",
+ get_query: function() {
+ return {
+ filters: {
+ item: item_data.item_code
+ }
+ };
+ },
+ onchange: function() {
+ me.events.form_updated(item_data, "batch_no", this.value);
+ },
+ },
+ parent: $item_to_update.find(`.item-batch`),
+ render_input: true,
+ });
+ }
this[item_data.item_code + "_rate"] = frappe.ui.form.make_control({
df: {
fieldname: "rate",
@@ -1045,7 +1148,9 @@ this.highlight_checkout_btn(true);
this[item_data.item_code + "_uom"].set_value(item_data.uom);
this[item_data.item_code + "_uom"].refresh();
}
-
+ if(me.show_batch_in_cart){
+ this[item_data.item_code + "_batch"].set_value(item_data.batch_no);
+ }
// this[item_data.item_code + "_amount"].set_value(parseFloat(item_data.amount).toFixed(3));
// this[item_data.item_code + "_rate"].set_value(parseFloat(item_data.rate).toFixed(3));
this[item_data.item_code + "_amount"].set_value(item_data.amount);
@@ -1111,6 +1216,9 @@ this.highlight_checkout_btn(true);
if(me.custom_show_uom_in_cart){
html += `
`;
}
+ if(me.show_batch_in_cart){
+ html += `
`;
+ }
html += `
`;
if(me.custom_use_discount_percentage){
html += `
`
@@ -1138,6 +1246,9 @@ this.highlight_checkout_btn(true);
if(me.custom_show_uom_in_cart){
html += `
`;
}
+ if(me.show_batch_in_cart){
+ html += `
`;
+ }
html += `
`;
if(me.custom_use_discount_percentage){
html += `
`
@@ -1165,6 +1276,7 @@ this.highlight_checkout_btn(true);
${item_data.qty || 0}
${item_data.uom}
+
${item_data.batch}
${parseFloat(item_data.amount).toFixed(2)}
${parseFloat(item_data.rate).toFixed(2)}
@@ -1175,6 +1287,7 @@ this.highlight_checkout_btn(true);
${item_data.qty || 0}
${item_data.uom}
+
${item_data.batch}
${parseFloat(item_data.rate).toFixed(2)}
diff --git a/posnext/public/js/pos_item_selector.js b/posnext/public/js/pos_item_selector.js
index 3dfba59..e724649 100644
--- a/posnext/public/js/pos_item_selector.js
+++ b/posnext/public/js/pos_item_selector.js
@@ -416,6 +416,7 @@ posnext.PointOfSale.ItemSelector = class {
${format_currency(item_data.price_list_rate, currency)}
${item_data.actual_qty || 0}
+
${item_data.batch_no || 0}
`
} else {
@@ -425,6 +426,7 @@ posnext.PointOfSale.ItemSelector = class {
${format_currency(item_data.price_list_rate, currency)}
${item_data.actual_qty || 0}
+
${item_data.batch_no || 0}
${__('Additional Information')}
+
@@ -41,13 +46,31 @@ posnext.PointOfSale.Payment = class {
${__("Complete Order")}
`
);
+
+ // ✅ Assign to the right class
this.$component = this.wrapper.find('.payment-container');
this.$payment_modes = this.$component.find('.payment-modes');
this.$totals_section = this.$component.find('.totals-section');
this.$totals = this.$component.find('.totals');
this.$numpad = this.$component.find('.number-pad');
+ this.$coupon_code = this.$component.find('.coupon-code');
this.$invoice_fields_section = this.$component.find('.fields-section');
}
+
+ render_coupon_code_field() {
+ frappe.ui.form.make_control({
+ df: {
+ label: __('Coupon Code'),
+ fieldtype: 'Link',
+ options: 'Coupon Code',
+ fieldname: 'coupon_code',
+ placeholder: __('Select a coupon'),
+ },
+ parent: this.$component.find('.coupon-code'),
+ render_input: true
+ });
+ }
+
make_invoice_fields_control() {
// frappe.db.get_doc("POS Settings", undefined).then((doc) => {
@@ -625,6 +648,9 @@ posnext.PointOfSale.Payment = class {
update_totals_section(doc) {
if (!doc) doc = this.events.get_frm().doc;
+ let branch_value = $('.input-with-feedback[data-fieldname="branch"]').val();
+ frappe.model.set_value(cur_frm.doctype, cur_frm.docname, 'branch', branch_value);
+ cur_frm.save()
// doc.paid_amount = doc.grand_total
const paid_amount = doc.paid_amount;