-
-
-
-
-
-
-
- `);
- }
-
- make_cart() {
- this.cart = new POSCart({
- frm: this.frm,
- wrapper: this.wrapper.find('.cart-container'),
- events: {
- on_customer_change: (customer) => {
- this.frm.set_value('customer', customer);
- },
- on_field_change: (item_code, field, value, batch_no) => {
- this.update_item_in_cart(item_code, field, value, batch_no);
- },
- on_numpad: (value) => {
- if (value == __('Pay')) {
- if (!this.payment) {
- this.make_payment_modal();
- } else {
- this.frm.doc.payments.map(p => {
- this.payment.dialog.set_value(p.mode_of_payment, p.amount);
- });
-
- this.payment.set_title();
- }
- this.payment.open_modal();
- }
- },
- on_select_change: () => {
- this.cart.numpad.set_inactive();
- this.set_form_action();
- },
- get_item_details: (item_code) => {
- return this.items.get(item_code);
- },
- get_loyalty_details: () => {
- var me = this;
- if (this.frm.doc.customer) {
- frappe.call({
- method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details",
- args: {
- "customer": me.frm.doc.customer,
- "expiry_date": me.frm.doc.posting_date,
- "company": me.frm.doc.company,
- "silent": true
- },
- callback: function(r) {
- if (r.message.loyalty_program && r.message.loyalty_points) {
- me.cart.events.set_loyalty_details(r.message, true);
- }
- if (!r.message.loyalty_program) {
- var loyalty_details = {
- loyalty_points: 0,
- loyalty_program: '',
- expense_account: '',
- cost_center: ''
- }
- me.cart.events.set_loyalty_details(loyalty_details, false);
- }
- }
- });
- }
- },
- set_loyalty_details: (details, view_status) => {
- if (view_status) {
- this.cart.available_loyalty_points.$wrapper.removeClass("hide");
- } else {
- this.cart.available_loyalty_points.$wrapper.addClass("hide");
- }
- this.cart.available_loyalty_points.set_value(details.loyalty_points);
- this.cart.available_loyalty_points.refresh_input();
- this.frm.set_value("loyalty_program", details.loyalty_program);
- this.frm.set_value("loyalty_redemption_account", details.expense_account);
- this.frm.set_value("loyalty_redemption_cost_center", details.cost_center);
- }
- }
- });
-
- frappe.ui.form.on('Sales Invoice', 'selling_price_list', (frm) => {
- if(this.items && frm.doc.pos_profile) {
- this.items.reset_items();
- }
- })
- }
-
- toggle_editing(flag) {
- let disabled;
- if (flag !== undefined) {
- disabled = !flag;
- } else {
- disabled = this.frm.doc.docstatus == 1 ? true: false;
- }
- const pointer_events = disabled ? 'none' : 'inherit';
-
- this.wrapper.find('input, button, select').prop("disabled", disabled);
- this.wrapper.find('.number-pad-container').toggleClass("hide", disabled);
-
- this.wrapper.find('.cart-container').css('pointer-events', pointer_events);
- this.wrapper.find('.item-container').css('pointer-events', pointer_events);
-
- this.page.clear_actions();
- }
-
- make_items() {
- this.items = new POSItems({
- wrapper: this.wrapper.find('.item-container'),
- frm: this.frm,
- events: {
- update_cart: (item, field, value) => {
- if(!this.frm.doc.customer) {
- frappe.throw(__('Please select a customer'));
- }
- this.update_item_in_cart(item, field, value);
- this.cart && this.cart.unselect_all();
- }
- }
- });
- }
-
- update_item_in_cart(item_code, field='qty', value=1, batch_no) {
- frappe.dom.freeze();
- if(this.cart.exists(item_code, batch_no)) {
- const search_field = batch_no ? 'batch_no' : 'item_code';
- const search_value = batch_no || item_code;
- const item = this.frm.doc.items.find(i => i[search_field] === search_value);
- frappe.flags.hide_serial_batch_dialog = false;
-
- if (typeof value === 'string' && !in_list(['serial_no', 'batch_no'], field)) {
- // value can be of type '+1' or '-1'
- value = item[field] + flt(value);
- }
-
- if(field === 'serial_no') {
- value = item.serial_no + '\n'+ value;
- }
-
- // if actual_batch_qty and actual_qty if there is only one batch. In such
- // a case, no point showing the dialog
- const show_dialog = item.has_serial_no || item.has_batch_no;
-
- if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
- (item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
- this.select_batch_and_serial_no(item);
- } else {
- this.update_item_in_frm(item, field, value)
- .then(() => {
- frappe.dom.unfreeze();
- frappe.run_serially([
- () => {
- let items = this.frm.doc.items.map(item => item.name);
- if (items && items.length > 0 && items.includes(item.name)) {
- this.frm.doc.items.forEach(item_row => {
- // update cart
- this.on_qty_change(item_row);
- });
- } else {
- this.on_qty_change(item);
- }
- },
- () => this.post_qty_change(item)
- ]);
- });
- }
- return;
- }
-
- let args = { item_code: item_code };
- if (in_list(['serial_no', 'batch_no'], field)) {
- args[field] = value;
- }
-
- // add to cur_frm
- const item = this.frm.add_child('items', args);
- frappe.flags.hide_serial_batch_dialog = true;
-
- frappe.run_serially([
- () => {
- return this.frm.script_manager.trigger('item_code', item.doctype, item.name)
- .then(() => {
- this.frm.script_manager.trigger('qty', item.doctype, item.name)
- .then(() => {
- frappe.run_serially([
- () => {
- let items = this.frm.doc.items.map(i => i.name);
- if (items && items.length > 0 && items.includes(item.name)) {
- this.frm.doc.items.forEach(item_row => {
- // update cart
- this.on_qty_change(item_row);
- });
- } else {
- this.on_qty_change(item);
- }
- },
- () => this.post_qty_change(item)
- ]);
- });
- });
- },
- () => {
- const show_dialog = item.has_serial_no || item.has_batch_no;
-
- // if actual_batch_qty and actual_qty if then there is only one batch. In such
- // a case, no point showing the dialog
- if (show_dialog && field == 'qty' && ((!item.batch_no && item.has_batch_no) ||
- (item.has_serial_no) || (item.actual_batch_qty != item.actual_qty)) ) {
- // check has serial no/batch no and update cart
- this.select_batch_and_serial_no(item);
- }
- }
- ]);
- }
-
- on_qty_change(item) {
- frappe.run_serially([
- () => this.update_cart_data(item),
- ]);
- }
-
- post_qty_change(item) {
- this.cart.update_taxes_and_totals();
- this.cart.update_grand_total();
- this.cart.update_qty_total();
- this.cart.scroll_to_item(item.item_code);
- this.set_form_action();
- }
-
- select_batch_and_serial_no(row) {
- frappe.dom.unfreeze();
-
- erpnext.show_serial_batch_selector(this.frm, row, () => {
- this.frm.doc.items.forEach(item => {
- this.update_item_in_frm(item, 'qty', item.qty)
- .then(() => {
- // update cart
- frappe.run_serially([
- () => {
- if (item.qty === 0) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- },
- () => this.update_cart_data(item),
- () => this.post_qty_change(item)
- ]);
- });
- })
- }, () => {
- this.on_close(row);
- }, true);
- }
-
- on_close(item) {
- if (!this.cart.exists(item.item_code, item.batch_no) && item.qty) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- }
-
- update_cart_data(item) {
- this.cart.add_item(item);
- frappe.dom.unfreeze();
- }
-
- update_item_in_frm(item, field, value) {
- if (field == 'qty' && value < 0) {
- frappe.msgprint(__("Quantity must be positive"));
- value = item.qty;
- } else {
- if (in_list(["qty", "serial_no", "batch"], field)) {
- item[field] = value;
- if (field == "serial_no" && value) {
- let serial_nos = value.split("\n");
- item["qty"] = serial_nos.filter(d => {
- return d!=="";
- }).length;
- }
- } else {
- return frappe.model.set_value(item.doctype, item.name, field, value);
- }
- }
-
- return this.frm.script_manager.trigger('qty', item.doctype, item.name)
- .then(() => {
- if (field === 'qty' && item.qty === 0) {
- frappe.model.clear_doc(item.doctype, item.name);
- }
- })
-
- return Promise.resolve();
- }
-
- make_payment_modal() {
- this.payment = new Payment({
- frm: this.frm,
- events: {
- submit_form: () => {
- this.submit_sales_invoice();
- }
- }
- });
- }
-
- submit_sales_invoice() {
- this.frm.savesubmit()
- .then((r) => {
- if (r && r.doc) {
- this.frm.doc.docstatus = r.doc.docstatus;
- frappe.show_alert({
- indicator: 'green',
- message: __(`Sales invoice ${r.doc.name} created succesfully`)
- });
-
- this.toggle_editing();
- this.set_form_action();
- this.set_primary_action_in_modal();
- }
- });
- }
-
- set_primary_action_in_modal() {
- if (!this.frm.msgbox) {
- this.frm.msgbox = frappe.msgprint(
- `
- ${__('Print')}
-
- ${__('New')}`
- );
-
- $(this.frm.msgbox.body).find('.btn-default').on('click', () => {
- this.frm.msgbox.hide();
- this.make_new_invoice();
- })
- }
- }
-
- change_pos_profile() {
- return new Promise((resolve) => {
- const on_submit = ({ company, pos_profile, set_as_default }) => {
- if (pos_profile) {
- this.pos_profile = pos_profile;
- }
-
- if (set_as_default) {
- frappe.call({
- method: "erpnext.accounts.doctype.pos_profile.pos_profile.set_default_profile",
- args: {
- 'pos_profile': pos_profile,
- 'company': company
- }
- }).then(() => {
- this.on_change_pos_profile();
- });
- } else {
- this.on_change_pos_profile();
- }
- }
-
-
- let me = this;
-
- var dialog = frappe.prompt([{
- fieldtype: 'Link',
- label: __('Company'),
- options: 'Company',
- fieldname: 'company',
- default: me.frm.doc.company,
- reqd: 1,
- onchange: function(e) {
- me.get_default_pos_profile(this.value).then((r) => {
- dialog.set_value('pos_profile', (r && r.name)? r.name : '');
- });
- }
- },
- {
- fieldtype: 'Link',
- label: __('POS Profile'),
- options: 'POS Profile',
- fieldname: 'pos_profile',
- default: me.frm.doc.pos_profile,
- reqd: 1,
- get_query: () => {
- return {
- query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
- filters: {
- company: dialog.get_value('company')
- }
- };
- }
- }, {
- fieldtype: 'Check',
- label: __('Set as default'),
- fieldname: 'set_as_default'
- }],
- on_submit,
- __('Select POS Profile')
- );
- });
- }
-
- on_change_pos_profile() {
- return frappe.run_serially([
- () => this.make_sales_invoice_frm(),
- () => {
- this.frm.doc.pos_profile = this.pos_profile;
- this.set_pos_profile_data()
- .then(() => {
- this.reset_cart();
- if (this.items) {
- this.items.reset_items();
- }
- });
- }
- ]);
- }
-
- get_default_pos_profile(company) {
- return frappe.xcall("erpnext.stock.get_item_details.get_pos_profile",
- {'company': company})
- }
-
- setup_company() {
- return new Promise(resolve => {
- if(!this.frm.doc.company) {
- frappe.prompt({fieldname:"company", options: "Company", fieldtype:"Link",
- label: __("Select Company"), reqd: 1}, (data) => {
- this.company = data.company;
- resolve(this.company);
- }, __("Select Company"));
- } else {
- resolve();
- }
- })
- }
-
- make_new_invoice() {
- return frappe.run_serially([
- () => this.make_sales_invoice_frm(),
- () => this.set_pos_profile_data(),
- () => {
- if (this.cart) {
- this.cart.frm = this.frm;
- this.cart.reset();
- this.cart.reset_pos_field_value();
- } else {
- this.make_items();
- this.make_cart();
- }
- this.toggle_editing(true);
- },
- ]);
- }
-
- reset_cart() {
- this.cart.frm = this.frm;
- this.cart.reset();
- this.items.reset_search_field();
- }
-
- make_sales_invoice_frm() {
- const doctype = 'Sales Invoice';
- return new Promise(resolve => {
- if (this.frm) {
- this.frm = get_frm(this.frm);
- if(this.company) {
- this.frm.doc.company = this.company;
- }
-
- resolve();
- } else {
- frappe.model.with_doctype(doctype, () => {
- this.frm = get_frm();
- resolve();
- });
- }
- });
-
- function get_frm(_frm) {
- const page = $('');
- const frm = _frm || new frappe.ui.form.Form(doctype, page, false);
- const name = frappe.model.make_new_doc_and_get_name(doctype, true);
- frm.refresh(name);
- frm.doc.items = [];
- frm.doc.is_pos = 1;
-
- return frm;
- }
- }
-
- set_pos_profile_data() {
- if (this.company) {
- this.frm.doc.company = this.company;
- }
-
- if (!this.frm.doc.company) {
- return;
- }
-
- return new Promise(resolve => {
- return this.frm.call({
- doc: this.frm.doc,
- method: "set_missing_values",
- }).then((r) => {
- if(!r.exc) {
- if (!this.frm.doc.pos_profile) {
- frappe.dom.unfreeze();
- this.raise_exception_for_pos_profile();
- }
- this.frm.script_manager.trigger("update_stock");
- frappe.model.set_default_values(this.frm.doc);
- this.frm.cscript.calculate_taxes_and_totals();
-
- if (r.message) {
- this.frm.meta.default_print_format = r.message.print_format || "";
- this.frm.allow_edit_rate = r.message.allow_edit_rate;
- this.frm.allow_edit_discount = r.message.allow_edit_discount;
- this.frm.doc.campaign = r.message.campaign;
- this.frm.allow_print_before_pay = r.message.allow_print_before_pay;
- }
- }
-
- resolve();
- });
- });
- }
-
- prepare_menu() {
- var me = this;
- this.page.clear_menu();
-
- this.page.add_menu_item(__("Form View"), function () {
- frappe.model.sync(me.frm.doc);
- frappe.set_route("Form", me.frm.doc.doctype, me.frm.doc.name);
- });
-
- this.page.add_menu_item(__("POS Profile"), function () {
- frappe.set_route('List', 'POS Profile');
- });
-
- this.page.add_menu_item(__('POS Settings'), function() {
- frappe.set_route('Form', 'POS Settings');
- });
-
- this.page.add_menu_item(__('Change POS Profile'), function() {
- me.change_pos_profile();
- });
- this.page.add_menu_item(__('Close the POS'), function() {
- var voucher = frappe.model.get_new_doc('POS Closing Voucher');
- voucher.pos_profile = me.frm.doc.pos_profile;
- voucher.user = frappe.session.user;
- voucher.company = me.frm.doc.company;
- voucher.period_start_date = me.frm.doc.posting_date;
- voucher.period_end_date = me.frm.doc.posting_date;
- voucher.posting_date = me.frm.doc.posting_date;
- frappe.set_route('Form', 'POS Closing Voucher', voucher.name);
- });
- }
-
- set_form_action() {
- if(this.frm.doc.docstatus == 1 || (this.frm.allow_print_before_pay == 1 && this.frm.doc.items.length > 0)){
- this.page.set_secondary_action(__("Print"), async() => {
- if(this.frm.doc.docstatus != 1 ){
- await this.frm.save();
- }
- this.frm.print_preview.printit(true);
- });
- }
- if(this.frm.doc.items.length == 0){
- this.page.clear_secondary_action();
- }
-
- if (this.frm.doc.docstatus == 1) {
- this.page.set_primary_action(__("New"), () => {
- this.make_new_invoice();
- });
- this.page.add_menu_item(__("Email"), () => {
- this.frm.email_doc();
- });
- }
- }
-};
-
-const [Qty,Disc,Rate,Del,Pay] = [__("Qty"), __('Disc'), __('Rate'), __('Del'), __('Pay')];
-
-class POSCart {
- constructor({frm, wrapper, events}) {
- this.frm = frm;
- this.item_data = {};
- this.wrapper = wrapper;
- this.events = events;
- this.make();
- this.bind_events();
- }
-
- make() {
- this.make_dom();
- this.make_customer_field();
- this.make_pos_fields();
- this.make_loyalty_points();
- this.make_numpad();
- }
-
- make_dom() {
- this.wrapper.append(`
- `;
- }
-
- this.set_class();
-
- if(this.disable_btns) {
- this.disable_btns.forEach((btn) => {
- const $btn = this.get_btn(btn);
- $btn.prop("disabled", true)
- $btn.hover(() => {
- $btn.css('cursor','not-allowed');
- })
- })
- }
- }
-
- enable_buttons(btns) {
- btns.forEach((btn) => {
- const $btn = this.get_btn(btn);
- $btn.prop("disabled", false)
- $btn.hover(() => {
- $btn.css('cursor','pointer');
- })
- })
- }
-
- set_class() {
- for (const btn in this.add_class) {
- const class_name = this.add_class[btn];
- this.get_btn(btn).addClass(class_name);
- }
- }
-
- bind_events() {
- // bind click event
- const me = this;
- this.wrapper.on('click', '.num-col', function() {
- const $btn = $(this);
- const btn_value = $btn.attr('data-value');
- if (!me.disable_highlight.includes(btn_value)) {
- me.highlight_button($btn);
- }
- if (me.reset_btns.includes(btn_value)) {
- me.reset_value();
- } else {
- if (btn_value === me.del_btn) {
- me.value = me.value.substr(0, me.value.length - 1);
- } else {
- me.value += btn_value;
- }
- }
- me.onclick(btn_value);
- });
- }
-
- reset_value() {
- this.value = '';
- }
-
- get_value() {
- return flt(this.value);
- }
-
- get_btn(btn_value) {
- return this.wrapper.find(`.num-col[data-value="${btn_value}"]`);
- }
-
- highlight_button($btn) {
- $btn.addClass('highlight');
- setTimeout(() => $btn.removeClass('highlight'), 1000);
- }
-
- set_active(btn_value) {
- const $btn = this.get_btn(btn_value);
- this.wrapper.find('.num-col').removeClass('active');
- $btn.addClass('active');
- }
-
- set_inactive() {
- this.wrapper.find('.num-col').removeClass('active');
- }
-}
-
-class Payment {
- constructor({frm, events}) {
- this.frm = frm;
- this.events = events;
- this.make();
- this.bind_events();
- this.set_primary_action();
- }
-
- open_modal() {
- this.dialog.show();
- }
-
- make() {
- this.set_flag();
- this.dialog = new frappe.ui.Dialog({
- fields: this.get_fields(),
- width: 800,
- invoice_frm: this.frm
- });
-
- this.set_title();
-
- this.$body = this.dialog.body;
-
- this.numpad = new NumberPad({
- wrapper: $(this.$body).find('[data-fieldname="numpad"]'),
- button_array: [
- [1, 2, 3],
- [4, 5, 6],
- [7, 8, 9],
- [__('Del'), 0, '.'],
- ],
- onclick: () => {
- if(this.fieldname) {
- this.dialog.set_value(this.fieldname, this.numpad.get_value());
- }
- }
- });
- }
-
- set_title() {
- let title = __('Total Amount {0}',
- [format_currency(this.frm.doc.rounded_total || this.frm.doc.grand_total,
- this.frm.doc.currency)]);
-
- this.dialog.set_title(title);
- }
-
- bind_events() {
- var me = this;
- $(this.dialog.body).find('.input-with-feedback').focusin(function() {
- me.numpad.reset_value();
- me.fieldname = $(this).prop('dataset').fieldname;
- if (me.frm.doc.outstanding_amount > 0 &&
- !in_list(['write_off_amount', 'change_amount'], me.fieldname)) {
- me.frm.doc.payments.forEach((data) => {
- if (data.mode_of_payment == me.fieldname && !data.amount) {
- me.dialog.set_value(me.fieldname,
- me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate);
- return;
- }
- })
- }
- });
- }
-
- set_primary_action() {
- var me = this;
-
- this.dialog.set_primary_action(__("Submit"), function() {
- me.dialog.hide();
- me.events.submit_form();
- });
- }
-
- get_fields() {
- const me = this;
-
- let fields = this.frm.doc.payments.map(p => {
- return {
- fieldtype: 'Currency',
- label: __(p.mode_of_payment),
- options: me.frm.doc.currency,
- fieldname: p.mode_of_payment,
- default: p.amount,
- onchange: () => {
- const value = this.dialog.get_value(this.fieldname) || 0;
- me.update_payment_value(this.fieldname, value);
- }
- };
- });
-
- fields = fields.concat([
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'HTML',
- fieldname: 'numpad'
- },
- {
- fieldtype: 'Section Break',
- depends_on: 'eval: this.invoice_frm.doc.loyalty_program'
- },
- {
- fieldtype: 'Check',
- label: 'Redeem Loyalty Points',
- fieldname: 'redeem_loyalty_points',
- onchange: () => {
- me.update_cur_frm_value("redeem_loyalty_points", () => {
- frappe.flags.redeem_loyalty_points = false;
- me.update_loyalty_points();
- });
- }
- },
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'Int',
- fieldname: "loyalty_points",
- label: __("Loyalty Points"),
- depends_on: "redeem_loyalty_points",
- onchange: () => {
- me.update_cur_frm_value("loyalty_points", () => {
- frappe.flags.loyalty_points = false;
- me.update_loyalty_points();
- });
- }
- },
- {
- fieldtype: 'Currency',
- label: __("Loyalty Amount"),
- fieldname: "loyalty_amount",
- options: me.frm.doc.currency,
- read_only: 1,
- depends_on: "redeem_loyalty_points"
- },
- {
- fieldtype: 'Section Break',
- },
- {
- fieldtype: 'Currency',
- label: __("Write off Amount"),
- options: me.frm.doc.currency,
- fieldname: "write_off_amount",
- default: me.frm.doc.write_off_amount,
- onchange: () => {
- me.update_cur_frm_value('write_off_amount', () => {
- frappe.flags.change_amount = false;
- me.update_change_amount();
- });
- }
- },
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'Currency',
- label: __("Change Amount"),
- options: me.frm.doc.currency,
- fieldname: "change_amount",
- default: me.frm.doc.change_amount,
- onchange: () => {
- me.update_cur_frm_value('change_amount', () => {
- frappe.flags.write_off_amount = false;
- me.update_write_off_amount();
- });
- }
- },
- {
- fieldtype: 'Section Break',
- },
- {
- fieldtype: 'Currency',
- label: __("Paid Amount"),
- options: me.frm.doc.currency,
- fieldname: "paid_amount",
- default: me.frm.doc.paid_amount,
- read_only: 1
- },
- {
- fieldtype: 'Column Break',
- },
- {
- fieldtype: 'Currency',
- label: __("Outstanding Amount"),
- options: me.frm.doc.currency,
- fieldname: "outstanding_amount",
- default: me.frm.doc.outstanding_amount,
- read_only: 1
- },
- ]);
-
- return fields;
- }
-
- set_flag() {
- frappe.flags.write_off_amount = true;
- frappe.flags.change_amount = true;
- frappe.flags.loyalty_points = true;
- frappe.flags.redeem_loyalty_points = true;
- frappe.flags.payment_method = true;
- }
-
- update_cur_frm_value(fieldname, callback) {
- if (frappe.flags[fieldname]) {
- const value = this.dialog.get_value(fieldname);
- this.frm.set_value(fieldname, value)
- .then(() => {
- callback();
- });
- }
-
- frappe.flags[fieldname] = true;
- }
-
- update_payment_value(fieldname, value) {
- var me = this;
- $.each(this.frm.doc.payments, function(i, data) {
- if (__(data.mode_of_payment) == __(fieldname)) {
- frappe.model.set_value('Sales Invoice Payment', data.name, 'amount', value)
- .then(() => {
- me.update_change_amount();
- me.update_write_off_amount();
- });
- }
- });
- }
-
- update_change_amount() {
- this.dialog.set_value("change_amount", this.frm.doc.change_amount);
- this.show_paid_amount();
- }
-
- update_write_off_amount() {
- this.dialog.set_value("write_off_amount", this.frm.doc.write_off_amount);
- }
-
- show_paid_amount() {
- this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
- this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
- }
-
- update_payment_amount() {
- var me = this;
- $.each(this.frm.doc.payments, function(i, data) {
- console.log("setting the ", data.mode_of_payment, " for the value", data.amount);
- me.dialog.set_value(data.mode_of_payment, data.amount);
- });
- }
-
- update_loyalty_points() {
- if (this.dialog.get_value("redeem_loyalty_points")) {
- this.dialog.set_value("loyalty_points", this.frm.doc.loyalty_points);
- this.dialog.set_value("loyalty_amount", this.frm.doc.loyalty_amount);
- this.update_payment_amount();
- this.show_paid_amount();
- }
- }
-
-}
+ // online
+ wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
+ window.cur_pos = wrapper.pos;
+};
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.json b/erpnext/selling/page/point_of_sale/point_of_sale.json
index 6d2f5f2f8d53..99b86e42c25e 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.json
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.json
@@ -1,33 +1,33 @@
{
- "content": null,
- "creation": "2017-08-07 17:08:56.737947",
- "docstatus": 0,
- "doctype": "Page",
- "idx": 0,
- "modified": "2017-09-11 13:49:05.415211",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "point-of-sale",
- "owner": "Administrator",
- "page_name": "Point of Sale",
- "restrict_to_domain": "Retail",
+ "content": null,
+ "creation": "2020-01-28 22:05:44.819140",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2020-06-01 15:41:06.348380",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "point-of-sale",
+ "owner": "Administrator",
+ "page_name": "Point of Sale",
+ "restrict_to_domain": "Retail",
"roles": [
{
"role": "Accounts User"
- },
+ },
{
"role": "Accounts Manager"
- },
+ },
{
"role": "Sales User"
- },
+ },
{
"role": "Sales Manager"
}
- ],
- "script": null,
- "standard": "Yes",
- "style": null,
- "system_page": 0,
- "title": "Point of Sale"
+ ],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Point Of Sale"
}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index 1ae1fde588d8..f7b7ed8b89fc 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -6,6 +6,7 @@
from frappe.utils.nestedset import get_root_of
from frappe.utils import cint
from erpnext.accounts.doctype.pos_profile.pos_profile import get_item_groups
+from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_stock_availability
from six import string_types
@@ -43,6 +44,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
SELECT
name AS item_code,
item_name,
+ description,
stock_uom,
image AS item_image,
idx AS idx,
@@ -53,10 +55,11 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
disabled = 0
AND has_variants = 0
AND is_sales_item = 1
+ AND is_fixed_asset = 0
AND item_group in (SELECT name FROM `tabItem Group` WHERE lft >= {lft} AND rgt <= {rgt})
AND {condition}
ORDER BY
- idx desc
+ name asc
LIMIT
{start}, {page_length}"""
.format(
@@ -73,32 +76,14 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
fields = ["item_code", "price_list_rate", "currency"],
filters = {'price_list': price_list, 'item_code': ['in', items]})
- item_prices, bin_data = {}, {}
+ item_prices = {}
for d in item_prices_data:
item_prices[d.item_code] = d
- # prepare filter for bin query
- bin_filters = {'item_code': ['in', items]}
- if warehouse:
- bin_filters['warehouse'] = warehouse
- if display_items_in_stock:
- bin_filters['actual_qty'] = [">", 0]
-
- # query item bin
- bin_data = frappe.get_all(
- 'Bin', fields=['item_code', 'sum(actual_qty) as actual_qty'],
- filters=bin_filters, group_by='item_code'
- )
-
- # convert list of dict into dict as {item_code: actual_qty}
- bin_dict = {}
- for b in bin_data:
- bin_dict[b.get('item_code')] = b.get('actual_qty')
-
for item in items_data:
item_code = item.item_code
item_price = item_prices.get(item_code) or {}
- item_stock_qty = bin_dict.get(item_code)
+ item_stock_qty = get_stock_availability(item_code, warehouse)
if display_items_in_stock and not item_stock_qty:
pass
@@ -116,6 +101,13 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
'items': result
}
+ if len(res['items']) == 1:
+ res['items'][0].setdefault('serial_no', serial_no)
+ res['items'][0].setdefault('batch_no', batch_no)
+ res['items'][0].setdefault('barcode', barcode)
+
+ return res
+
if serial_no:
res.update({
'serial_no': serial_no
@@ -186,6 +178,73 @@ def item_group_query(doctype, txt, searchfield, start, page_len, filters):
{'txt': '%%%s%%' % txt})
@frappe.whitelist()
-def get_pos_fields():
- return frappe.get_all("POS Field", fields=["label", "fieldname",
- "fieldtype", "default_value", "reqd", "read_only", "options"])
+def check_opening_entry(user):
+ open_vouchers = frappe.db.get_all("POS Opening Entry",
+ filters = {
+ "user": user,
+ "pos_closing_entry": ["in", ["", None]],
+ "docstatus": 1
+ },
+ fields = ["name", "company", "pos_profile", "period_start_date"],
+ order_by = "period_start_date desc"
+ )
+
+ return open_vouchers
+
+@frappe.whitelist()
+def create_opening_voucher(pos_profile, company, balance_details):
+ import json
+ balance_details = json.loads(balance_details)
+
+ new_pos_opening = frappe.get_doc({
+ 'doctype': 'POS Opening Entry',
+ "period_start_date": frappe.utils.get_datetime(),
+ "posting_date": frappe.utils.getdate(),
+ "user": frappe.session.user,
+ "pos_profile": pos_profile,
+ "company": company,
+ })
+ new_pos_opening.set("balance_details", balance_details)
+ new_pos_opening.submit()
+
+ return new_pos_opening.as_dict()
+
+@frappe.whitelist()
+def get_past_order_list(search_term, status, limit=20):
+ fields = ['name', 'grand_total', 'currency', 'customer', 'posting_time', 'posting_date']
+ invoice_list = []
+
+ if search_term and status:
+ invoices_by_customer = frappe.db.get_all('POS Invoice', filters={
+ 'customer': ['like', '%{}%'.format(search_term)],
+ 'status': status
+ }, fields=fields)
+ invoices_by_name = frappe.db.get_all('POS Invoice', filters={
+ 'name': ['like', '%{}%'.format(search_term)],
+ 'status': status
+ }, fields=fields)
+
+ invoice_list = invoices_by_customer + invoices_by_name
+ elif status:
+ invoice_list = frappe.db.get_all('POS Invoice', filters={
+ 'status': status
+ }, fields=fields)
+
+ return invoice_list
+
+@frappe.whitelist()
+def set_customer_info(fieldname, customer, value=""):
+ if fieldname == 'loyalty_program':
+ frappe.db.set_value('Customer', customer, 'loyalty_program', value)
+
+ contact = frappe.get_cached_value('Customer', customer, 'customer_primary_contact')
+
+ if contact:
+ contact_doc = frappe.get_doc('Contact', contact)
+ if fieldname == 'email_id':
+ contact_doc.set('email_ids', [{ 'email_id': value, 'is_primary': 1}])
+ frappe.db.set_value('Customer', customer, 'email_id', value)
+ elif fieldname == 'mobile_no':
+ contact_doc.set('phone_nos', [{ 'phone': value, 'is_primary_mobile_no': 1}])
+ frappe.db.set_value('Customer', customer, 'mobile_no', value)
+ contact_doc.save()
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
new file mode 100644
index 000000000000..483ef78d64c1
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -0,0 +1,714 @@
+{% include "erpnext/selling/page/point_of_sale/onscan.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_selector.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_cart.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_item_details.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_payment.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_number_pad.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_past_order_list.js" %}
+{% include "erpnext/selling/page/point_of_sale/pos_past_order_summary.js" %}
+
+erpnext.PointOfSale.Controller = class {
+ constructor(wrapper) {
+ this.wrapper = $(wrapper).find('.layout-main-section');
+ this.page = wrapper.page;
+
+ this.load_assets();
+ }
+
+ load_assets() {
+ // after loading assets first check if opening entry has been made
+ frappe.require(['assets/erpnext/css/pos.css'], this.check_opening_entry.bind(this));
+ }
+
+ check_opening_entry() {
+ return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.check_opening_entry", { "user": frappe.session.user })
+ .then((r) => {
+ if (r.message.length) {
+ // assuming only one opening voucher is available for the current user
+ this.prepare_app_defaults(r.message[0]);
+ } else {
+ this.create_opening_voucher();
+ }
+ });
+ }
+
+ create_opening_voucher() {
+ const table_fields = [
+ { fieldname: "mode_of_payment", fieldtype: "Link", in_list_view: 1, label: "Mode of Payment", options: "Mode of Payment", reqd: 1 },
+ { fieldname: "opening_amount", fieldtype: "Currency", in_list_view: 1, label: "Opening Amount", options: "company:company_currency", reqd: 1 }
+ ];
+
+ const dialog = new frappe.ui.Dialog({
+ title: __('Create POS Opening Entry'),
+ fields: [
+ {
+ fieldtype: 'Link', label: __('Company'), default: frappe.defaults.get_default('company'),
+ options: 'Company', fieldname: 'company', reqd: 1
+ },
+ {
+ fieldtype: 'Link', label: __('POS Profile'),
+ options: 'POS Profile', fieldname: 'pos_profile', reqd: 1,
+ onchange: () => {
+ const pos_profile = dialog.fields_dict.pos_profile.get_value();
+ const company = dialog.fields_dict.company.get_value();
+ const user = frappe.session.user
+
+ if (!pos_profile || !company || !user) return;
+
+ // auto fetch last closing entry's balance details
+ frappe.db.get_list("POS Closing Entry", {
+ filters: { company, pos_profile, user },
+ limit: 1,
+ order_by: 'period_end_date desc'
+ }).then((res) => {
+ if (!res.length) return;
+ const pos_closing_entry = res[0];
+ frappe.db.get_doc("POS Closing Entry", pos_closing_entry.name).then(({ payment_reconciliation }) => {
+ dialog.fields_dict.balance_details.df.data = [];
+ payment_reconciliation.forEach(pay => {
+ const { mode_of_payment, closing_amount } = pay;
+ dialog.fields_dict.balance_details.df.data.push({
+ mode_of_payment: mode_of_payment
+ });
+ });
+ dialog.fields_dict.balance_details.grid.refresh();
+ });
+ });
+ }
+ },
+ {
+ fieldname: "balance_details",
+ fieldtype: "Table",
+ label: "Opening Balance Details",
+ cannot_add_rows: false,
+ in_place_edit: true,
+ reqd: 1,
+ data: [],
+ fields: table_fields
+ }
+ ],
+ primary_action: ({ company, pos_profile, balance_details }) => {
+ if (!balance_details.length) {
+ frappe.show_alert({
+ message: __("Please add Mode of payments and opening balance details."),
+ indicator: 'red'
+ })
+ frappe.utils.play_sound("error");
+ return;
+ }
+ frappe.dom.freeze();
+ return frappe.call("erpnext.selling.page.point_of_sale.point_of_sale.create_opening_voucher",
+ { pos_profile, company, balance_details })
+ .then((r) => {
+ frappe.dom.unfreeze();
+ dialog.hide();
+ if (r.message) {
+ this.prepare_app_defaults(r.message);
+ }
+ })
+ },
+ primary_action_label: __('Submit')
+ });
+ dialog.show();
+ }
+
+ prepare_app_defaults(data) {
+ this.pos_opening = data.name;
+ this.company = data.company;
+ this.pos_profile = data.pos_profile;
+ this.pos_opening_time = data.period_start_date;
+
+ frappe.db.get_value('Stock Settings', undefined, 'allow_negative_stock').then(({ message }) => {
+ this.allow_negative_stock = flt(message.allow_negative_stock) || false;
+ });
+
+ frappe.db.get_doc("POS Profile", this.pos_profile).then((profile) => {
+ this.customer_groups = profile.customer_groups.map(group => group.customer_group);
+ this.cart.make_customer_selector();
+ });
+
+ this.item_stock_map = {};
+
+ this.make_app();
+ }
+
+ set_opening_entry_status() {
+ this.page.set_title_sub(
+ `
+
+ Opened at ${moment(this.pos_opening_time).format("Do MMMM, h:mma")}
+
+ `);
+ }
+
+ make_app() {
+ return frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => {
+ this.set_opening_entry_status();
+ this.prepare_dom();
+ this.prepare_components();
+ this.prepare_menu();
+ },
+ () => this.make_new_invoice(),
+ () => frappe.dom.unfreeze(),
+ () => this.page.set_title(__('Point of Sale Beta')),
+ ]);
+ }
+
+ prepare_dom() {
+ this.wrapper.append(`
+ `
+ );
+
+ this.$components_wrapper = this.wrapper.find('.app');
+ }
+
+ prepare_components() {
+ this.init_item_selector();
+ this.init_item_details();
+ this.init_item_cart();
+ this.init_payments();
+ this.init_recent_order_list();
+ this.init_order_summary();
+ }
+
+ prepare_menu() {
+ var me = this;
+ this.page.clear_menu();
+
+ this.page.add_menu_item(__("Form View"), function () {
+ frappe.model.sync(me.frm.doc);
+ frappe.set_route("Form", me.frm.doc.doctype, me.frm.doc.name);
+ });
+
+ this.page.add_menu_item(__("Toggle Recent Orders"), () => {
+ const show = this.recent_order_list.$component.hasClass('d-none');
+ this.toggle_recent_order_list(show);
+ });
+
+ this.page.add_menu_item(__("Save as Draft"), this.save_draft_invoice.bind(this));
+
+ frappe.ui.keys.on("ctrl+s", this.save_draft_invoice.bind(this));
+
+ this.page.add_menu_item(__('Close the POS'), this.close_pos.bind(this));
+
+ frappe.ui.keys.on("shift+ctrl+s", this.close_pos.bind(this));
+ }
+
+ save_draft_invoice() {
+ if (!this.$components_wrapper.is(":visible")) return;
+
+ if (this.frm.doc.items.length == 0) {
+ frappe.show_alert({
+ message:__("You must add atleast one item to save it as draft."),
+ indicator:'red'
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ this.frm.save(undefined, undefined, undefined, () => {
+ frappe.show_alert({
+ message:__("There was an error saving the document."),
+ indicator:'red'
+ });
+ frappe.utils.play_sound("error");
+ }).then(() => {
+ frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => this.make_new_invoice(),
+ () => frappe.dom.unfreeze(),
+ ]);
+ })
+ }
+
+ close_pos() {
+ if (!this.$components_wrapper.is(":visible")) return;
+
+ let voucher = frappe.model.get_new_doc('POS Closing Entry');
+ voucher.pos_profile = this.frm.doc.pos_profile;
+ voucher.user = frappe.session.user;
+ voucher.company = this.frm.doc.company;
+ voucher.pos_opening_entry = this.pos_opening;
+ voucher.period_end_date = frappe.datetime.now_datetime();
+ voucher.posting_date = frappe.datetime.now_date();
+ frappe.set_route('Form', 'POS Closing Entry', voucher.name);
+ }
+
+ init_item_selector() {
+ this.item_selector = new erpnext.PointOfSale.ItemSelector({
+ wrapper: this.$components_wrapper,
+ pos_profile: this.pos_profile,
+ events: {
+ item_selected: args => this.on_cart_update(args),
+
+ get_frm: () => this.frm || {},
+
+ get_allowed_item_group: () => this.item_groups
+ }
+ })
+ }
+
+ init_item_cart() {
+ this.cart = new erpnext.PointOfSale.ItemCart({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ cart_item_clicked: (item_code, batch_no, uom) => {
+ const item_row = this.frm.doc.items.find(
+ i => i.item_code === item_code
+ && i.uom === uom
+ && (!batch_no || (batch_no && i.batch_no === batch_no))
+ );
+ this.item_details.toggle_item_details_section(item_row);
+ },
+
+ numpad_event: (value, action) => this.update_item_field(value, action),
+
+ checkout: () => this.payment.checkout(),
+
+ edit_cart: () => this.payment.edit_cart(),
+
+ customer_details_updated: (details) => {
+ this.customer_details = details;
+ // will add/remove LP payment method
+ this.payment.render_loyalty_points_payment_mode();
+ },
+
+ get_allowed_customer_group: () => this.customer_groups
+ }
+ })
+ }
+
+ init_item_details() {
+ this.item_details = new erpnext.PointOfSale.ItemDetails({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ toggle_item_selector: (minimize) => {
+ this.item_selector.resize_selector(minimize);
+ this.cart.toggle_numpad(minimize);
+ },
+
+ form_updated: async (cdt, cdn, fieldname, value) => {
+ const item_row = frappe.model.get_doc(cdt, cdn);
+ if (item_row && item_row[fieldname] != value) {
+
+ if (fieldname === 'qty' && flt(value) == 0) {
+ this.remove_item_from_cart();
+ return;
+ }
+
+ const { item_code, batch_no, uom } = this.item_details.current_item;
+ const event = {
+ field: fieldname,
+ value,
+ item: { item_code, batch_no, uom }
+ }
+ return this.on_cart_update(event)
+ }
+ },
+
+ item_field_focused: (fieldname) => {
+ this.cart.toggle_numpad_field_edit(fieldname);
+ },
+ set_value_in_current_cart_item: (selector, value) => {
+ this.cart.update_selector_value_in_cart_item(selector, value, this.item_details.current_item);
+ },
+ clone_new_batch_item_in_frm: (batch_serial_map, current_item) => {
+ // called if serial nos are 'auto_selected' and if those serial nos belongs to multiple batches
+ // for each unique batch new item row is added in the form & cart
+ Object.keys(batch_serial_map).forEach(batch => {
+ const { item_code, batch_no } = current_item;
+ const item_to_clone = this.frm.doc.items.find(i => i.item_code === item_code && i.batch_no === batch_no);
+ const new_row = this.frm.add_child("items", { ...item_to_clone });
+ // update new serialno and batch
+ new_row.batch_no = batch;
+ new_row.serial_no = batch_serial_map[batch].join(`\n`);
+ new_row.qty = batch_serial_map[batch].length;
+ this.frm.doc.items.forEach(row => {
+ if (item_code === row.item_code) {
+ this.update_cart_html(row);
+ }
+ });
+ })
+ },
+ remove_item_from_cart: () => this.remove_item_from_cart(),
+ get_item_stock_map: () => this.item_stock_map,
+ close_item_details: () => {
+ this.item_details.toggle_item_details_section(undefined);
+ this.cart.prev_action = undefined;
+ this.cart.toggle_item_highlight();
+ },
+ get_available_stock: (item_code, warehouse) => this.get_available_stock(item_code, warehouse)
+ }
+ });
+ }
+
+ init_payments() {
+ this.payment = new erpnext.PointOfSale.Payment({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm || {},
+
+ get_customer_details: () => this.customer_details || {},
+
+ toggle_other_sections: (show) => {
+ if (show) {
+ this.item_details.$component.hasClass('d-none') ? '' : this.item_details.$component.addClass('d-none');
+ this.item_selector.$component.addClass('d-none');
+ } else {
+ this.item_selector.$component.removeClass('d-none');
+ }
+ },
+
+ submit_invoice: () => {
+ this.frm.savesubmit()
+ .then((r) => {
+ // this.set_invoice_status();
+ this.toggle_components(false);
+ this.order_summary.toggle_component(true);
+ this.order_summary.load_summary_of(this.frm.doc, true);
+ frappe.show_alert({
+ indicator: 'green',
+ message: __(`POS invoice ${r.doc.name} created succesfully`)
+ });
+ });
+ }
+ }
+ });
+ }
+
+ init_recent_order_list() {
+ this.recent_order_list = new erpnext.PointOfSale.PastOrderList({
+ wrapper: this.$components_wrapper,
+ events: {
+ open_invoice_data: (name) => {
+ frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ this.order_summary.load_summary_of(doc);
+ });
+ },
+ reset_summary: () => this.order_summary.show_summary_placeholder()
+ }
+ })
+ }
+
+ init_order_summary() {
+ this.order_summary = new erpnext.PointOfSale.PastOrderSummary({
+ wrapper: this.$components_wrapper,
+ events: {
+ get_frm: () => this.frm,
+
+ process_return: (name) => {
+ this.recent_order_list.toggle_component(false);
+ frappe.db.get_doc('POS Invoice', name).then((doc) => {
+ frappe.run_serially([
+ () => this.make_return_invoice(doc),
+ () => this.cart.load_invoice(),
+ () => this.item_selector.toggle_component(true)
+ ]);
+ });
+ },
+ edit_order: (name) => {
+ this.recent_order_list.toggle_component(false);
+ frappe.run_serially([
+ () => this.frm.refresh(name),
+ () => this.cart.load_invoice(),
+ () => this.item_selector.toggle_component(true)
+ ]);
+ },
+ new_order: () => {
+ frappe.run_serially([
+ () => frappe.dom.freeze(),
+ () => this.make_new_invoice(),
+ () => this.item_selector.toggle_component(true),
+ () => frappe.dom.unfreeze(),
+ ]);
+ }
+ }
+ })
+ }
+
+
+
+ toggle_recent_order_list(show) {
+ this.toggle_components(!show);
+ this.recent_order_list.toggle_component(show);
+ this.order_summary.toggle_component(show);
+ }
+
+ toggle_components(show) {
+ this.cart.toggle_component(show);
+ this.item_selector.toggle_component(show);
+
+ // do not show item details or payment if recent order is toggled off
+ !show ? (this.item_details.toggle_component(false) || this.payment.toggle_component(false)) : '';
+ }
+
+ make_new_invoice() {
+ return frappe.run_serially([
+ () => this.make_sales_invoice_frm(),
+ () => this.set_pos_profile_data(),
+ () => this.set_pos_profile_status(),
+ () => this.cart.load_invoice(),
+ ]);
+ }
+
+ make_sales_invoice_frm() {
+ const doctype = 'POS Invoice';
+ return new Promise(resolve => {
+ if (this.frm) {
+ this.frm = this.get_new_frm(this.frm);
+ this.frm.doc.items = [];
+ this.frm.doc.is_pos = 1
+ resolve();
+ } else {
+ frappe.model.with_doctype(doctype, () => {
+ this.frm = this.get_new_frm();
+ this.frm.doc.items = [];
+ this.frm.doc.is_pos = 1
+ resolve();
+ });
+ }
+ });
+ }
+
+ get_new_frm(_frm) {
+ const doctype = 'POS Invoice';
+ const page = $('
-
- `);
-
-
- this.$cart_items = this.wrapper.find('.cart-items');
- this.$empty_state = this.wrapper.find('.cart-items .empty-state');
- this.$taxes_and_totals = this.wrapper.find('.taxes-and-totals');
- this.$discount_amount = this.wrapper.find('.discount-amount');
- this.$grand_total = this.wrapper.find('.grand-total');
- this.$qty_total = this.wrapper.find('.quantity-total');
- // this.$loyalty_button = this.wrapper.find('.loyalty-button');
-
- // this.$loyalty_button.on('click', () => {
- // this.loyalty_button.show();
- // })
-
- this.toggle_taxes_and_totals(false);
- this.$grand_total.on('click', () => {
- this.toggle_taxes_and_totals();
- });
- }
-
- reset() {
- this.$cart_items.find('.list-item').remove();
- this.$empty_state.show();
- this.$taxes_and_totals.html(this.get_taxes_and_totals());
- this.numpad && this.numpad.reset_value();
- this.customer_field.set_value("");
- this.frm.msgbox = "";
-
- let total_item_qty = 0.0;
- this.frm.set_value("pos_total_qty",total_item_qty);
-
- this.$discount_amount.find('input:text').val('');
- this.wrapper.find('.grand-total-value').text(
- format_currency(this.frm.doc.grand_total, this.frm.currency));
- this.wrapper.find('.rounded-total-value').text(
- format_currency(this.frm.doc.rounded_total, this.frm.currency));
- this.$qty_total.find(".quantity-total").text(total_item_qty);
-
- const customer = this.frm.doc.customer;
- this.customer_field.set_value(customer);
-
- if (this.numpad) {
- const disable_btns = this.disable_numpad_control()
- const enable_btns = [__('Rate'), __('Disc')]
-
- if (disable_btns) {
- enable_btns.filter(btn => !disable_btns.includes(btn))
- }
-
- this.numpad.enable_buttons(enable_btns);
- }
- }
-
- reset_pos_field_value() {
- let value = '';
- if (this.custom_pos_fields) {
- this.custom_pos_fields.forEach(r => {
- value = this.frm.doc[r.fieldname] || r.default_value || '';
-
- if (this.fields) {
- this.fields[r.fieldname].set_value(value);
- }
- })
- }
-
- this.wrapper.find('.pos-fields').toggle(false);
- this.wrapper.find('.pos-fields-octicon').toggle(true);
- }
-
- get_grand_total() {
- let total = this.get_total_template('Grand Total', 'grand-total-value');
-
- if (!cint(frappe.sys_defaults.disable_rounded_total)) {
- total += this.get_total_template('Rounded Total', 'rounded-total-value');
- }
-
- return total;
- }
-
- get_item_qty_total() {
- let total = this.get_total_template('Total Qty', 'quantity-total');
- return total;
- }
-
- get_total_template(label, class_name) {
- return `
-
-
-
-
-
-
-
-
-
- ${__('Item Name')}
- ${__('Quantity')}
- ${__('Discount')}
- ${__('Rate')}
-
-
-
- ${__('No Items added to cart')}
-
-
- ${this.get_taxes_and_totals()}
-
- `+
- (!this.frm.allow_edit_discount ? `` : `${this.get_discount_amount()}`)+
- `
-
- ${this.get_grand_total()}
-
-
- ${this.get_item_qty_total()}
-
-
-
-
-
-
-
-
-
- `;
- }
-
- get_discount_amount() {
- const get_currency_symbol = window.get_currency_symbol;
-
- return `
- ${__(label)}
- 0.00
-
-
- `;
- }
-
- get_taxes_and_totals() {
- return `
- ${__('Discount')}
-
-
-
-
-
-
- ${__('Net Total')}
- 0.00
-
-
- `;
- }
-
- toggle_taxes_and_totals(flag) {
- if (flag !== undefined) {
- this.tax_area_is_shown = flag;
- } else {
- this.tax_area_is_shown = !this.tax_area_is_shown;
- }
-
- this.$taxes_and_totals.toggle(this.tax_area_is_shown);
- this.$discount_amount.toggle(this.tax_area_is_shown);
- }
-
- update_taxes_and_totals() {
- if (!this.frm.doc.taxes) { return; }
-
- const currency = this.frm.doc.currency;
- this.frm.refresh_field('taxes');
-
- // Update totals
- this.$taxes_and_totals.find('.net-total')
- .html(format_currency(this.frm.doc.total, currency));
-
- // Update taxes
- const taxes_html = this.frm.doc.taxes.map(tax => {
- return `
- ${__('Taxes')}
- 0.00
-
- ${tax.description}
-
- ${format_currency(tax.tax_amount, currency)}
-
-
- `;
- }).join("");
- this.$taxes_and_totals.find('.taxes').html(taxes_html);
- }
-
- update_grand_total() {
- this.$grand_total.find('.grand-total-value').text(
- format_currency(this.frm.doc.grand_total, this.frm.currency)
- );
-
- this.$grand_total.find('.rounded-total-value').text(
- format_currency(this.frm.doc.rounded_total, this.frm.currency)
- );
- }
-
- update_qty_total() {
- var total_item_qty = 0;
- $.each(this.frm.doc["items"] || [], function (i, d) {
- if (d.qty > 0) {
- total_item_qty += d.qty;
- }
- });
- this.$qty_total.find('.quantity-total').text(total_item_qty);
- this.frm.set_value("pos_total_qty",total_item_qty);
- }
-
- make_customer_field() {
- this.customer_field = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Link',
- label: 'Customer',
- fieldname: 'customer',
- options: 'Customer',
- reqd: 1,
- get_query: function() {
- return {
- query: 'erpnext.controllers.queries.customer_query'
- }
- },
- onchange: () => {
- this.events.on_customer_change(this.customer_field.get_value());
- this.events.get_loyalty_details();
- }
- },
- parent: this.wrapper.find('.customer-field'),
- render_input: true
- });
-
- this.customer_field.set_value(this.frm.doc.customer);
- }
-
- make_pos_fields() {
- const me = this;
-
- this.fields = {};
- this.wrapper.find('.pos-fields-octicon, .more-fields-section').click(() => {
- this.wrapper.find('.pos-fields').toggle();
- this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
- });
- this.wrapper.find('.pos-fields').toggle(false);
-
- return new Promise(res => {
- frappe.call({
- method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_fields",
- freeze: true,
- }).then(r => {
- if(r.message.length) {
- this.wrapper.find('.pos-field-section').css('display','block');
- this.custom_pos_fields = r.message;
- if (r.message.length < 3) {
- this.wrapper.find('.pos-fields').toggle(true);
- this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
- }
-
- r.message.forEach(field => {
- this.fields[field.fieldname] = frappe.ui.form.make_control({
- df: {
- fieldtype: field.fieldtype,
- label: field.label,
- fieldname: field.fieldname,
- options: field.options,
- reqd: field.reqd || 0,
- read_only: field.read_only || 0,
- default: field.default_value,
- onchange: function() {
- if (this.value) {
- me.frm.set_value(this.df.fieldname, this.value);
- }
- },
- get_query: () => {
- return this.get_query_for_pos_fields(field.fieldname)
- },
- },
- parent: this.wrapper.find('.pos-fields'),
- render_input: true
- });
-
- if (this.frm.doc[field.fieldname]) {
- this.fields[field.fieldname].set_value(this.frm.doc[field.fieldname]);
- }
- });
- }
- });
- });
- }
-
- get_query_for_pos_fields(field) {
- if (this.frm.fields_dict && this.frm.fields_dict[field]
- && this.frm.fields_dict[field].get_query) {
- return this.frm.fields_dict[field].get_query(this.frm.doc);
- }
- }
-
- make_loyalty_points() {
- this.available_loyalty_points = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Int',
- label: 'Available Loyalty Points',
- read_only: 1,
- fieldname: 'available_loyalty_points'
- },
- parent: this.wrapper.find('.loyalty-program-field')
- });
- this.available_loyalty_points.set_value(this.frm.doc.loyalty_points);
- }
-
-
- disable_numpad_control() {
- let disabled_btns = [];
- if(!this.frm.allow_edit_rate) {
- disabled_btns.push(__('Rate'));
- }
- if(!this.frm.allow_edit_discount) {
- disabled_btns.push(__('Disc'));
- }
- return disabled_btns;
- }
-
-
- make_numpad() {
-
- var pay_class = {}
- pay_class[__('Pay')]='brand-primary'
- this.numpad = new NumberPad({
- button_array: [
- [1, 2, 3, Qty],
- [4, 5, 6, Disc],
- [7, 8, 9, Rate],
- [Del, 0, '.', Pay]
- ],
- add_class: pay_class,
- disable_highlight: [Qty, Disc, Rate, Pay],
- reset_btns: [Qty, Disc, Rate, Pay],
- del_btn: Del,
- disable_btns: this.disable_numpad_control(),
- wrapper: this.wrapper.find('.number-pad-container'),
- onclick: (btn_value) => {
- // on click
-
- if (!this.selected_item && btn_value !== Pay) {
- frappe.show_alert({
- indicator: 'red',
- message: __('Please select an item in the cart')
- });
- return;
- }
- if ([Qty, Disc, Rate].includes(btn_value)) {
- this.set_input_active(btn_value);
- } else if (btn_value !== Pay) {
- if (!this.selected_item.active_field) {
- frappe.show_alert({
- indicator: 'red',
- message: __('Please select a field to edit from numpad')
- });
- return;
- }
-
- if (this.selected_item.active_field == 'discount_percentage' && this.numpad.get_value() > cint(100)) {
- frappe.show_alert({
- indicator: 'red',
- message: __('Discount amount cannot be greater than 100%')
- });
- this.numpad.reset_value();
- } else {
- const item_code = unescape(this.selected_item.attr('data-item-code'));
- const batch_no = this.selected_item.attr('data-batch-no');
- const field = this.selected_item.active_field;
- const value = this.numpad.get_value();
-
- this.events.on_field_change(item_code, field, value, batch_no);
- }
- }
-
- this.events.on_numpad(btn_value);
- }
- });
- }
-
- set_input_active(btn_value) {
- this.selected_item.removeClass('qty disc rate');
-
- this.numpad.set_active(btn_value);
- if (btn_value === Qty) {
- this.selected_item.addClass('qty');
- this.selected_item.active_field = 'qty';
- } else if (btn_value == Disc) {
- this.selected_item.addClass('disc');
- this.selected_item.active_field = 'discount_percentage';
- } else if (btn_value == Rate) {
- this.selected_item.addClass('rate');
- this.selected_item.active_field = 'rate';
- }
- }
-
- add_item(item) {
- this.$empty_state.hide();
-
- if (this.exists(item.item_code, item.batch_no)) {
- // update quantity
- this.update_item(item);
- } else if (flt(item.qty) > 0.0) {
- // add to cart
- const $item = $(this.get_item_html(item));
- $item.appendTo(this.$cart_items);
- }
- this.highlight_item(item.item_code);
- }
-
- update_item(item) {
- const item_selector = item.batch_no ?
- `[data-batch-no="${item.batch_no}"]` : `[data-item-code="${escape(item.item_code)}"]`;
-
- const $item = this.$cart_items.find(item_selector);
-
- if(item.qty > 0) {
- const is_stock_item = this.get_item_details(item.item_code).is_stock_item;
- const indicator_class = (!is_stock_item || item.actual_qty >= item.qty) ? 'green' : 'red';
- const remove_class = indicator_class == 'green' ? 'red' : 'green';
-
- $item.find('.quantity input').val(item.qty);
- $item.find('.discount').text(item.discount_percentage + '%');
- $item.find('.rate').text(format_currency(item.rate, this.frm.doc.currency));
- $item.addClass(indicator_class);
- $item.removeClass(remove_class);
- } else {
- $item.remove();
- }
- }
-
- get_item_html(item) {
- const is_stock_item = this.get_item_details(item.item_code).is_stock_item;
- const rate = format_currency(item.rate, this.frm.doc.currency);
- const indicator_class = (!is_stock_item || item.actual_qty >= item.qty) ? 'green' : 'red';
- const batch_no = item.batch_no || '';
-
- return `
-
-
- `;
-
- function get_quantity_html(value) {
- return `
-
- ${item.item_name}
-
-
- ${get_quantity_html(item.qty)}
-
-
- ${item.discount_percentage}%
-
-
- ${rate}
-
-
-
-
-
-
-
-
-
-
-
-
- `;
- }
- }
-
- get_item_details(item_code) {
- if (!this.item_data[item_code]) {
- this.item_data[item_code] = this.events.get_item_details(item_code);
- }
-
- return this.item_data[item_code];
- }
-
- exists(item_code, batch_no) {
- const is_exists = batch_no ?
- `[data-batch-no="${batch_no}"]` : `[data-item-code="${escape(item_code)}"]`;
-
- let $item = this.$cart_items.find(is_exists);
-
- return $item.length > 0;
- }
-
- highlight_item(item_code) {
- const $item = this.$cart_items.find(`[data-item-code="${escape(item_code)}"]`);
- $item.addClass('highlight');
- setTimeout(() => $item.removeClass('highlight'), 1000);
- }
-
- scroll_to_item(item_code) {
- const $item = this.$cart_items.find(`[data-item-code="${escape(item_code)}"]`);
- if ($item.length === 0) return;
- const scrollTop = $item.offset().top - this.$cart_items.offset().top + this.$cart_items.scrollTop();
- this.$cart_items.animate({ scrollTop });
- }
-
- bind_events() {
- const me = this;
- const events = this.events;
-
- // quantity change
- this.$cart_items.on('click',
- '[data-action="increment"], [data-action="decrement"]', function() {
- const $btn = $(this);
- const $item = $btn.closest('.list-item[data-item-code]');
- const item_code = unescape($item.attr('data-item-code'));
- const action = $btn.attr('data-action');
-
- if(action === 'increment') {
- events.on_field_change(item_code, 'qty', '+1');
- } else if(action === 'decrement') {
- events.on_field_change(item_code, 'qty', '-1');
- }
- });
-
- this.$cart_items.on('change', '.quantity input', function() {
- const $input = $(this);
- const $item = $input.closest('.list-item[data-item-code]');
- const item_code = unescape($item.attr('data-item-code'));
- events.on_field_change(item_code, 'qty', flt($input.val()));
- });
-
- // current item
- this.$cart_items.on('click', '.list-item', function() {
- me.set_selected_item($(this));
- });
-
- this.wrapper.find('.additional_discount_percentage').on('change', (e) => {
- const discount_percentage = flt(e.target.value,
- precision("additional_discount_percentage"));
-
- frappe.model.set_value(this.frm.doctype, this.frm.docname,
- 'additional_discount_percentage', discount_percentage)
- .then(() => {
- let discount_wrapper = this.wrapper.find('.discount_amount');
- discount_wrapper.val(flt(this.frm.doc.discount_amount,
- precision('discount_amount')));
- discount_wrapper.trigger('change');
- });
- });
-
- this.wrapper.find('.discount_amount').on('change', (e) => {
- const discount_amount = flt(e.target.value, precision('discount_amount'));
- frappe.model.set_value(this.frm.doctype, this.frm.docname,
- 'discount_amount', discount_amount);
- this.frm.trigger('discount_amount')
- .then(() => {
- this.update_discount_fields();
- this.update_taxes_and_totals();
- this.update_grand_total();
- });
- });
- }
-
- update_discount_fields() {
- let discount_wrapper = this.wrapper.find('.additional_discount_percentage');
- let discount_amt_wrapper = this.wrapper.find('.discount_amount');
- discount_wrapper.val(flt(this.frm.doc.additional_discount_percentage,
- precision('additional_discount_percentage')));
- discount_amt_wrapper.val(flt(this.frm.doc.discount_amount,
- precision('discount_amount')));
- }
-
- set_selected_item($item) {
- this.selected_item = $item;
- this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
- this.selected_item.addClass('current-item');
- this.events.on_select_change();
- }
-
- unselect_all() {
- this.$cart_items.find('.list-item').removeClass('current-item qty disc rate');
- this.selected_item = null;
- this.events.on_select_change();
- }
-}
-
-class POSItems {
- constructor({wrapper, frm, events}) {
- this.wrapper = wrapper;
- this.frm = frm;
- this.items = {};
- this.events = events;
- this.currency = this.frm.doc.currency;
-
- frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name", (r) => {
- this.parent_item_group = r.name;
- this.make_dom();
- this.make_fields();
-
- this.init_clusterize();
- this.bind_events();
- this.load_items_data();
- })
- }
-
- load_items_data() {
- // bootstrap with 20 items
- this.get_items()
- .then(({ items }) => {
- this.all_items = items;
- this.items = items;
- this.render_items(items);
- });
- }
-
- reset_items() {
- this.wrapper.find('.pos-items').empty();
- this.init_clusterize();
- this.load_items_data();
- }
-
- make_dom() {
- this.wrapper.html(`
-
-
-
-
-
-
-
-
- `);
-
- this.items_wrapper = this.wrapper.find('.items-wrapper');
- this.items_wrapper.append(`
-
-
- `);
- }
-
- make_fields() {
- // Search field
- const me = this;
- this.search_field = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Data',
- label: __('Search Item (Ctrl + i)'),
- placeholder: __('Search by item code, serial number, batch no or barcode')
- },
- parent: this.wrapper.find('.search-field'),
- render_input: true,
- });
-
- frappe.ui.keys.on('ctrl+i', () => {
- this.search_field.set_focus();
- });
-
- this.search_field.$input.on('input', (e) => {
- clearTimeout(this.last_search);
- this.last_search = setTimeout(() => {
- const search_term = e.target.value;
- const item_group = this.item_group_field ?
- this.item_group_field.get_value() : '';
-
- this.filter_items({ search_term:search_term, item_group: item_group});
- }, 300);
- });
-
- this.item_group_field = frappe.ui.form.make_control({
- df: {
- fieldtype: 'Link',
- label: 'Item Group',
- options: 'Item Group',
- default: me.parent_item_group,
- onchange: () => {
- const item_group = this.item_group_field.get_value();
- if (item_group) {
- this.filter_items({ item_group: item_group });
- }
- },
- get_query: () => {
- return {
- query: 'erpnext.selling.page.point_of_sale.point_of_sale.item_group_query',
- filters: {
- pos_profile: this.frm.doc.pos_profile
- }
- };
- }
- },
- parent: this.wrapper.find('.item-group-field'),
- render_input: true
- });
- }
-
- init_clusterize() {
- this.clusterize = new Clusterize({
- scrollElem: this.wrapper.find('.pos-items-wrapper')[0],
- contentElem: this.wrapper.find('.pos-items')[0],
- rows_in_block: 6
- });
- }
-
- render_items(items) {
- let _items = items || this.items;
-
- const all_items = Object.values(_items).map(item => this.get_item_html(item));
- let row_items = [];
-
- const row_container = '
-
- ';
- let curr_row = row_container;
-
- for (let i=0; i < all_items.length; i++) {
- // wrap 4 items in a div to emulate
- // a row for clusterize
- if(i % 4 === 0 && i !== 0) {
- curr_row += '
';
- row_items.push(curr_row);
- curr_row = row_container;
- }
- curr_row += all_items[i];
-
- if(i == all_items.length - 1) {
- row_items.push(curr_row);
- }
- }
-
- this.clusterize.update(row_items);
- }
-
- filter_items({ search_term='', item_group=this.parent_item_group }={}) {
- if (search_term) {
- search_term = search_term.toLowerCase();
-
- // memoize
- this.search_index = this.search_index || {};
- if (this.search_index[search_term]) {
- const items = this.search_index[search_term];
- this.items = items;
- this.render_items(items);
- this.set_item_in_the_cart(items);
- return;
- }
- } else if (item_group == this.parent_item_group) {
- this.items = this.all_items;
- return this.render_items(this.all_items);
- }
-
- this.get_items({search_value: search_term, item_group })
- .then(({ items, serial_no, batch_no, barcode }) => {
- if (search_term && !barcode) {
- this.search_index[search_term] = items;
- }
-
- this.items = items;
- this.render_items(items);
- this.set_item_in_the_cart(items, serial_no, batch_no, barcode);
- });
- }
-
- set_item_in_the_cart(items, serial_no, batch_no, barcode) {
- if (serial_no) {
- this.events.update_cart(items[0].item_code,
- 'serial_no', serial_no);
- this.reset_search_field();
- return;
- }
-
- if (batch_no) {
- this.events.update_cart(items[0].item_code,
- 'batch_no', batch_no);
- this.reset_search_field();
- return;
- }
-
- if (items.length === 1 && (serial_no || batch_no || barcode)) {
- this.events.update_cart(items[0].item_code,
- 'qty', '+1');
- this.reset_search_field();
- }
- }
-
- reset_search_field() {
- this.search_field.set_value('');
- this.search_field.$input.trigger("input");
- }
-
- bind_events() {
- var me = this;
- this.wrapper.on('click', '.pos-item-wrapper', function() {
- const $item = $(this);
- const item_code = unescape($item.attr('data-item-code'));
- me.events.update_cart(item_code, 'qty', '+1');
- });
- }
-
- get(item_code) {
- let item = {};
- this.items.map(data => {
- if (data.item_code === item_code) {
- item = data;
- }
- })
-
- return item
- }
-
- get_all() {
- return this.items;
- }
-
- get_item_html(item) {
- const price_list_rate = format_currency(item.price_list_rate, this.currency);
- const { item_code, item_name, item_image} = item;
- const item_title = item_name || item_code;
-
- const template = `
-
-
- `;
-
- return template;
- }
-
- get_items({start = 0, page_length = 40, search_value='', item_group=this.parent_item_group}={}) {
- const price_list = this.frm.doc.selling_price_list;
- return new Promise(res => {
- frappe.call({
- method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
- freeze: true,
- args: {
- start,
- page_length,
- price_list,
- item_group,
- search_value,
- pos_profile: this.frm.doc.pos_profile
- }
- }).then(r => {
- // const { items, serial_no, batch_no } = r.message;
-
- // this.serial_no = serial_no || "";
- res(r.message);
- });
- });
- }
-}
-
-class NumberPad {
- constructor({
- wrapper, onclick, button_array,
- add_class={}, disable_highlight=[],
- reset_btns=[], del_btn='', disable_btns
- }) {
- this.wrapper = wrapper;
- this.onclick = onclick;
- this.button_array = button_array;
- this.add_class = add_class;
- this.disable_highlight = disable_highlight;
- this.reset_btns = reset_btns;
- this.del_btn = del_btn;
- this.disable_btns = disable_btns || [];
- this.make_dom();
- this.bind_events();
- this.value = '';
- }
-
- make_dom() {
- if (!this.button_array) {
- this.button_array = [
- [1, 2, 3],
- [4, 5, 6],
- [7, 8, 9],
- ['', 0, '']
- ];
- }
-
- this.wrapper.html(`
-
-
-
-
-
- ${this.button_array.map(get_row).join("")}
-
- `);
-
- function get_row(row) {
- return '' + row.map(get_col).join("") + '
';
- }
-
- function get_col(col) {
- return `${col}
');
+ const frm = _frm || new frappe.ui.form.Form(doctype, page, false);
+ const name = frappe.model.make_new_doc_and_get_name(doctype, true);
+ frm.refresh(name);
+
+ return frm;
+ }
+
+ async make_return_invoice(doc) {
+ frappe.dom.freeze();
+ this.frm = this.get_new_frm(this.frm);
+ this.frm.doc.items = [];
+ const res = await frappe.call({
+ method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
+ args: {
+ 'source_name': doc.name,
+ 'target_doc': this.frm.doc
+ }
+ });
+ frappe.model.sync(res.message);
+ await this.set_pos_profile_data();
+ frappe.dom.unfreeze();
+ }
+
+ set_pos_profile_data() {
+ if (this.company && !this.frm.doc.company) this.frm.doc.company = this.company;
+ if (this.pos_profile && !this.frm.doc.pos_profile) this.frm.doc.pos_profile = this.pos_profile;
+ if (!this.frm.doc.company) return;
+
+ return new Promise(resolve => {
+ return this.frm.call({
+ doc: this.frm.doc,
+ method: "set_missing_values",
+ }).then((r) => {
+ if(!r.exc) {
+ if (!this.frm.doc.pos_profile) {
+ frappe.dom.unfreeze();
+ this.raise_exception_for_pos_profile();
+ }
+ this.frm.trigger("update_stock");
+ this.frm.trigger('calculate_taxes_and_totals');
+ if(this.frm.doc.taxes_and_charges) this.frm.script_manager.trigger("taxes_and_charges");
+ frappe.model.set_default_values(this.frm.doc);
+ if (r.message) {
+ this.frm.pos_print_format = r.message.print_format || "";
+ this.frm.meta.default_print_format = r.message.print_format || "";
+ this.frm.allow_edit_rate = r.message.allow_edit_rate;
+ this.frm.allow_edit_discount = r.message.allow_edit_discount;
+ this.frm.doc.campaign = r.message.campaign;
+ }
+ }
+ resolve();
+ });
+ });
+ }
+
+ raise_exception_for_pos_profile() {
+ setTimeout(() => frappe.set_route('List', 'POS Profile'), 2000);
+ frappe.throw(__("POS Profile is required to use Point-of-Sale"));
+ }
+
+ set_invoice_status() {
+ const [status, indicator] = frappe.listview_settings["POS Invoice"].get_indicator(this.frm.doc);
+ this.page.set_indicator(__(`${status}`), indicator);
+ }
+
+ set_pos_profile_status() {
+ this.page.set_indicator(__(`${this.pos_profile}`), "blue");
+ }
+
+ async on_cart_update(args) {
+ frappe.dom.freeze();
+ try {
+ let { field, value, item } = args;
+ const { item_code, batch_no, serial_no, uom } = item;
+ let item_row = this.get_item_from_frm(item_code, batch_no, uom);
+
+ const item_selected_from_selector = field === 'qty' && value === "+1"
+
+ if (item_row) {
+ item_selected_from_selector && (value = item_row.qty + flt(value))
+
+ field === 'qty' && (value = flt(value));
+
+ if (field === 'qty' && value > 0 && !this.allow_negative_stock)
+ await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
+
+ if (this.is_current_item_being_edited(item_row) || item_selected_from_selector) {
+ await frappe.model.set_value(item_row.doctype, item_row.name, field, value);
+ this.update_cart_html(item_row);
+ }
+
+ } else {
+ if (!this.frm.doc.customer) {
+ frappe.dom.unfreeze();
+ frappe.show_alert({
+ message: __('You must select a customer before adding an item.'),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+ item_selected_from_selector && (value = flt(value))
+
+ const args = { item_code, batch_no, [field]: value };
+
+ if (serial_no) args['serial_no'] = serial_no;
+
+ if (field === 'serial_no') args['qty'] = value.split(`\n`).length || 0;
+
+ item_row = this.frm.add_child('items', args);
+
+ if (field === 'qty' && value !== 0 && !this.allow_negative_stock)
+ await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
+
+ await this.trigger_new_item_events(item_row);
+
+ this.check_serial_batch_selection_needed(item_row) && this.edit_item_details_of(item_row);
+ this.update_cart_html(item_row);
+ }
+ } catch (error) {
+ console.log(error);
+ } finally {
+ frappe.dom.unfreeze();
+ }
+ }
+
+ get_item_from_frm(item_code, batch_no, uom) {
+ const has_batch_no = batch_no;
+ return this.frm.doc.items.find(
+ i => i.item_code === item_code
+ && (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
+ && (i.uom === uom)
+ );
+ }
+
+ edit_item_details_of(item_row) {
+ this.item_details.toggle_item_details_section(item_row);
+ }
+
+ is_current_item_being_edited(item_row) {
+ const { item_code, batch_no } = this.item_details.current_item;
+
+ return item_code !== item_row.item_code || batch_no != item_row.batch_no ? false : true;
+ }
+
+ update_cart_html(item_row, remove_item) {
+ this.cart.update_item_html(item_row, remove_item);
+ this.cart.update_totals_section(this.frm);
+ }
+
+ check_serial_batch_selection_needed(item_row) {
+ // right now item details is shown for every type of item.
+ // if item details is not shown for every item then this fn will be needed
+ const serialized = item_row.has_serial_no;
+ const batched = item_row.has_batch_no;
+ const no_serial_selected = !item_row.serial_no;
+ const no_batch_selected = !item_row.batch_no;
+
+ if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
+ (serialized && batched && (no_batch_selected || no_serial_selected))) {
+ return true;
+ }
+ return false;
+ }
+
+ async trigger_new_item_events(item_row) {
+ await this.frm.script_manager.trigger('item_code', item_row.doctype, item_row.name)
+ await this.frm.script_manager.trigger('qty', item_row.doctype, item_row.name)
+ }
+
+ async check_stock_availability(item_row, qty_needed, warehouse) {
+ const available_qty = (await this.get_available_stock(item_row.item_code, warehouse)).message;
+
+ frappe.dom.unfreeze();
+ if (!(available_qty > 0)) {
+ frappe.model.clear_doc(item_row.doctype, item_row.name);
+ frappe.throw(__(`Item Code: ${item_row.item_code.bold()} is not available under warehouse ${warehouse.bold()}.`))
+ } else if (available_qty < qty_needed) {
+ frappe.show_alert({
+ message: __(`Stock quantity not enough for Item Code: ${item_row.item_code.bold()} under warehouse ${warehouse.bold()}.
+ Available quantity ${available_qty.toString().bold()}.`),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.item_details.qty_control.set_value(flt(available_qty));
+ }
+ frappe.dom.freeze();
+ }
+
+ get_available_stock(item_code, warehouse) {
+ const me = this;
+ return frappe.call({
+ method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.get_stock_availability",
+ args: {
+ 'item_code': item_code,
+ 'warehouse': warehouse,
+ },
+ callback(res) {
+ if (!me.item_stock_map[item_code])
+ me.item_stock_map[item_code] = {}
+ me.item_stock_map[item_code][warehouse] = res.message;
+ }
+ });
+ }
+
+ update_item_field(value, field_or_action) {
+ if (field_or_action === 'checkout') {
+ this.item_details.toggle_item_details_section(undefined);
+ } else if (field_or_action === 'remove') {
+ this.remove_item_from_cart();
+ } else {
+ const field_control = this.item_details[`${field_or_action}_control`];
+ if (!field_control) return;
+ field_control.set_focus();
+ value != "" && field_control.set_value(value);
+ }
+ }
+
+ remove_item_from_cart() {
+ frappe.dom.freeze();
+ const { doctype, name, current_item } = this.item_details;
+
+ frappe.model.set_value(doctype, name, 'qty', 0);
+
+ this.frm.script_manager.trigger('qty', doctype, name).then(() => {
+ frappe.model.clear_doc(doctype, name);
+ this.update_cart_html(current_item, true);
+ this.item_details.toggle_item_details_section(undefined);
+ frappe.dom.unfreeze();
+ })
+ }
+}
+
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
new file mode 100644
index 000000000000..c23a6ad58f95
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -0,0 +1,951 @@
+erpnext.PointOfSale.ItemCart = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.customer_info = undefined;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ ``
+ )
+
+ this.$component = this.wrapper.find('.item-cart');
+ }
+
+ init_child_components() {
+ this.init_customer_selector();
+ this.init_cart_components();
+ }
+
+ init_customer_selector() {
+ this.$component.append(
+ ``
+ )
+ this.$customer_section = this.$component.find('.customer-section');
+ }
+
+ reset_customer_selector() {
+ const frm = this.events.get_frm();
+ frm.set_value('customer', '');
+ this.$customer_section.removeClass('border pr-4 pl-4');
+ this.make_customer_selector();
+ this.customer_field.set_focus();
+ }
+
+ init_cart_components() {
+ this.$component.append(
+ `
`
+ )
+
+ set_dynamic_rate_header_width();
+ this.scroll_to_item($item_to_update);
+
+ function set_dynamic_rate_header_width() {
+ const rate_cols = Array.from(me.$cart_items_wrapper.find(".rate-col"));
+ me.$cart_header.find(".rate-list-header").css("width", "");
+ me.$cart_items_wrapper.find(".rate-col").css("width", "");
+ let max_width = rate_cols.reduce((max_width, elm) => {
+ if ($(elm).width() > max_width)
+ max_width = $(elm).width();
+ return max_width;
+ }, 0);
+
+ max_width += 1;
+ if (max_width == 1) max_width = "";
+
+ me.$cart_header.find(".rate-list-header").css("width", max_width);
+ me.$cart_items_wrapper.find(".rate-col").css("width", max_width);
+ }
+
+ function get_rate_discount_html() {
+ if (item_data.rate && item_data.amount && item_data.rate !== item_data.amount) {
+ return `
+
+
`
+ );
+ this.$cart_container = this.$component.find('.cart-container');
+
+ this.make_cart_totals_section();
+ this.make_cart_items_section();
+ this.make_cart_numpad();
+ }
+
+ make_cart_items_section() {
+ this.$cart_header = this.$component.find('.cart-header');
+ this.$cart_items_wrapper = this.$component.find('.cart-items-section');
+
+ this.make_no_items_placeholder();
+ }
+
+ make_no_items_placeholder() {
+ this.$cart_header.addClass('d-none');
+ this.$cart_items_wrapper.html(
+ `
+
+
+
+
+
+
+ Item
+ Qty
+ Amount
+
+
`
+ )
+ this.$cart_items_wrapper.addClass('mt-4 border-grey border-dashed');
+ }
+
+ make_cart_totals_section() {
+ this.$totals_section = this.$component.find('.cart-totals-section');
+
+ this.$totals_section.append(
+ `No items in cart
+
+ + Add Discount
+
+
+
`
+ )
+
+ this.$add_discount_elem = this.$component.find(".add-discount");
+ }
+
+ make_cart_numpad() {
+ this.$numpad_section = this.$component.find('.numpad-section');
+
+ this.number_pad = new erpnext.PointOfSale.NumberPad({
+ wrapper: this.$numpad_section,
+ events: {
+ numpad_event: this.on_numpad_event.bind(this)
+ },
+ cols: 5,
+ keys: [
+ [ 1, 2, 3, 'Quantity' ],
+ [ 4, 5, 6, 'Discount' ],
+ [ 7, 8, 9, 'Rate' ],
+ [ '.', 0, 'Delete', 'Remove' ]
+ ],
+ css_classes: [
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2' ],
+ [ '', '', '', 'col-span-2 text-bold text-danger' ]
+ ],
+ fieldnames_map: { 'Quantity': 'qty', 'Discount': 'discount_percentage' }
+ })
+
+ this.$numpad_section.prepend(
+ `
+
+
+
+
+ Net Total
+
+
+ 0.00
+
+
+
+
+ Grand Total
+
+
+ 0.00
+
+ Checkout
+
+
+ Edit Cart
+
+
+
+
+
`
+ )
+
+ this.$numpad_section.append(
+ `
+ Checkout
+
`
+ )
+ }
+
+ bind_events() {
+ const me = this;
+ this.$customer_section.on('click', '.add-remove-customer', function (e) {
+ const customer_info_is_visible = me.$cart_container.hasClass('d-none');
+ customer_info_is_visible ?
+ me.toggle_customer_info(false) : me.reset_customer_selector();
+ });
+
+ this.$customer_section.on('click', '.customer-header', function(e) {
+ // don't triggger the event if .add-remove-customer btn is clicked which is under .customer-header
+ if ($(e.target).closest('.add-remove-customer').length) return;
+
+ const show = !me.$cart_container.hasClass('d-none');
+ me.toggle_customer_info(show);
+ });
+
+ this.$cart_items_wrapper.on('click', '.cart-item-wrapper', function() {
+ const $cart_item = $(this);
+
+ me.toggle_item_highlight(this);
+
+ const payment_section_hidden = me.$totals_section.find('.edit-cart-btn').hasClass('d-none');
+ if (!payment_section_hidden) {
+ // payment section is visible
+ // edit cart first and then open item details section
+ me.$totals_section.find(".edit-cart-btn").click();
+ }
+
+ const item_code = unescape($cart_item.attr('data-item-code'));
+ const batch_no = unescape($cart_item.attr('data-batch-no'));
+ const uom = unescape($cart_item.attr('data-uom'));
+ me.events.cart_item_clicked(item_code, batch_no, uom);
+ this.numpad_value = '';
+ });
+
+ this.$component.on('click', '.checkout-btn', function() {
+ if (!$(this).hasClass('bg-primary')) return;
+
+ me.events.checkout();
+ me.toggle_checkout_btn(false);
+
+ me.$add_discount_elem.removeClass("d-none");
+ });
+
+ this.$totals_section.on('click', '.edit-cart-btn', () => {
+ this.events.edit_cart();
+ this.toggle_checkout_btn(true);
+
+ this.$add_discount_elem.addClass("d-none");
+ });
+
+ this.$component.on('click', '.add-discount', () => {
+ const can_edit_discount = this.$add_discount_elem.find('.edit-discount').length;
+
+ if(!this.discount_field || can_edit_discount) this.show_discount_control();
+ });
+
+ frappe.ui.form.on("POS Invoice", "paid_amount", frm => {
+ // called when discount is applied
+ this.update_totals_section(frm);
+ });
+ }
+
+ attach_shortcuts() {
+ for (let row of this.number_pad.keys) {
+ for (let btn of row) {
+ let shortcut_key = `ctrl+${frappe.scrub(String(btn))[0]}`;
+ if (btn === 'Delete') shortcut_key = 'ctrl+backspace';
+ if (btn === 'Remove') shortcut_key = 'shift+ctrl+backspace'
+ if (btn === '.') shortcut_key = 'ctrl+>';
+
+ // to account for fieldname map
+ const fieldname = this.number_pad.fieldnames[btn] ? this.number_pad.fieldnames[btn] :
+ typeof btn === 'string' ? frappe.scrub(btn) : btn;
+
+ frappe.ui.keys.on(`${shortcut_key}`, () => {
+ const cart_is_visible = this.$component.is(":visible");
+ if (cart_is_visible && this.item_is_selected && this.$numpad_section.is(":visible")) {
+ this.$numpad_section.find(`.numpad-btn[data-button-value="${fieldname}"]`).click();
+ }
+ })
+ }
+ }
+
+ frappe.ui.keys.on("ctrl+enter", () => {
+ const cart_is_visible = this.$component.is(":visible");
+ const payment_section_hidden = this.$totals_section.find('.edit-cart-btn').hasClass('d-none');
+ if (cart_is_visible && payment_section_hidden) {
+ this.$component.find(".checkout-btn").click();
+ }
+ });
+ }
+
+ toggle_item_highlight(item) {
+ const $cart_item = $(item);
+ const item_is_highlighted = $cart_item.hasClass("shadow");
+
+ if (!item || item_is_highlighted) {
+ this.item_is_selected = false;
+ this.$cart_container.find('.cart-item-wrapper').removeClass("shadow").css("opacity", "1");
+ } else {
+ $cart_item.addClass("shadow");
+ this.item_is_selected = true;
+ this.$cart_container.find('.cart-item-wrapper').css("opacity", "1");
+ this.$cart_container.find('.cart-item-wrapper').not(item).removeClass("shadow").css("opacity", "0.65");
+ }
+ // highlight with inner shadow
+ // $cart_item.addClass("shadow-inner bg-selected");
+ // me.$cart_container.find('.cart-item-wrapper').not(this).removeClass("shadow-inner bg-selected");
+ }
+
+ make_customer_selector() {
+ this.$customer_section.html(``);
+ const me = this;
+ const query = { query: 'erpnext.controllers.queries.customer_query' };
+ const allowed_customer_group = this.events.get_allowed_customer_group() || [];
+ if (allowed_customer_group.length) {
+ query.filters = {
+ customer_group: ['in', allowed_customer_group]
+ }
+ }
+ this.customer_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Customer'),
+ fieldtype: 'Link',
+ options: 'Customer',
+ placeholder: __('Search by customer name, phone, email.'),
+ get_query: () => query,
+ onchange: function() {
+ if (this.value) {
+ const frm = me.events.get_frm();
+ frappe.dom.freeze();
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'customer', this.value);
+ frm.script_manager.trigger('customer', frm.doc.doctype, frm.doc.name).then(() => {
+ frappe.run_serially([
+ () => me.fetch_customer_details(this.value),
+ () => me.events.customer_details_updated(me.customer_info),
+ () => me.update_customer_section(),
+ () => me.update_totals_section(),
+ () => frappe.dom.unfreeze()
+ ]);
+ })
+ }
+ },
+ },
+ parent: this.$customer_section.find('.customer-search-field'),
+ render_input: true,
+ });
+ this.customer_field.toggle_label(false);
+ }
+
+ fetch_customer_details(customer) {
+ if (customer) {
+ return new Promise((resolve) => {
+ frappe.db.get_value('Customer', customer, ["email_id", "mobile_no", "image", "loyalty_program"]).then(({ message }) => {
+ const { loyalty_program } = message;
+ // if loyalty program then fetch loyalty points too
+ if (loyalty_program) {
+ frappe.call({
+ method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details_with_points",
+ args: { customer, loyalty_program, "silent": true },
+ callback: (r) => {
+ const { loyalty_points, conversion_factor } = r.message;
+ if (!r.exc) {
+ this.customer_info = { ...message, customer, loyalty_points, conversion_factor };
+ resolve();
+ }
+ }
+ });
+ } else {
+ this.customer_info = { ...message, customer };
+ resolve();
+ }
+ });
+ });
+ } else {
+ return new Promise((resolve) => {
+ this.customer_info = {}
+ resolve();
+ });
+ }
+ }
+
+ show_discount_control() {
+ this.$add_discount_elem.removeClass("pr-4 pl-4");
+ this.$add_discount_elem.html(
+ `
+ `
+ );
+ const me = this;
+
+ this.discount_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Discount'),
+ fieldtype: 'Data',
+ placeholder: __('Enter discount percentage.'),
+ onchange: function() {
+ if (this.value || this.value == 0) {
+ const frm = me.events.get_frm();
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', this.value);
+ me.hide_discount_control(this.value);
+ }
+ },
+ },
+ parent: this.$add_discount_elem.find('.add-dicount-field'),
+ render_input: true,
+ });
+ this.discount_field.toggle_label(false);
+ this.discount_field.set_focus();
+ }
+
+ hide_discount_control(discount) {
+ this.$add_discount_elem.addClass('pr-4 pl-4');
+ this.$add_discount_elem.html(
+ `
+
+ ${String(discount).bold()}% off
+
+ `
+ );
+ }
+
+ update_customer_section() {
+ const { customer, email_id='', mobile_no='', image } = this.customer_info || {};
+
+ if (customer) {
+ this.$customer_section.addClass('border pr-4 pl-4').html(
+ `
+
`
+ );
+ } else {
+ // reset customer selector
+ this.reset_customer_selector();
+ }
+
+ function get_customer_description() {
+ if (!email_id && !mobile_no) {
+ return `
+ ${get_customer_image()}
+
+
+
+ ${customer}
+ ${get_customer_description()}
+
+
+
+ Click to add email / phone
`
+ } else if (email_id && !mobile_no) {
+ return `${email_id}
`
+ } else if (mobile_no && !email_id) {
+ return `${mobile_no}
`
+ } else {
+ return `${email_id} | ${mobile_no}
`
+ }
+ }
+
+ function get_customer_image() {
+ if (image) {
+ return `
+ 
+
`
+ } else {
+ return `
+ ${frappe.get_abbr(customer)}
+
`
+ }
+ }
+ }
+
+ update_totals_section(frm) {
+ if (!frm) frm = this.events.get_frm();
+
+ this.render_net_total(frm.doc.base_net_total);
+ this.render_grand_total(frm.doc.base_grand_total);
+
+ const taxes = frm.doc.taxes.map(t => { return { description: t.description, rate: t.rate }})
+ this.render_taxes(frm.doc.base_total_taxes_and_charges, taxes);
+ }
+
+ render_net_total(value) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.net-total').html(
+ `
+
+ Net Total
+
+
`
+ )
+
+ this.$numpad_section.find('.numpad-net-total').html(`Net Total: ${format_currency(value, currency)}`)
+ }
+
+ render_grand_total(value) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.grand-total').html(
+ `${format_currency(value, currency)}
+
+
+ Grand Total
+
+
`
+ )
+
+ this.$numpad_section.find('.numpad-grand-total').html(`Grand Total: ${format_currency(value, currency)}`)
+ }
+
+ render_taxes(value, taxes) {
+ if (taxes.length) {
+ const currency = this.events.get_frm().doc.currency;
+ this.$totals_section.find('.taxes').html(
+ `${format_currency(value, currency)}
+
+
`
+ )
+ } else {
+ this.$totals_section.find('.taxes').html('')
+ }
+ }
+
+ get_cart_item({ item_code, batch_no, uom }) {
+ const batch_attr = `[data-batch-no="${escape(batch_no)}"]`;
+ const item_code_attr = `[data-item-code="${escape(item_code)}"]`;
+ const uom_attr = `[data-uom=${escape(uom)}]`;
+
+ const item_selector = batch_no ?
+ `.cart-item-wrapper${batch_attr}${uom_attr}` : `.cart-item-wrapper${item_code_attr}${uom_attr}`;
+
+ return this.$cart_items_wrapper.find(item_selector);
+ }
+
+ update_item_html(item, remove_item) {
+ const $item = this.get_cart_item(item);
+
+ if (remove_item) {
+ $item && $item.remove();
+ } else {
+ const { item_code, batch_no, uom } = item;
+ const search_field = batch_no ? 'batch_no' : 'item_code';
+ const search_value = batch_no || item_code;
+ const item_row = this.events.get_frm().doc.items.find(i => i[search_field] === search_value && i.uom === uom);
+
+ this.render_cart_item(item_row, $item);
+ }
+
+ const no_of_cart_items = this.$cart_items_wrapper.children().length;
+ no_of_cart_items > 0 && this.highlight_checkout_btn(no_of_cart_items > 0);
+
+ this.update_empty_cart_section(no_of_cart_items);
+ }
+
+ render_cart_item(item_data, $item_to_update) {
+ const currency = this.events.get_frm().doc.currency;
+ const me = this;
+
+ if (!$item_to_update.length) {
+ this.$cart_items_wrapper.append(
+ `
+
+ Tax Charges
+
+ ${
+ taxes.map((t, i) => {
+ let margin_left = '';
+ if (i !== 0) margin_left = 'ml-2';
+ return `${t.description}`
+ }).join('')
+ }
+
+
+
+ ${format_currency(value, currency)}
+
+
`
+ )
+ $item_to_update = this.get_cart_item(item_data);
+ }
+
+ $item_to_update.html(
+ `
+
+ ${get_rate_discount_html()}
+
+ ${item_data.item_name}
+
+ ${get_description_html()}
+
+
`
+ } else {
+ return `
+
+ ${item_data.qty || 0}
+
+
+
+ ${format_currency(item_data.amount, currency)}
+ ${format_currency(item_data.rate, currency)}
+
+
`
+ }
+ }
+
+ function get_description_html() {
+ if (item_data.description) {
+ if (item_data.description.indexOf('
+ ${item_data.qty || 0}
+
+
+
+ ${format_currency(item_data.rate, currency)}
+ ') != -1) {
+ try {
+ item_data.description = $(item_data.description).text();
+ } catch (error) {
+ item_data.description = item_data.description.replace(/
/g, ' ').replace(/<\/div>/g, ' ').replace(/ +/g, ' ');
+ }
+ }
+ item_data.description = frappe.ellipsis(item_data.description, 45);
+ return ``
+ );
+ } else {
+ this.$item_image.html(frappe.get_abbr(item_code));
+ }
+
+ }
+
+ render_discount_dom(item) {
+ if (item.discount_percentage) {
+ this.$dicount_section.html(
+ `
+ `
+ );
+
+ this.$component = this.wrapper.find('.items-selector');
+ }
+
+ async load_items_data() {
+ if (!this.item_group) {
+ const res = await frappe.db.get_value("Item Group", {lft: 1, is_group: 1}, "name");
+ this.parent_item_group = res.message.name;
+ };
+ if (!this.price_list) {
+ const res = await frappe.db.get_value("POS Profile", this.pos_profile, "selling_price_list");
+ this.price_list = res.message.selling_price_list;
+ }
+
+ this.get_items({}).then(({message}) => {
+ this.render_item_list(message.items);
+ });
+ }
+
+ get_items({start = 0, page_length = 40, search_value=''}) {
+ const price_list = this.events.get_frm().doc?.selling_price_list || this.price_list;
+ let { item_group, pos_profile } = this;
+
+ !item_group && (item_group = this.parent_item_group);
+
+ return frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
+ freeze: true,
+ args: { start, page_length, price_list, item_group, search_value, pos_profile },
+ });
+ }
+
+
+ render_item_list(items) {
+ this.$items_container = this.$component.find('.items-container');
+ this.$items_container.html('');
+
+ items.forEach(item => {
+ const item_html = this.get_item_html(item);
+ this.$items_container.append(item_html);
+ })
+ }
+
+ get_item_html(item) {
+ const { item_image, serial_no, batch_no, barcode, actual_qty, stock_uom } = item;
+ const indicator_color = actual_qty > 10 ? "green" : actual_qty !== 0 ? "orange" : "red";
+
+ function get_item_image_html() {
+ if (item_image) {
+ return `
+ `
+ )
+
+ this.$component = this.wrapper.find('.past-order-list');
+ this.$invoices_container = this.$component.find('.invoices-container');
+ }
+
+ bind_events() {
+ this.search_field.$input.on('input', (e) => {
+ clearTimeout(this.last_search);
+ this.last_search = setTimeout(() => {
+ const search_term = e.target.value;
+ this.refresh_list(search_term, this.status_field.get_value());
+ }, 300);
+ });
+ const me = this;
+ this.$invoices_container.on('click', '.invoice-wrapper', function() {
+ const invoice_name = unescape($(this).attr('data-invoice-name'));
+
+ me.events.open_invoice_data(invoice_name);
+ })
+ }
+
+ make_filter_section() {
+ const me = this;
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Search'),
+ fieldtype: 'Data',
+ placeholder: __('Search by invoice id or customer name')
+ },
+ parent: this.$component.find('.search-field'),
+ render_input: true,
+ });
+ this.status_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Invoice Status'),
+ fieldtype: 'Select',
+ options: `Draft\nPaid\nConsolidated\nReturn`,
+ placeholder: __('Filter by invoice status'),
+ onchange: function() {
+ me.refresh_list(me.search_field.get_value(), this.value);
+ }
+ },
+ parent: this.$component.find('.status-field'),
+ render_input: true,
+ });
+ this.search_field.toggle_label(false);
+ this.status_field.toggle_label(false);
+ this.status_field.set_value('Paid');
+ }
+
+ toggle_component(show) {
+ show ?
+ this.$component.removeClass('d-none') && this.refresh_list() :
+ this.$component.addClass('d-none');
+ }
+
+ refresh_list() {
+ frappe.dom.freeze();
+ this.events.reset_summary();
+ const search_term = this.search_field.get_value();
+ const status = this.status_field.get_value();
+
+ this.$invoices_container.html('');
+
+ return frappe.call({
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.get_past_order_list",
+ freeze: true,
+ args: { search_term, status },
+ callback: (response) => {
+ frappe.dom.unfreeze();
+ response.message.forEach(invoice => {
+ const invoice_html = this.get_invoice_html(invoice);
+ this.$invoices_container.append(invoice_html);
+ });
+ }
+ });
+ }
+
+ get_invoice_html(invoice) {
+ const posting_datetime = moment(invoice.posting_date+" "+invoice.posting_time).format("Do MMMM, h:mma");
+ return (
+ `
+ `
+ )
+
+ this.$component = this.wrapper.find('.past-order-summary');
+ this.$summary_wrapper = this.$component.find('.summary-wrapper');
+ this.$summary_container = this.$component.find('.summary-container');
+ }
+
+ init_child_components() {
+ this.init_upper_section();
+ this.init_items_summary();
+ this.init_totals_summary();
+ this.init_payments_summary();
+ this.init_summary_buttons();
+ this.init_email_print_dialog();
+ }
+
+ init_upper_section() {
+ this.$summary_container.append(
+ ``
+ );
+
+ this.$upper_section = this.$summary_container.find('.upper-section');
+ }
+
+ init_items_summary() {
+ this.$summary_container.append(
+ `
+ `
+ )
+ this.$component = this.wrapper.find('.payment-section');
+ this.$payment_modes = this.$component.find('.payment-modes');
+ this.$totals_remarks = this.$component.find('.totals-remarks');
+ this.$totals = this.$component.find('.totals');
+ this.$remarks = this.$component.find('.remarks');
+ this.$numpad = this.$component.find('.number-pad');
+ this.$invoice_details_section = this.$component.find('.invoice-details-section');
+ }
+
+ make_invoice_fields_control() {
+ frappe.db.get_doc("POS Settings", undefined).then((doc) => {
+ const fields = doc.invoice_fields;
+ if (!fields.length) return;
+
+ this.$invoice_details_section.html(
+ `
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n
\n\n\t\n\t\t
\n\n\t\n\t\t
\n
\n
${item_data.description}
`
+ }
+ return ``;
+ }
+ }
+
+ scroll_to_item($item) {
+ if ($item.length === 0) return;
+ const scrollTop = $item.offset().top - this.$cart_items_wrapper.offset().top + this.$cart_items_wrapper.scrollTop();
+ this.$cart_items_wrapper.animate({ scrollTop });
+ }
+
+ update_selector_value_in_cart_item(selector, value, item) {
+ const $item_to_update = this.get_cart_item(item);
+ $item_to_update.attr(`data-${selector}`, value);
+ }
+
+ toggle_checkout_btn(show_checkout) {
+ if (show_checkout) {
+ this.$totals_section.find('.checkout-btn').removeClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ } else {
+ this.$totals_section.find('.checkout-btn').addClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').removeClass('d-none');
+ }
+ }
+
+ highlight_checkout_btn(toggle) {
+ const has_primary_class = this.$totals_section.find('.checkout-btn').hasClass('bg-primary');
+ if (toggle && !has_primary_class) {
+ this.$totals_section.find('.checkout-btn').addClass('bg-primary text-white text-lg');
+ } else if (!toggle && has_primary_class) {
+ this.$totals_section.find('.checkout-btn').removeClass('bg-primary text-white text-lg');
+ }
+ }
+
+ update_empty_cart_section(no_of_cart_items) {
+ const $no_item_element = this.$cart_items_wrapper.find('.no-item-wrapper');
+
+ // if cart has items and no item is present
+ no_of_cart_items > 0 && $no_item_element && $no_item_element.remove()
+ && this.$cart_items_wrapper.removeClass('mt-4 border-grey border-dashed') && this.$cart_header.removeClass('d-none');
+
+ no_of_cart_items === 0 && !$no_item_element.length && this.make_no_items_placeholder();
+ }
+
+ on_numpad_event($btn) {
+ const current_action = $btn.attr('data-button-value');
+ const action_is_field_edit = ['qty', 'discount_percentage', 'rate'].includes(current_action);
+
+ this.highlight_numpad_btn($btn, current_action);
+
+ const action_is_pressed_twice = this.prev_action === current_action;
+ const first_click_event = !this.prev_action;
+ const field_to_edit_changed = this.prev_action && this.prev_action != current_action;
+
+ if (action_is_field_edit) {
+
+ if (first_click_event || field_to_edit_changed) {
+ this.prev_action = current_action;
+ } else if (action_is_pressed_twice) {
+ this.prev_action = undefined;
+ }
+ this.numpad_value = '';
+
+ } else if (current_action === 'checkout') {
+ this.prev_action = undefined;
+ this.toggle_item_highlight();
+ this.events.numpad_event(undefined, current_action);
+ return;
+ } else if (current_action === 'remove') {
+ this.prev_action = undefined;
+ this.toggle_item_highlight();
+ this.events.numpad_event(undefined, current_action);
+ return;
+ } else {
+ this.numpad_value = current_action === 'delete' ? this.numpad_value.slice(0, -1) : this.numpad_value + current_action;
+ this.numpad_value = this.numpad_value || 0;
+ }
+
+ const first_click_event_is_not_field_edit = !action_is_field_edit && first_click_event;
+
+ if (first_click_event_is_not_field_edit) {
+ frappe.show_alert({
+ indicator: 'red',
+ message: __('Please select a field to edit from numpad')
+ });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ if (flt(this.numpad_value) > 100 && this.prev_action === 'discount_percentage') {
+ frappe.show_alert({
+ message: __('Discount cannot be greater than 100%'),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.numpad_value = current_action;
+ }
+
+ this.events.numpad_event(this.numpad_value, this.prev_action);
+ }
+
+ highlight_numpad_btn($btn, curr_action) {
+ const curr_action_is_highlighted = $btn.hasClass('shadow-inner');
+ const curr_action_is_action = ['qty', 'discount_percentage', 'rate', 'done'].includes(curr_action);
+
+ if (!curr_action_is_highlighted) {
+ $btn.addClass('shadow-inner bg-selected');
+ }
+ if (this.prev_action === curr_action && curr_action_is_highlighted) {
+ // if Qty is pressed twice
+ $btn.removeClass('shadow-inner bg-selected');
+ }
+ if (this.prev_action && this.prev_action !== curr_action && curr_action_is_action) {
+ // Order: Qty -> Rate then remove Qty highlight
+ const prev_btn = $(`[data-button-value='${this.prev_action}']`);
+ prev_btn.removeClass('shadow-inner bg-selected');
+ }
+ if (!curr_action_is_action || curr_action === 'done') {
+ // if numbers are clicked
+ setTimeout(() => {
+ $btn.removeClass('shadow-inner bg-selected');
+ }, 100);
+ }
+ }
+
+ toggle_numpad(show) {
+ if (show) {
+ this.$totals_section.addClass('d-none');
+ this.$numpad_section.removeClass('d-none');
+ } else {
+ this.$totals_section.removeClass('d-none');
+ this.$numpad_section.addClass('d-none');
+ }
+ this.reset_numpad();
+ }
+
+ reset_numpad() {
+ this.numpad_value = '';
+ this.prev_action = undefined;
+ this.$numpad_section.find('.shadow-inner').removeClass('shadow-inner bg-selected');
+ }
+
+ toggle_numpad_field_edit(fieldname) {
+ if (['qty', 'discount_percentage', 'rate'].includes(fieldname)) {
+ this.$numpad_section.find(`[data-button-value="${fieldname}"]`).click();
+ }
+ }
+
+ toggle_customer_info(show) {
+ if (show) {
+ this.$cart_container.addClass('d-none')
+ this.$customer_section.addClass('flex-1 scroll-y').removeClass('mb-0 border pr-4 pl-4')
+ this.$customer_section.find('.icon').addClass('w-24 h-24 text-2xl').removeClass('w-12 h-12 text-md')
+ this.$customer_section.find('.customer-header').removeClass('h-18');
+ this.$customer_section.find('.customer-details').addClass('sticky z-100 bg-white');
+
+ this.$customer_section.find('.customer-name').html(
+ `${this.customer_info.customer}
+ `
+ )
+
+ this.$customer_section.find('.customer-details').append(
+ `
+
`
+ )
+ // transactions need to be in diff div from sticky elem for scrolling
+ this.$customer_section.append(``)
+
+ this.render_customer_info_form();
+ this.fetch_customer_transactions();
+
+ } else {
+ this.$cart_container.removeClass('d-none');
+ this.$customer_section.removeClass('flex-1 scroll-y').addClass('mb-0 border pr-4 pl-4');
+ this.$customer_section.find('.icon').addClass('w-12 h-12 text-md').removeClass('w-24 h-24 text-2xl');
+ this.$customer_section.find('.customer-header').addClass('h-18')
+ this.$customer_section.find('.customer-details').removeClass('sticky z-100 bg-white');
+
+ this.update_customer_section();
+ }
+ }
+
+ render_customer_info_form() {
+ const $customer_form = this.$customer_section.find('.customer-form');
+
+ const dfs = [{
+ fieldname: 'email_id',
+ label: __('Email'),
+ fieldtype: 'Data',
+ options: 'email',
+ placeholder: __("Enter customer's email")
+ },{
+ fieldname: 'mobile_no',
+ label: __('Phone Number'),
+ fieldtype: 'Data',
+ placeholder: __("Enter customer's phone number")
+ },{
+ fieldname: 'loyalty_program',
+ label: __('Loyalty Program'),
+ fieldtype: 'Link',
+ options: 'Loyalty Program',
+ placeholder: __("Select Loyalty Program")
+ },{
+ fieldname: 'loyalty_points',
+ label: __('Loyalty Points'),
+ fieldtype: 'Int',
+ read_only: 1
+ }];
+
+ const me = this;
+ dfs.forEach(df => {
+ this[`customer_${df.fieldname}_field`] = frappe.ui.form.make_control({
+ df: { ...df,
+ onchange: handle_customer_field_change,
+ },
+ parent: $customer_form.find(`.${df.fieldname}-field`),
+ render_input: true,
+ });
+ this[`customer_${df.fieldname}_field`].set_value(this.customer_info[df.fieldname]);
+ })
+
+ function handle_customer_field_change() {
+ const current_value = me.customer_info[this.df.fieldname];
+ const current_customer = me.customer_info.customer;
+
+ if (this.value && current_value != this.value && this.df.fieldname != 'loyalty_points') {
+ frappe.call({
+ method: 'erpnext.selling.page.point_of_sale.point_of_sale.set_customer_info',
+ args: {
+ fieldname: this.df.fieldname,
+ customer: current_customer,
+ value: this.value
+ },
+ callback: (r) => {
+ if(!r.exc) {
+ me.customer_info[this.df.fieldname] = this.value;
+ frappe.show_alert({
+ message: __("Customer contact updated successfully."),
+ indicator: 'green'
+ });
+ frappe.utils.play_sound("submit");
+ }
+ }
+ });
+ }
+ }
+ }
+
+ fetch_customer_transactions() {
+ frappe.db.get_list('POS Invoice', {
+ filters: { customer: this.customer_info.customer, docstatus: 1 },
+ fields: ['name', 'grand_total', 'status', 'posting_date', 'posting_time', 'currency'],
+ limit: 20
+ }).then((res) => {
+ const transaction_container = this.$customer_section.find('.customer-transactions');
+
+ if (!res.length) {
+ transaction_container.removeClass('flex-1 border rounded').html(
+ `CONTACT DETAILS
+
+
+
+
+
+
+ RECENT TRANSACTIONS
+ No recent transactions found
`
+ )
+ return;
+ };
+
+ const elapsed_time = moment(res[0].posting_date+" "+res[0].posting_time).fromNow();
+ this.$customer_section.find('.last-transacted-on').html(`Last transacted ${elapsed_time}`);
+
+ res.forEach(invoice => {
+ const posting_datetime = moment(invoice.posting_date+" "+invoice.posting_time).format("Do MMMM, h:mma");
+ let indicator_color = '';
+
+ if (in_list(['Paid', 'Consolidated'], invoice.status)) (indicator_color = 'green');
+ if (invoice.status === 'Draft') (indicator_color = 'red');
+ if (invoice.status === 'Return') (indicator_color = 'grey');
+
+ transaction_container.append(
+ `
+
`
+ )
+ });
+ })
+ }
+
+ load_invoice() {
+ const frm = this.events.get_frm();
+ this.fetch_customer_details(frm.doc.customer).then(() => {
+ this.events.customer_details_updated(this.customer_info);
+ this.update_customer_section();
+ })
+
+ this.$cart_items_wrapper.html('');
+ if (frm.doc.items.length) {
+ frm.doc.items.forEach(item => {
+ this.update_item_html(item);
+ });
+ } else {
+ this.make_no_items_placeholder();
+ this.highlight_checkout_btn(false);
+ }
+
+ this.update_totals_section(frm);
+
+ if(frm.doc.docstatus === 1) {
+ this.$totals_section.find('.checkout-btn').addClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ this.$totals_section.find('.grand-total').removeClass('border-b-grey');
+ } else {
+ this.$totals_section.find('.checkout-btn').removeClass('d-none');
+ this.$totals_section.find('.edit-cart-btn').addClass('d-none');
+ this.$totals_section.find('.grand-total').addClass('border-b-grey');
+ }
+
+ this.toggle_component(true);
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_item_details.js b/erpnext/selling/page/point_of_sale/pos_item_details.js
new file mode 100644
index 000000000000..86a1be9faf88
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_details.js
@@ -0,0 +1,394 @@
+erpnext.PointOfSale.ItemDetails = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.current_item = {};
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ ``
+ )
+
+ this.$component = this.wrapper.find('.item-details');
+ }
+
+ init_child_components() {
+ this.$component.html(
+ `
+
+ ${invoice.name}
+
+ ${posting_datetime}
+
+
+
+
+ ${format_currency(invoice.grand_total, invoice.currency, 0) || 0}
+
+ ${invoice.status}
+
+
`
+ )
+
+ this.$item_name = this.$component.find('.item-name');
+ this.$item_description = this.$component.find('.item-description');
+ this.$item_price = this.$component.find('.item-price');
+ this.$item_image = this.$component.find('.item-image');
+ this.$form_container = this.$component.find('.form-container');
+ this.$dicount_section = this.$component.find('.discount-section');
+ }
+
+ toggle_item_details_section(item) {
+ const { item_code, batch_no, uom } = this.current_item;
+ const item_code_is_same = item && item_code === item.item_code;
+ const batch_is_same = item && batch_no == item.batch_no;
+ const uom_is_same = item && uom === item.uom;
+
+ this.item_has_changed = !item ? false : item_code_is_same && batch_is_same && uom_is_same ? false : true;
+
+ this.events.toggle_item_selector(this.item_has_changed);
+ this.toggle_component(this.item_has_changed);
+
+ if (this.item_has_changed) {
+ this.doctype = item.doctype;
+ this.item_meta = frappe.get_meta(this.doctype);
+ this.name = item.name;
+ this.item_row = item;
+ this.currency = this.events.get_frm().doc.currency;
+
+ this.current_item = { item_code: item.item_code, batch_no: item.batch_no, uom: item.uom };
+
+ this.render_dom(item);
+ this.render_discount_dom(item);
+ this.render_form(item);
+ } else {
+ this.validate_serial_batch_item();
+ this.current_item = {};
+ }
+ }
+
+ validate_serial_batch_item() {
+ const doc = this.events.get_frm().doc;
+ const item_row = doc.items.find(item => item.name === this.name);
+
+ if (!item_row) return;
+
+ const serialized = item_row.has_serial_no;
+ const batched = item_row.has_batch_no;
+ const no_serial_selected = !item_row.serial_no;
+ const no_batch_selected = !item_row.batch_no;
+
+ if ((serialized && no_serial_selected) || (batched && no_batch_selected) ||
+ (serialized && batched && (no_batch_selected || no_serial_selected))) {
+
+ frappe.show_alert({
+ message: __("Item will be removed since no serial / batch no selected."),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("cancel");
+ this.events.remove_item_from_cart();
+ }
+ }
+
+ render_dom(item) {
+ let { item_code ,item_name, description, image, price_list_rate } = item;
+
+ function get_description_html() {
+ if (description) {
+ description = description.indexOf('...') === -1 && description.length > 75 ? description.substr(0, 73) + '...' : description;
+ return description;
+ }
+ return ``;
+ }
+
+ this.$item_name.html(item_name);
+ this.$item_description.html(get_description_html());
+ this.$item_price.html(format_currency(price_list_rate, this.currency));
+ if (image) {
+ this.$item_image.html(
+ `
+
+ ITEM DETAILS
+ Close
+
+
+
+
+
+
+
+
+
+ STOCK DETAILS
+
+
+ ${format_currency(item.price_list_rate, this.currency)}
+
+
+ ${item.discount_percentage}% off
+
`
+ )
+ this.$item_price.html(format_currency(item.rate, this.currency));
+ } else {
+ this.$dicount_section.html(``)
+ }
+ }
+
+ render_form(item) {
+ const fields_to_display = this.get_form_fields(item);
+ this.$form_container.html('');
+
+ fields_to_display.forEach((fieldname, idx) => {
+ this.$form_container.append(
+ `
+
+
`
+ )
+
+ const field_meta = this.item_meta.fields.find(df => df.fieldname === fieldname);
+ fieldname === 'discount_percentage' ? (field_meta.label = __('Discount (%)')) : '';
+ const me = this;
+
+ this[`${fieldname}_control`] = frappe.ui.form.make_control({
+ df: {
+ ...field_meta,
+ onchange: function() {
+ me.events.form_updated(me.doctype, me.name, fieldname, this.value);
+ }
+ },
+ parent: this.$form_container.find(`.${fieldname}-control`),
+ render_input: true,
+ })
+ this[`${fieldname}_control`].set_value(item[fieldname]);
+ });
+
+ this.make_auto_serial_selection_btn(item);
+
+ this.bind_custom_control_change_event();
+ }
+
+ get_form_fields(item) {
+ const fields = ['qty', 'uom', 'rate', 'price_list_rate', 'discount_percentage', 'warehouse', 'actual_qty'];
+ if (item.has_serial_no) fields.push('serial_no');
+ if (item.has_batch_no) fields.push('batch_no');
+ return fields;
+ }
+
+ make_auto_serial_selection_btn(item) {
+ if (item.has_serial_no) {
+ this.$form_container.append(
+ ``
+ )
+ if (!item.has_batch_no) {
+ this.$form_container.append(
+ ``
+ )
+ }
+ this.$form_container.append(
+ `
+ Auto Fetch Serial Numbers
+
`
+ )
+ this.$form_container.find('.serial_no-control').find('textarea').css('height', '9rem');
+ this.$form_container.find('.serial_no-control').parent().addClass('row-span-2');
+ }
+ }
+
+ bind_custom_control_change_event() {
+ const me = this;
+ if (this.rate_control) {
+ this.rate_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'rate', this.value).then(() => {
+ const item_row = frappe.get_doc(me.doctype, me.name);
+ const doc = me.events.get_frm().doc;
+
+ me.$item_price.html(format_currency(item_row.rate, doc.currency));
+ me.render_discount_dom(item_row);
+ });
+ }
+ }
+ }
+
+ if (this.warehouse_control) {
+ this.warehouse_control.df.reqd = 1;
+ this.warehouse_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'warehouse', this.value).then(() => {
+ me.item_stock_map = me.events.get_item_stock_map();
+ const available_qty = me.item_stock_map[me.item_row.item_code][this.value];
+ if (available_qty === undefined) {
+ me.events.get_available_stock(me.item_row.item_code, this.value).then(() => {
+ // item stock map is updated now reset warehouse
+ me.warehouse_control.set_value(this.value);
+ })
+ } else if (available_qty === 0) {
+ me.warehouse_control.set_value('');
+ frappe.throw(__(`Item Code: ${me.item_row.item_code.bold()} is not available under warehouse ${this.value.bold()}.`));
+ }
+ me.actual_qty_control.set_value(available_qty);
+ });
+ }
+ }
+ this.warehouse_control.refresh();
+ }
+
+ if (this.discount_percentage_control) {
+ this.discount_percentage_control.df.onchange = function() {
+ if (this.value) {
+ me.events.form_updated(me.doctype, me.name, 'discount_percentage', this.value).then(() => {
+ const item_row = frappe.get_doc(me.doctype, me.name);
+ me.rate_control.set_value(item_row.rate);
+ });
+ }
+ }
+ }
+
+ if (this.serial_no_control) {
+ this.serial_no_control.df.reqd = 1;
+ this.serial_no_control.df.onchange = async function() {
+ !me.current_item.batch_no && await me.auto_update_batch_no();
+ me.events.form_updated(me.doctype, me.name, 'serial_no', this.value);
+ }
+ this.serial_no_control.refresh();
+ }
+
+ if (this.batch_no_control) {
+ this.batch_no_control.df.reqd = 1;
+ this.batch_no_control.df.get_query = () => {
+ return {
+ query: 'erpnext.controllers.queries.get_batch_no',
+ filters: {
+ item_code: me.item_row.item_code,
+ warehouse: me.item_row.warehouse
+ }
+ }
+ };
+ this.batch_no_control.df.onchange = function() {
+ me.events.set_value_in_current_cart_item('batch-no', this.value);
+ me.events.form_updated(me.doctype, me.name, 'batch_no', this.value);
+ me.current_item.batch_no = this.value;
+ }
+ this.batch_no_control.refresh();
+ }
+
+ if (this.uom_control) {
+ this.uom_control.df.onchange = function() {
+ me.events.set_value_in_current_cart_item('uom', this.value);
+ me.events.form_updated(me.doctype, me.name, 'uom', this.value);
+ me.current_item.uom = this.value;
+ }
+ }
+ }
+
+ async auto_update_batch_no() {
+ if (this.serial_no_control && this.batch_no_control) {
+ const selected_serial_nos = this.serial_no_control.get_value().split(`\n`).filter(s => s);
+ if (!selected_serial_nos.length) return;
+
+ // find batch nos of the selected serial no
+ const serials_with_batch_no = await frappe.db.get_list("Serial No", {
+ filters: { 'name': ["in", selected_serial_nos]},
+ fields: ["batch_no", "name"]
+ });
+ const batch_serial_map = serials_with_batch_no.reduce((acc, r) => {
+ acc[r.batch_no] || (acc[r.batch_no] = []);
+ acc[r.batch_no] = [...acc[r.batch_no], r.name];
+ return acc;
+ }, {});
+ // set current item's batch no and serial no
+ const batch_no = Object.keys(batch_serial_map)[0];
+ const batch_serial_nos = batch_serial_map[batch_no].join(`\n`);
+ // eg. 10 selected serial no. -> 5 belongs to first batch other 5 belongs to second batch
+ const serial_nos_belongs_to_other_batch = selected_serial_nos.length !== batch_serial_map[batch_no].length;
+
+ const current_batch_no = this.batch_no_control.get_value();
+ current_batch_no != batch_no && await this.batch_no_control.set_value(batch_no);
+
+ if (serial_nos_belongs_to_other_batch) {
+ this.serial_no_control.set_value(batch_serial_nos);
+ this.qty_control.set_value(batch_serial_map[batch_no].length);
+ }
+
+ delete batch_serial_map[batch_no];
+
+ if (serial_nos_belongs_to_other_batch)
+ this.events.clone_new_batch_item_in_frm(batch_serial_map, this.current_item);
+ }
+ }
+
+ bind_events() {
+ this.bind_auto_serial_fetch_event();
+ this.bind_fields_to_numpad_fields();
+
+ this.$component.on('click', '.close-btn', () => {
+ this.events.close_item_details();
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("escape", () => {
+ const item_details_visible = this.$component.is(":visible");
+ if (item_details_visible) {
+ this.events.close_item_details();
+ }
+ });
+ }
+
+ bind_fields_to_numpad_fields() {
+ const me = this;
+ this.$form_container.on('click', '.input-with-feedback', function() {
+ const fieldname = $(this).attr('data-fieldname');
+ if (this.last_field_focused != fieldname) {
+ me.events.item_field_focused(fieldname);
+ this.last_field_focused = fieldname;
+ }
+ });
+ }
+
+ bind_auto_serial_fetch_event() {
+ this.$form_container.on('click', '.auto-fetch-btn', () => {
+ this.batch_no_control.set_value('');
+ let qty = this.qty_control.get_value();
+ let numbers = frappe.call({
+ method: "erpnext.stock.doctype.serial_no.serial_no.auto_fetch_serial_number",
+ args: {
+ qty,
+ item_code: this.current_item.item_code,
+ warehouse: this.warehouse_control.get_value() || '',
+ batch_nos: this.current_item.batch_no || '',
+ for_doctype: 'POS Invoice'
+ }
+ });
+
+ numbers.then((data) => {
+ let auto_fetched_serial_numbers = data.message;
+ let records_length = auto_fetched_serial_numbers.length;
+ if (!records_length) {
+ const warehouse = this.warehouse_control.get_value().bold();
+ frappe.msgprint(__(`Serial numbers unavailable for Item ${this.current_item.item_code.bold()}
+ under warehouse ${warehouse}. Please try changing warehouse.`));
+ } else if (records_length < qty) {
+ frappe.msgprint(`Fetched only ${records_length} available serial numbers.`);
+ this.qty_control.set_value(records_length);
+ }
+ numbers = auto_fetched_serial_numbers.join(`\n`);
+ this.serial_no_control.set_value(numbers);
+ });
+ })
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_item_selector.js b/erpnext/selling/page/point_of_sale/pos_item_selector.js
new file mode 100644
index 000000000000..ee0c06d45d0c
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_item_selector.js
@@ -0,0 +1,265 @@
+erpnext.PointOfSale.ItemSelector = class {
+ constructor({ frm, wrapper, events, pos_profile }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.pos_profile = pos_profile;
+
+ this.inti_component();
+ }
+
+ inti_component() {
+ this.prepare_dom();
+ this.make_search_bar();
+ this.load_items_data();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+
+
+
+
+
+ ALL ITEMS
+
+
+
+ 
+
`
+ } else {
+ return `
+ ${frappe.get_abbr(item.item_name)}
+
`
+ }
+ }
+
+ return (
+ `
+ ${get_item_image_html()}
+
`
+ )
+ }
+
+ make_search_bar() {
+ const me = this;
+ this.$component.find('.search-field').html('');
+ this.$component.find('.item-group-field').html('');
+
+ this.search_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Search'),
+ fieldtype: 'Data',
+ placeholder: __('Search by item code, serial number, batch no or barcode')
+ },
+ parent: this.$component.find('.search-field'),
+ render_input: true,
+ });
+ this.item_group_field = frappe.ui.form.make_control({
+ df: {
+ label: __('Item Group'),
+ fieldtype: 'Link',
+ options: 'Item Group',
+ placeholder: __('Select item group'),
+ onchange: function() {
+ me.item_group = this.value;
+ !me.item_group && (me.item_group = me.parent_item_group);
+ me.filter_items();
+ },
+ get_query: function () {
+ return {
+ query: 'erpnext.selling.page.point_of_sale.point_of_sale.item_group_query',
+ filters: {
+ pos_profile: me.events.get_frm().doc?.pos_profile
+ }
+ }
+ },
+ },
+ parent: this.$component.find('.item-group-field'),
+ render_input: true,
+ });
+ this.search_field.toggle_label(false);
+ this.item_group_field.toggle_label(false);
+ }
+
+ bind_events() {
+ const me = this;
+ onScan.attachTo(document, {
+ onScan: (sScancode) => {
+ if (this.search_field && this.$component.is(':visible')) {
+ this.search_field.set_focus();
+ $(this.search_field.$input[0]).val(sScancode).trigger("input");
+ this.barcode_scanned = true;
+ }
+ }
+ });
+
+ this.$component.on('click', '.item-wrapper', function() {
+ const $item = $(this);
+ const item_code = unescape($item.attr('data-item-code'));
+ let batch_no = unescape($item.attr('data-batch-no'));
+ let serial_no = unescape($item.attr('data-serial-no'));
+ let uom = unescape($item.attr('data-uom'));
+
+ // escape(undefined) returns "undefined" then unescape returns "undefined"
+ batch_no = batch_no === "undefined" ? undefined : batch_no;
+ serial_no = serial_no === "undefined" ? undefined : serial_no;
+ uom = uom === "undefined" ? undefined : uom;
+
+ me.events.item_selected({ field: 'qty', value: "+1", item: { item_code, batch_no, serial_no, uom }});
+ })
+
+ this.search_field.$input.on('input', (e) => {
+ clearTimeout(this.last_search);
+ this.last_search = setTimeout(() => {
+ const search_term = e.target.value;
+ this.filter_items({ search_term });
+ }, 300);
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+i", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible) return;
+ this.search_field.set_focus();
+ });
+ frappe.ui.keys.on("ctrl+g", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible) return;
+ this.item_group_field.set_focus();
+ });
+ // for selecting the last filtered item on search
+ frappe.ui.keys.on("enter", () => {
+ const selector_is_visible = this.$component.is(':visible');
+ if (!selector_is_visible || this.search_field.get_value() === "") return;
+
+ if (this.items.length == 1) {
+ this.$items_container.find(".item-wrapper").click();
+ frappe.utils.play_sound("submit");
+ $(this.search_field.$input[0]).val("").trigger("input");
+ } else if (this.items.length == 0 && this.barcode_scanned) {
+ // only show alert of barcode is scanned and enter is pressed
+ frappe.show_alert({
+ message: __("No items found. Scan barcode again."),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ this.barcode_scanned = false;
+ $(this.search_field.$input[0]).val("").trigger("input");
+ }
+ });
+ }
+
+ filter_items({ search_term='' }={}) {
+ if (search_term) {
+ search_term = search_term.toLowerCase();
+
+ // memoize
+ this.search_index = this.search_index || {};
+ if (this.search_index[search_term]) {
+ const items = this.search_index[search_term];
+ this.items = items;
+ this.render_item_list(items);
+ return;
+ }
+ }
+
+ this.get_items({ search_value: search_term })
+ .then(({ message }) => {
+ const { items, serial_no, batch_no, barcode } = message;
+ if (search_term && !barcode) {
+ this.search_index[search_term] = items;
+ }
+ this.items = items;
+ this.render_item_list(items);
+ });
+ }
+
+ resize_selector(minimize) {
+ minimize ?
+ this.$component.find('.search-field').removeClass('mr-8') :
+ this.$component.find('.search-field').addClass('mr-8');
+
+ minimize ?
+ this.$component.find('.filter-section').addClass('flex-col') :
+ this.$component.find('.filter-section').removeClass('flex-col');
+
+ minimize ?
+ this.$component.removeClass('col-span-6').addClass('col-span-2') :
+ this.$component.removeClass('col-span-2').addClass('col-span-6')
+
+ minimize ?
+ this.$items_container.removeClass('grid-cols-4').addClass('grid-cols-1') :
+ this.$items_container.removeClass('grid-cols-1').addClass('grid-cols-4')
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_number_pad.js b/erpnext/selling/page/point_of_sale/pos_number_pad.js
new file mode 100644
index 000000000000..2ffc2c02294f
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_number_pad.js
@@ -0,0 +1,49 @@
+erpnext.PointOfSale.NumberPad = class {
+ constructor({ wrapper, events, cols, keys, css_classes, fieldnames_map }) {
+ this.wrapper = wrapper;
+ this.events = events;
+ this.cols = cols;
+ this.keys = keys;
+ this.css_classes = css_classes || [];
+ this.fieldnames = fieldnames_map || {};
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.bind_events();
+ }
+
+ prepare_dom() {
+ const { cols, keys, css_classes, fieldnames } = this;
+
+ function get_keys() {
+ return keys.reduce((a, row, i) => {
+ return a + row.reduce((a2, number, j) => {
+ const class_to_append = css_classes && css_classes[i] ? css_classes[i][j] : '';
+ const fieldname = fieldnames && fieldnames[number] ?
+ fieldnames[number] :
+ typeof number === 'string' ? frappe.scrub(number) : number;
+
+ return a2 + `
+
+
+
+ ${frappe.ellipsis(item.item_name, 18)}
+
+ ${format_currency(item.price_list_rate, item.currency, 0) || 0}
+ ${number}
`
+ }, '')
+ }, '');
+ }
+
+ this.wrapper.html(
+ `
+ ${get_keys()}
+
`
+ )
+ }
+
+ bind_events() {
+ const me = this;
+ this.wrapper.on('click', '.numpad-btn', function() {
+ const $btn = $(this);
+ me.events.numpad_event($btn);
+ })
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_list.js b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
new file mode 100644
index 000000000000..9181ee80007a
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_list.js
@@ -0,0 +1,130 @@
+erpnext.PointOfSale.PastOrderList = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.make_filter_section();
+ this.bind_events();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+
+
+
+
+
+ RECENT ORDERS
+
+
+
`
+ )
+ }
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
new file mode 100644
index 000000000000..24326b22560a
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
@@ -0,0 +1,452 @@
+erpnext.PointOfSale.PastOrderSummary = class {
+ constructor({ wrapper, events }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.init_child_components();
+ this.bind_events();
+ this.attach_shortcuts();
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+ ${invoice.name}
+
+
+
+
+ ${invoice.customer}
+
+
+
+ ${format_currency(invoice.grand_total, invoice.currency, 0) || 0}
+ ${posting_datetime}
+
+
+
+
+ Select an invoice to load summary data
+
+
+
+
+
`
+ )
+
+ this.$items_summary_container = this.$summary_container.find('.items-summary-container');
+ }
+
+ init_totals_summary() {
+ this.$summary_container.append(
+ `ITEMS
+
+
+
`
+ )
+
+ this.$totals_summary_container = this.$summary_container.find('.summary-totals-container');
+ }
+
+ init_payments_summary() {
+ this.$summary_container.append(
+ `TOTALS
+
+
+
`
+ )
+
+ this.$payment_summary_container = this.$summary_container.find('.payments-summary-container');
+ }
+
+ init_summary_buttons() {
+ this.$summary_container.append(
+ ``
+ )
+
+ this.$summary_btns = this.$summary_container.find('.summary-btns');
+ }
+
+ init_email_print_dialog() {
+ const email_dialog = new frappe.ui.Dialog({
+ title: 'Email Receipt',
+ fields: [
+ {fieldname:'email_id', fieldtype:'Data', options: 'Email', label:'Email ID'},
+ // {fieldname:'remarks', fieldtype:'Text', label:'Remarks (if any)'}
+ ],
+ primary_action: () => {
+ this.send_email();
+ },
+ primary_action_label: __('Send'),
+ });
+ this.email_dialog = email_dialog;
+
+ const print_dialog = new frappe.ui.Dialog({
+ title: 'Print Receipt',
+ fields: [
+ {fieldname:'print', fieldtype:'Data', label:'Print Preview'}
+ ],
+ primary_action: () => {
+ this.events.get_frm().print_preview.printit(true);
+ },
+ primary_action_label: __('Print'),
+ });
+ this.print_dialog = print_dialog;
+ }
+
+ get_upper_section_html(doc) {
+ const { status } = doc; let indicator_color = '';
+
+ in_list(['Paid', 'Consolidated'], status) && (indicator_color = 'green');
+ status === 'Draft' && (indicator_color = 'red');
+ status === 'Return' && (indicator_color = 'grey');
+
+ return `PAYMENTS
+
+
+
+ ${doc.customer}
+ ${this.customer_email}
+ Sold by: ${doc.owner}
+
+
`
+ }
+
+ get_discount_html(doc) {
+ if (doc.discount_amount) {
+ return `${format_currency(doc.paid_amount, doc.currency)}
+
+
+ ${doc.name}
+ ${doc.status}
+
+
`;
+ } else {
+ return ``;
+ }
+ }
+
+ get_net_total_html(doc) {
+ return `
+
+
+ Discount
+
+ (${doc.additional_discount_percentage} %)
+
+
+ ${format_currency(doc.discount_amount, doc.currency)}
+
+
`
+ }
+
+ get_taxes_html(doc) {
+ return `
+
+
+ Net Total
+
+
+
+ ${format_currency(doc.net_total, doc.currency)}
+
+
`
+ }
+
+ get_grand_total_html(doc) {
+ return `
+
+ Tax Charges
+
+ ${
+ doc.taxes.map((t, i) => {
+ let margin_left = '';
+ if (i !== 0) margin_left = 'ml-2';
+ return `${t.description} @${t.rate}%`
+ }).join('')
+ }
+
+
+
+ ${format_currency(doc.base_total_taxes_and_charges, doc.currency)}
+
+
`
+ }
+
+ get_item_html(doc, item_data) {
+ return `
+
+
+ Grand Total
+
+
+
+ ${format_currency(doc.grand_total, doc.currency)}
+
+
`
+
+ function get_rate_discount_html() {
+ if (item_data.rate && item_data.price_list_rate && item_data.rate !== item_data.price_list_rate) {
+ return `(${item_data.discount_percentage}% off)
+
+ ${item_data.qty || 0}
+
+
+
+
+ ${item_data.item_name}
+
+
+ ${get_rate_discount_html()}
+
+ ${format_currency(item_data.rate, doc.currency)}
`
+ } else {
+ return `${format_currency(item_data.price_list_rate || item_data.rate, doc.currency)}
`
+ }
+ }
+ }
+
+ get_payment_html(doc, payment) {
+ return `
+
`
+ }
+
+ bind_events() {
+ this.$summary_container.on('click', '.return-btn', () => {
+ this.events.process_return(this.doc.name);
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.edit-btn', () => {
+ this.events.edit_order(this.doc.name);
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.new-btn', () => {
+ this.events.new_order();
+ this.toggle_component(false);
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ this.$summary_wrapper.addClass('d-none');
+ });
+
+ this.$summary_container.on('click', '.email-btn', () => {
+ this.email_dialog.fields_dict.email_id.set_value(this.customer_email);
+ this.email_dialog.show();
+ });
+
+ this.$summary_container.on('click', '.print-btn', () => {
+ // this.print_dialog.show();
+ const frm = this.events.get_frm();
+ frm.doc = this.doc;
+ frm.print_preview.printit(true);
+ });
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+p", () => {
+ const print_btn_visible = this.$summary_container.find('.print-btn').is(":visible");
+ const summary_visible = this.$component.is(":visible");
+ if (!summary_visible || !print_btn_visible) return;
+
+ this.$summary_container.find('.print-btn').click();
+ });
+ }
+
+ toggle_component(show) {
+ show ?
+ this.$component.removeClass('d-none') :
+ this.$component.addClass('d-none');
+ }
+
+ send_email() {
+ const frm = this.events.get_frm();
+ const recipients = this.email_dialog.get_values().recipients;
+ const doc = this.doc || frm.doc;
+ const print_format = frm.pos_print_format;
+
+ frappe.call({
+ method:"frappe.core.doctype.communication.email.make",
+ args: {
+ recipients: recipients,
+ subject: __(frm.meta.name) + ': ' + doc.name,
+ doctype: doc.doctype,
+ name: doc.name,
+ send_email: 1,
+ print_format,
+ sender_full_name: frappe.user.full_name(),
+ _lang : doc.language
+ },
+ callback: r => {
+ if(!r.exc) {
+ frappe.utils.play_sound("email");
+ if(r.message["emails_not_sent_to"]) {
+ frappe.msgprint(__("Email not sent to {0} (unsubscribed / disabled)",
+ [ frappe.utils.escape_html(r.message["emails_not_sent_to"]) ]) );
+ } else {
+ frappe.show_alert({
+ message: __('Email sent successfully.'),
+ indicator: 'green'
+ });
+ }
+ this.email_dialog.hide();
+ } else {
+ frappe.msgprint(__("There were errors while sending email. Please try again."));
+ }
+ }
+ });
+ }
+
+ add_summary_btns(map) {
+ this.$summary_btns.html('');
+ map.forEach(m => {
+ if (m.condition) {
+ m.visible_btns.forEach(b => {
+ const class_name = b.split(' ')[0].toLowerCase();
+ this.$summary_btns.append(
+ `
+
+
+ ${payment.mode_of_payment}
+
+
+
+ ${format_currency(payment.amount, doc.currency)}
+
+ ${b}
+
`
+ )
+ });
+ }
+ });
+ this.$summary_btns.children().last().removeClass('mr-4');
+ }
+
+ show_summary_placeholder() {
+ this.$summary_wrapper.addClass("d-none");
+ this.$component.find('.no-summary-placeholder').removeClass('d-none');
+ }
+
+ switch_to_post_submit_summary() {
+ // switch to full width view
+ this.$component.removeClass('col-span-6').addClass('col-span-10');
+ this.$summary_wrapper.removeClass('w-66').addClass('w-40');
+
+ // switch place holder with summary container
+ this.$component.find('.no-summary-placeholder').addClass('d-none');
+ this.$summary_wrapper.removeClass('d-none');
+ }
+
+ switch_to_recent_invoice_summary() {
+ // switch full width view with 60% view
+ this.$component.removeClass('col-span-10').addClass('col-span-6');
+ this.$summary_wrapper.removeClass('w-40').addClass('w-66');
+
+ // switch place holder with summary container
+ this.$component.find('.no-summary-placeholder').addClass('d-none');
+ this.$summary_wrapper.removeClass('d-none');
+ }
+
+ get_condition_btn_map(after_submission) {
+ if (after_submission)
+ return [{ condition: true, visible_btns: ['Print Receipt', 'Email Receipt', 'New Order'] }];
+
+ return [
+ { condition: this.doc.docstatus === 0, visible_btns: ['Edit Order'] },
+ { condition: !this.doc.is_return && this.doc.docstatus === 1, visible_btns: ['Print Receipt', 'Email Receipt', 'Return']},
+ { condition: this.doc.is_return && this.doc.docstatus === 1, visible_btns: ['Print Receipt', 'Email Receipt']}
+ ];
+ }
+
+ load_summary_of(doc, after_submission=false) {
+ this.$summary_wrapper.removeClass("d-none");
+
+ after_submission ?
+ this.switch_to_post_submit_summary() : this.switch_to_recent_invoice_summary();
+
+ this.doc = doc;
+
+ this.attach_basic_info(doc);
+
+ this.attach_items_info(doc);
+
+ this.attach_totals_info(doc);
+
+ this.attach_payments_info(doc);
+
+ const condition_btns_map = this.get_condition_btn_map(after_submission);
+
+ this.add_summary_btns(condition_btns_map);
+ }
+
+ attach_basic_info(doc) {
+ frappe.db.get_value('Customer', this.doc.customer, 'email_id').then(({ message }) => {
+ this.customer_email = message.email_id || '';
+ const upper_section_dom = this.get_upper_section_html(doc);
+ this.$upper_section.html(upper_section_dom);
+ });
+ }
+
+ attach_items_info(doc) {
+ this.$items_summary_container.html('');
+ doc.items.forEach(item => {
+ const item_dom = this.get_item_html(doc, item);
+ this.$items_summary_container.append(item_dom);
+ });
+ }
+
+ attach_payments_info(doc) {
+ this.$payment_summary_container.html('');
+ doc.payments.forEach(p => {
+ if (p.amount) {
+ const payment_dom = this.get_payment_html(doc, p);
+ this.$payment_summary_container.append(payment_dom);
+ }
+ });
+ if (doc.redeem_loyalty_points && doc.loyalty_amount) {
+ const payment_dom = this.get_payment_html(doc, {
+ mode_of_payment: 'Loyalty Points',
+ amount: doc.loyalty_amount,
+ });
+ this.$payment_summary_container.append(payment_dom);
+ }
+ }
+
+ attach_totals_info(doc) {
+ this.$totals_summary_container.html('');
+
+ const discount_dom = this.get_discount_html(doc);
+ const net_total_dom = this.get_net_total_html(doc);
+ const taxes_dom = this.get_taxes_html(doc);
+ const grand_total_dom = this.get_grand_total_html(doc);
+ this.$totals_summary_container.append(discount_dom);
+ this.$totals_summary_container.append(net_total_dom);
+ this.$totals_summary_container.append(taxes_dom);
+ this.$totals_summary_container.append(grand_total_dom);
+ }
+
+}
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
new file mode 100644
index 000000000000..e1c54f64a71a
--- /dev/null
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -0,0 +1,503 @@
+{% include "erpnext/selling/page/point_of_sale/pos_number_pad.js" %}
+
+erpnext.PointOfSale.Payment = class {
+ constructor({ events, wrapper }) {
+ this.wrapper = wrapper;
+ this.events = events;
+
+ this.init_component();
+ }
+
+ init_component() {
+ this.prepare_dom();
+ this.initialize_numpad();
+ this.bind_events();
+ this.attach_shortcuts();
+
+ }
+
+ prepare_dom() {
+ this.wrapper.append(
+ `
+
+
+ PAYMENT METHOD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Complete Order
+
+
+
+ ADDITIONAL INFORMATION
+
+ `
+ );
+ this.$invoice_fields = this.$invoice_details_section.find('.invoice-fields');
+ const frm = this.events.get_frm();
+
+ fields.forEach(df => {
+ this.$invoice_fields.append(
+ ``
+ );
+
+ this[`${df.fieldname}_field`] = frappe.ui.form.make_control({
+ df: {
+ ...df,
+ onchange: function() {
+ frm.set_value(this.df.fieldname, this.value);
+ }
+ },
+ parent: this.$invoice_fields.find(`.${df.fieldname}-field`),
+ render_input: true,
+ });
+ this[`${df.fieldname}_field`].set_value(frm.doc[df.fieldname]);
+ })
+ });
+ }
+
+ initialize_numpad() {
+ const me = this;
+ this.number_pad = new erpnext.PointOfSale.NumberPad({
+ wrapper: this.$numpad,
+ events: {
+ numpad_event: function($btn) {
+ me.on_numpad_clicked($btn);
+ }
+ },
+ cols: 3,
+ keys: [
+ [ 1, 2, 3 ],
+ [ 4, 5, 6 ],
+ [ 7, 8, 9 ],
+ [ '.', 0, 'Delete' ]
+ ],
+ })
+
+ this.numpad_value = '';
+ }
+
+ on_numpad_clicked($btn) {
+ const me = this;
+ const button_value = $btn.attr('data-button-value');
+
+ highlight_numpad_btn($btn);
+ this.numpad_value = button_value === 'delete' ? this.numpad_value.slice(0, -1) : this.numpad_value + button_value;
+ this.selected_mode.$input.get(0).focus();
+ this.selected_mode.set_value(this.numpad_value);
+
+ function highlight_numpad_btn($btn) {
+ $btn.addClass('shadow-inner bg-selected');
+ setTimeout(() => {
+ $btn.removeClass('shadow-inner bg-selected');
+ }, 100);
+ }
+ }
+
+ bind_events() {
+ const me = this;
+
+ this.$payment_modes.on('click', '.mode-of-payment', function(e) {
+ const mode_clicked = $(this);
+ // if clicked element doesn't have .mode-of-payment class then return
+ if (!$(e.target).is(mode_clicked)) return;
+
+ const mode = mode_clicked.attr('data-mode');
+
+ // hide all control fields and shortcuts
+ $(`.mode-of-payment-control`).addClass('d-none');
+ $(`.cash-shortcuts`).addClass('d-none');
+ me.$payment_modes.find(`.pay-amount`).removeClass('d-none');
+ me.$payment_modes.find(`.loyalty-amount-name`).addClass('d-none');
+
+ // remove highlight from all mode-of-payments
+ $('.mode-of-payment').removeClass('border-primary');
+
+ if (mode_clicked.hasClass('border-primary')) {
+ // clicked one is selected then unselect it
+ mode_clicked.removeClass('border-primary');
+ me.selected_mode = '';
+ me.toggle_numpad(false);
+ } else {
+ // clicked one is not selected then select it
+ mode_clicked.addClass('border-primary');
+ mode_clicked.find('.mode-of-payment-control').removeClass('d-none');
+ mode_clicked.find('.cash-shortcuts').removeClass('d-none');
+ me.$payment_modes.find(`.${mode}-amount`).addClass('d-none');
+ me.$payment_modes.find(`.${mode}-name`).removeClass('d-none');
+ me.toggle_numpad(true);
+
+ me.selected_mode = me[`${mode}_control`];
+ const doc = me.events.get_frm().doc;
+ me.selected_mode?.$input?.get(0).focus();
+ !me.selected_mode?.get_value() ? me.selected_mode?.set_value(doc.grand_total - doc.paid_amount) : '';
+ }
+ })
+
+ this.$payment_modes.on('click', '.shortcut', function(e) {
+ const value = $(this).attr('data-value');
+ me.selected_mode.set_value(value);
+ })
+
+ // this.$totals_remarks.on('click', '.remarks', () => {
+ // this.toggle_remarks_control();
+ // })
+
+ this.$component.on('click', '.submit-order', () => {
+ const doc = this.events.get_frm().doc;
+ const paid_amount = doc.paid_amount;
+ const items = doc.items;
+
+ if (paid_amount == 0 || !items.length) {
+ const message = items.length ? __("You cannot submit the order without payment.") : __("You cannot submit empty order.")
+ frappe.show_alert({ message, indicator: "orange" });
+ frappe.utils.play_sound("error");
+ return;
+ }
+
+ this.events.submit_invoice();
+ })
+
+ frappe.ui.form.on('POS Invoice', 'paid_amount', (frm) => {
+ this.update_totals_section(frm.doc);
+
+ // need to re calculate cash shortcuts after discount is applied
+ const is_cash_shortcuts_invisible = this.$payment_modes.find('.cash-shortcuts').hasClass('d-none');
+ this.attach_cash_shortcuts(frm.doc);
+ !is_cash_shortcuts_invisible && this.$payment_modes.find('.cash-shortcuts').removeClass('d-none');
+ })
+
+ frappe.ui.form.on('POS Invoice', 'loyalty_amount', (frm) => {
+ const formatted_currency = format_currency(frm.doc.loyalty_amount, frm.doc.currency);
+ this.$payment_modes.find(`.loyalty-amount-amount`).html(formatted_currency);
+ });
+
+ frappe.ui.form.on("Sales Invoice Payment", "amount", (frm, cdt, cdn) => {
+ // for setting correct amount after loyalty points are redeemed
+ const default_mop = locals[cdt][cdn];
+ const mode = default_mop.mode_of_payment.replace(' ', '_').toLowerCase();
+ if (this[`${mode}_control`] && this[`${mode}_control`].get_value() != default_mop.amount) {
+ this[`${mode}_control`].set_value(default_mop.amount);
+ }
+ });
+
+ this.$component.on('click', '.invoice-details-section', function(e) {
+ if ($(e.target).closest('.invoice-fields').length) return;
+
+ me.$payment_modes.addClass('d-none');
+ me.$invoice_fields.toggleClass("d-none");
+ me.toggle_numpad(false);
+ });
+ this.$component.on('click', '.payment-section', () => {
+ this.$invoice_fields.addClass("d-none");
+ this.$payment_modes.toggleClass('d-none');
+ this.toggle_numpad(true);
+ })
+ }
+
+ attach_shortcuts() {
+ frappe.ui.keys.on("ctrl+enter", () => {
+ const payment_is_visible = this.$component.is(":visible");
+ const active_mode = this.$payment_modes.find(".border-primary");
+ if (payment_is_visible && active_mode.length) {
+ this.$component.find('.submit-order').click();
+ }
+ });
+
+ frappe.ui.keys.on("tab", () => {
+ const payment_is_visible = this.$component.is(":visible");
+ const mode_of_payments = Array.from(this.$payment_modes.find(".mode-of-payment")).map(m => $(m).attr("data-mode"));
+ let active_mode = this.$payment_modes.find(".border-primary");
+ active_mode = active_mode.length ? active_mode.attr("data-mode") : undefined;
+
+ if (!active_mode) return;
+
+ const mode_index = mode_of_payments.indexOf(active_mode);
+ const next_mode_index = (mode_index + 1) % mode_of_payments.length;
+ const next_mode_to_be_clicked = this.$payment_modes.find(`.mode-of-payment[data-mode="${mode_of_payments[next_mode_index]}"]`);
+
+ if (payment_is_visible && mode_index != next_mode_index) {
+ next_mode_to_be_clicked.click();
+ }
+ });
+ }
+
+ toggle_numpad(show) {
+ if (show) {
+ this.$numpad.removeClass('d-none');
+ this.$remarks.addClass('d-none');
+ this.$totals_remarks.addClass('w-60 justify-center').removeClass('justify-end w-full');
+ } else {
+ this.$numpad.addClass('d-none');
+ this.$remarks.removeClass('d-none');
+ this.$totals_remarks.removeClass('w-60 justify-center').addClass('justify-end w-full');
+ }
+ }
+
+ render_payment_section() {
+ this.render_payment_mode_dom();
+ this.make_invoice_fields_control();
+ this.update_totals_section();
+ }
+
+ edit_cart() {
+ this.events.toggle_other_sections(false);
+ this.toggle_component(false);
+ }
+
+ checkout() {
+ this.events.toggle_other_sections(true);
+ this.toggle_component(true);
+
+ this.render_payment_section();
+ }
+
+ toggle_remarks_control() {
+ if (this.$remarks.find('.frappe-control').length) {
+ this.$remarks.html('+ Add Remark');
+ } else {
+ this.$remarks.html('');
+ this[`remark_control`] = frappe.ui.form.make_control({
+ df: {
+ label: __('Remark'),
+ fieldtype: 'Data',
+ onchange: function() {}
+ },
+ parent: this.$totals_remarks.find(`.remarks`),
+ render_input: true,
+ });
+ this[`remark_control`].set_value('');
+ }
+ }
+
+ render_payment_mode_dom() {
+ const doc = this.events.get_frm().doc;
+ const payments = doc.payments;
+ const currency = doc.currency;
+
+ this.$payment_modes.html(
+ `${
+ payments.map((p, i) => {
+ const mode = p.mode_of_payment.replace(' ', '_').toLowerCase();
+ const payment_type = p.type;
+ const margin = i % 2 === 0 ? 'pr-2' : 'pl-2';
+ const amount = p.amount > 0 ? format_currency(p.amount, currency) : '';
+
+ return (
+ `
+
`
+ )
+ }).join('')
+ }`
+ )
+
+ payments.forEach(p => {
+ const mode = p.mode_of_payment.replace(' ', '_').toLowerCase();
+ const me = this;
+ this[`${mode}_control`] = frappe.ui.form.make_control({
+ df: {
+ label: __(`${p.mode_of_payment}`),
+ fieldtype: 'Currency',
+ placeholder: __(`Enter ${p.mode_of_payment} amount.`),
+ onchange: function() {
+ if (this.value || this.value == 0) {
+ frappe.model.set_value(p.doctype, p.name, 'amount', flt(this.value))
+ .then(() => me.update_totals_section());
+
+ const formatted_currency = format_currency(this.value, currency);
+ me.$payment_modes.find(`.${mode}-amount`).html(formatted_currency);
+ }
+ }
+ },
+ parent: this.$payment_modes.find(`.${mode}.mode-of-payment-control`),
+ render_input: true,
+ });
+ this[`${mode}_control`].toggle_label(false);
+ this[`${mode}_control`].set_value(p.amount);
+
+ if (p.default) {
+ setTimeout(() => {
+ this.$payment_modes.find(`.${mode}.mode-of-payment-control`).parent().click();
+ }, 500);
+ }
+ })
+
+ this.render_loyalty_points_payment_mode();
+
+ this.attach_cash_shortcuts(doc);
+ }
+
+ attach_cash_shortcuts(doc) {
+ const grand_total = doc.grand_total;
+ const currency = doc.currency;
+
+ const shortcuts = this.get_cash_shortcuts(flt(grand_total));
+
+ this.$payment_modes.find('.cash-shortcuts').remove();
+ this.$payment_modes.find('[data-payment-type="Cash"]').find('.mode-of-payment-control').after(
+ `
+ ${p.mode_of_payment}
+
+ ${amount}
+
+
+ ${
+ shortcuts.map(s => {
+ return `
`
+ )
+ }
+
+ get_cash_shortcuts(grand_total) {
+ let steps = [1, 5, 10];
+ const digits = String(Math.round(grand_total)).length;
+
+ steps = steps.map(x => x * (10 ** (digits - 2)));
+
+ const get_nearest = (amount, x) => {
+ let nearest_x = Math.ceil((amount / x)) * x;
+ return nearest_x === amount ? nearest_x + x : nearest_x;
+ }
+
+ return steps.reduce((finalArr, x) => {
+ let nearest_x = get_nearest(grand_total, x);
+ nearest_x = finalArr.indexOf(nearest_x) != -1 ? nearest_x + x : nearest_x;
+ return [...finalArr, nearest_x];
+ }, []);
+ }
+
+ render_loyalty_points_payment_mode() {
+ const me = this;
+ const doc = this.events.get_frm().doc;
+ const { loyalty_program, loyalty_points, conversion_factor } = this.events.get_customer_details();
+
+ this.$payment_modes.find(`.mode-of-payment[data-mode="loyalty-amount"]`).parent().remove();
+
+ if (!loyalty_program) return;
+
+ let description, read_only, max_redeemable_amount;
+ if (!loyalty_points) {
+ description = __(`You don't have enough points to redeem.`);
+ read_only = true;
+ } else {
+ max_redeemable_amount = flt(flt(loyalty_points) * flt(conversion_factor), precision("loyalty_amount", doc))
+ description = __(`You can redeem upto ${format_currency(max_redeemable_amount)}.`);
+ read_only = false;
+ }
+
+ const margin = this.$payment_modes.children().length % 2 === 0 ? 'pr-2' : 'pl-2';
+ const amount = doc.loyalty_amount > 0 ? format_currency(doc.loyalty_amount, doc.currency) : '';
+ this.$payment_modes.append(
+ `
+ ${format_currency(s, currency)}
+
`
+ }).join('')
+ }
+
+
`
+ )
+
+ this['loyalty-amount_control'] = frappe.ui.form.make_control({
+ df: {
+ label: __('Redeem Loyalty Points'),
+ fieldtype: 'Currency',
+ placeholder: __(`Enter amount to be redeemed.`),
+ options: 'company:currency',
+ read_only,
+ onchange: async function() {
+ if (!loyalty_points) return;
+
+ if (this.value > max_redeemable_amount) {
+ frappe.show_alert({
+ message: __(`You cannot redeem more than ${format_currency(max_redeemable_amount)}.`),
+ indicator: "red"
+ });
+ frappe.utils.play_sound("submit");
+ me['loyalty-amount_control'].set_value(0);
+ return;
+ }
+ const redeem_loyalty_points = this.value > 0 ? 1 : 0;
+ await frappe.model.set_value(doc.doctype, doc.name, 'redeem_loyalty_points', redeem_loyalty_points);
+ frappe.model.set_value(doc.doctype, doc.name, 'loyalty_points', parseInt(this.value / conversion_factor));
+ },
+ description
+ },
+ parent: this.$payment_modes.find(`.loyalty-amount.mode-of-payment-control`),
+ render_input: true,
+ });
+ this['loyalty-amount_control'].toggle_label(false);
+
+ // this.render_add_payment_method_dom();
+ }
+
+ render_add_payment_method_dom() {
+ const docstatus = this.events.get_frm().doc.docstatus;
+ if (docstatus === 0)
+ this.$payment_modes.append(
+ `
+ Redeem Loyalty Points
+
+ ${amount}
+ ${loyalty_program}
+
+
+
`
+ )
+ }
+
+ update_totals_section(doc) {
+ if (!doc) doc = this.events.get_frm().doc;
+ const paid_amount = doc.paid_amount;
+ const remaining = doc.grand_total - doc.paid_amount;
+ const change = doc.change_amount || remaining <= 0 ? -1 * remaining : undefined;
+ const currency = doc.currency
+ const label = change ? __('Change') : __('To Be Paid');
+
+ this.$totals.html(
+ `+ Add Payment Method
+
+
+ Paid Amount
+ ${format_currency(paid_amount, currency)}
+
+
`
+ )
+ }
+
+ toggle_component(show) {
+ show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
+ }
+ }
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js b/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
deleted file mode 100644
index 79d1700b4edf..000000000000
--- a/erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
+++ /dev/null
@@ -1,38 +0,0 @@
-QUnit.test("test:Point of Sales", function(assert) {
- assert.expect(1);
- let done = assert.async();
-
- frappe.run_serially([
- () => frappe.set_route('point-of-sale'),
- () => frappe.timeout(3),
- () => frappe.set_control('customer', 'Test Customer 1'),
- () => frappe.timeout(0.2),
- () => cur_frm.set_value('customer', 'Test Customer 1'),
- () => frappe.timeout(2),
- () => frappe.click_link('Test Product 2'),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.cart-items [data-item-code="Test Product 2"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.number-pad [data-value="Rate"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.number-pad [data-value="2"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.number-pad [data-value="5"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.number-pad [data-value="0"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.number-pad [data-value="Pay"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.frappe-control [data-value="4"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.frappe-control [data-value="5"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_element(`.frappe-control [data-value="0"]`),
- () => frappe.timeout(0.2),
- () => frappe.click_button('Submit'),
- () => frappe.click_button('Yes'),
- () => frappe.timeout(3),
- () => assert.ok(cur_frm.doc.docstatus==1, "Sales invoice created successfully"),
- () => done()
- ]);
-});
\ No newline at end of file
diff --git a/erpnext/selling/print_format/__init__.py b/erpnext/selling/print_format/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/erpnext/selling/print_format/gst_pos_invoice/__init__.py b/erpnext/selling/print_format/gst_pos_invoice/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json b/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json
new file mode 100644
index 000000000000..9094a07bccca
--- /dev/null
+++ b/erpnext/selling/print_format/gst_pos_invoice/gst_pos_invoice.json
@@ -0,0 +1,23 @@
+{
+ "align_labels_right": 0,
+ "creation": "2017-08-08 12:33:04.773099",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "POS Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n${label}
+ ${format_currency(change || remaining, currency)}
+ \n\t{{ doc.company }}
\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"
\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t{{ _(\"GSTIN\") }}:{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"
GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t
\n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}
\n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}
\n\t{% endif %}\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"
\", \" \") %}\n\t\t{{ _(\"Customer\") }}:
\n\t\t{{ doc.customer_name }}
\n\t\t{{ customer_address }}\n\t{% endif %}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t {{ _(\"HSN/SAC\") }}: {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.rate }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t\t{% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t | \n\t\t
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 0, + "line_breaks": 0, + "modified": "2020-04-29 16:47:02.743246", + "modified_by": "Administrator", + "module": "Selling", + "name": "GST POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/print_format/pos_invoice/__init__.py b/erpnext/selling/print_format/pos_invoice/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/erpnext/selling/print_format/pos_invoice/pos_invoice.json b/erpnext/selling/print_format/pos_invoice/pos_invoice.json new file mode 100644 index 000000000000..99094ed9b02d --- /dev/null +++ b/erpnext/selling/print_format/pos_invoice/pos_invoice.json @@ -0,0 +1,22 @@ +{ + "align_labels_right": 0, + "creation": "2011-12-21 11:08:55", + "custom_format": 1, + "disabled": 0, + "doc_type": "POS Invoice", + "docstatus": 0, + "doctype": "Print Format", + "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n\n\n\t{{ doc.company }}
\n\t{{ doc.select_print_heading or _(\"Invoice\") }}
\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{{ _(\"Customer\") }}: {{ doc.customer_name }}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.get_formatted(\"rate\") }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t {% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t\t | \n\t\t\t
\n
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 1, + "line_breaks": 0, + "modified": "2020-04-29 16:45:58.942375", + "modified_by": "Administrator", + "module": "Selling", + "name": "POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/print_format/return_pos_invoice/__init__.py b/erpnext/selling/print_format/return_pos_invoice/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json b/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json new file mode 100644 index 000000000000..d7f335059ca3 --- /dev/null +++ b/erpnext/selling/print_format/return_pos_invoice/return_pos_invoice.json @@ -0,0 +1,24 @@ +{ + "align_labels_right": 0, + "creation": "2020-05-14 17:02:44.207166", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "POS Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font": "Default", + "html": "\n\n{% if letter_head %}\n {{ letter_head }}\n{% endif %}\n\n\n\t{{ doc.company }}
\n\t{{ doc.select_print_heading or _(\"Return Invoice\") }}
\n
\n\t{{ _(\"Receipt No\") }}: {{ doc.name }}
\n\t{{ _(\"Original Invoice\") }}: {{ doc.return_against }}
\n\t{{ _(\"Date\") }}: {{ doc.get_formatted(\"posting_date\") }}
\n\t{{ _(\"Customer\") }}: {{ doc.customer_name }}\n
\n
| {{ _(\"Item\") }} | \n\t\t\t{{ _(\"Qty\") }} | \n\t\t\t{{ _(\"Amount\") }} | \n\t\t
|---|---|---|
| \n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t {{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t {{ _(\"SR.No\") }}: \n\t\t\t\t\t{{ item.serial_no | replace(\"\\n\", \", \") }}\n\t\t\t\t{%- endif -%}\n\t\t\t | \n\t\t\t{{ item.qty }} @ {{ item.get_formatted(\"rate\") }} | \n\t\t\t{{ item.get_formatted(\"amount\") }} | \n\t\t
| \n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t | \n\t\t\t{% else %}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t | \n\t\t\t{% endif %}\n\t\t
| \n\t\t\t\t {% if '%' in row.description %}\n\t\t\t\t\t {{ row.description }}\n\t\t\t\t\t{% else %}\n\t\t\t\t\t {{ row.description }}@{{ row.rate }}%\n\t\t\t\t\t{% endif %}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc)}}\n\t\t\t\t | \n\t\t\t||
| \n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Grand Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Rounded Total\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t{{ _(\"Paid Amount\") }}\n\t\t\t | \n\t\t\t\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t | \n\t\t||
| \n\t\t\t\t\t{{ _(\"Change Amount\") }}\n\t\t\t\t | \n\t\t\t\t\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\")}}\n\t\t\t\t | \n\t\t\t
\n
{{ doc.terms or \"\" }}
\n{{ _(\"Thank you, please visit again.\") }}
", + "idx": 0, + "line_breaks": 0, + "modified": "2020-05-14 17:13:29.354015", + "modified_by": "Administrator", + "module": "Selling", + "name": "Return POS Invoice", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 4a7dd5ad9b42..333a563aa5d8 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -142,7 +142,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ frappe.model.round_floats_in(item, ["price_list_rate", "discount_percentage"]); // check if child doctype is Sales Order Item/Qutation Item and calculate the rate - if(in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item"]), cdt) + if(in_list(["Quotation Item", "Sales Order Item", "Delivery Note Item", "Sales Invoice Item", "POS Invoice Item"]), cdt) this.apply_pricing_rule_on_item(item); else item.rate = flt(item.price_list_rate * (1 - item.discount_percentage / 100.0), @@ -312,6 +312,11 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ batch_no: function(doc, cdt, cdn) { var me = this; var item = frappe.get_doc(cdt, cdn); + + if (item.serial_no) { + return; + } + item.serial_no = null; var has_serial_no; frappe.db.get_value('Item', {'item_code': item.item_code}, 'has_serial_no', (r) => { diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 153ce2fb6746..f7ff916c5a24 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe +import json from frappe.model.naming import make_autoname from frappe.utils import cint, cstr, flt, add_days, nowdate, getdate @@ -537,15 +538,54 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note): return serial_nos @frappe.whitelist() -def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None): - import json +def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None, for_doctype=None): filters = { "item_code": item_code, "warehouse": warehouse, "delivery_document_no": "", "sales_invoice": "" } - if batch_nos: filters["batch_no"] = ["in", json.loads(batch_nos)] + + if batch_nos: + try: + filters["batch_no"] = ["in", json.loads(batch_nos)] + except: + filters["batch_no"] = ["in", [batch_nos]] + + if for_doctype == 'POS Invoice': + reserved_serial_nos, unreserved_serial_nos = get_pos_reserved_serial_nos(filters, qty) + return unreserved_serial_nos serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") return [item['name'] for item in serial_numbers] + +@frappe.whitelist() +def get_pos_reserved_serial_nos(filters, qty=None): + batch_no_cond = "" + if filters.get("batch_no"): + batch_no_cond = "and item.batch_no = {}".format(frappe.db.escape(filters.get('batch_no'))) + + reserved_serial_nos_str = [d.serial_no for d in frappe.db.sql("""select item.serial_no as serial_no + from `tabPOS Invoice` p, `tabPOS Invoice Item` item + where p.name = item.parent + and p.consolidated_invoice is NULL + and p.docstatus = 1 + and item.docstatus = 1 + and item.item_code = %s + and item.warehouse = %s + {} + """.format(batch_no_cond), [filters.get('item_code'), filters.get('warehouse')], as_dict=1)] + + reserved_serial_nos = [] + for s in reserved_serial_nos_str: + if not s: continue + + serial_nos = s.split("\n") + serial_nos = ' '.join(serial_nos).split() # remove whitespaces + if len(serial_nos): reserved_serial_nos += serial_nos + + filters["name"] = ["not in", reserved_serial_nos] + serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation") + unreserved_serial_nos = [item['name'] for item in serial_numbers] + + return reserved_serial_nos, unreserved_serial_nos \ No newline at end of file diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index b8554c83e249..1a7c15ebca79 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -401,13 +401,30 @@ def get_item_warehouse(item, args, overwrite_warehouse, defaults={}): return warehouse def update_barcode_value(out): - from erpnext.accounts.doctype.sales_invoice.pos import get_barcode_data barcode_data = get_barcode_data([out]) # If item has one barcode then update the value of the barcode field if barcode_data and len(barcode_data.get(out.item_code)) == 1: out['barcode'] = barcode_data.get(out.item_code)[0] +def get_barcode_data(items_list): + # get itemwise batch no data + # exmaple: {'LED-GRE': [Batch001, Batch002]} + # where LED-GRE is item code, SN0001 is serial no and Pune is warehouse + + itemwise_barcode = {} + for item in items_list: + barcodes = frappe.db.sql(""" + select barcode from `tabItem Barcode` where parent = %s + """, item.item_code, as_dict=1) + + for barcode in barcodes: + if item.item_code not in itemwise_barcode: + itemwise_barcode.setdefault(item.item_code, []) + itemwise_barcode[item.item_code].append(barcode.get("barcode")) + + return itemwise_barcode + @frappe.whitelist() def get_item_tax_info(company, tax_category, item_codes): out = {}