diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 7e14ec824ae..bd1372b5018 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -954,6 +954,15 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ me.set_item_details(item_code, "rate", $(this).val()); }) }, + + render_selected_item: function() { + doc = this.get_child_item(this.item_code); + $(this.wrapper).find('.selected-item').empty(); + if(doc.length) { + this.selected_row = frappe.render_template("pos_selected_item", doc[0]) + $(this.wrapper).find('.selected-item').html(this.selected_row) + } + }, get_child_item: function(item_code) { var me = this; diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css index b76d36ee563..052e8c87a75 100644 --- a/erpnext/public/css/erpnext.css +++ b/erpnext/public/css/erpnext.css @@ -61,6 +61,23 @@ .pos-item-toolbar .form-group { margin-bottom: 0px; } +<<<<<<< d8a807e5853af7f9d633b32c2aff0c80ebca7d3d +======= +.pos-bill-wrapper { + border: 1px solid #d1d8dd; + border-top: none; + margin-right: -1px; +} +.pos-bill { + border-top: 1px solid #d1d8dd; + margin-left: -15px; + margin-right: -15px; +} +.item-cart { + overflow-y: scroll; + height: calc(100vh - 72vh); +} +>>>>>>> added event on numeric keypad .edit-pos-item { height: 50px; font-size: 14px; @@ -136,6 +153,16 @@ } .pos-keyboard-key, .delete-btn { + border: 1px solid #d1d8dd; + height: 85px; + width: 85px; + margin: 10px 10px; + font-size: 24px; + font-weight: 200; + background-color: #FDFDFD; + border-color: #e8e8e8; +} +.numeric-keypad { border: 1px solid #d1d8dd; height: 69px; width: 69px; diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html index 501e1da0666..c73daa0c8ae 100644 --- a/erpnext/public/js/pos/pos_selected_item.html +++ b/erpnext/public/js/pos/pos_selected_item.html @@ -1,3 +1,4 @@ +<<<<<<< d8a807e5853af7f9d633b32c2aff0c80ebca7d3d