Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added event on numeric keypad

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-02-28 16:51:17 +05:30
parent 86ab6a93b4
commit 56a7974b58
4 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/page/pos/pos.js
View File

@ -955,6 +955,15 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
}) })
}, },
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) { get_child_item: function(item_code) {
var me = this; var me = this;
return $.map(me.frm.doc.items, function(doc){ return $.map(me.frm.doc.items, function(doc){

27
erpnext/public/css/erpnext.css
View File

@ -61,6 +61,23 @@
.pos-item-toolbar .form-group { .pos-item-toolbar .form-group {
margin-bottom: 0px; 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 { .edit-pos-item {
height: 50px; height: 50px;
font-size: 14px; font-size: 14px;
@ -136,6 +153,16 @@
} }
.pos-keyboard-key, .pos-keyboard-key,
.delete-btn { .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; border: 1px solid #d1d8dd;
height: 69px; height: 69px;
width: 69px; width: 69px;

28
erpnext/public/js/pos/pos_selected_item.html
View File

@ -1,3 +1,4 @@
<<<<<<< d8a807e5853af7f9d633b32c2aff0c80ebca7d3d
<div class="pos-selected-item-action" data-item-code="{%= item_code %}"> <div class="pos-selected-item-action" data-item-code="{%= item_code %}">
<div class="pos-list-row"> <div class="pos-list-row">
<span class="cell bold">{{item_name}}</span> <span class="cell bold">{{item_name}}</span>
@ -17,5 +18,32 @@
<div class="pos-list-row"> <div class="pos-list-row">
<div class="cell">Amount:</div> <div class="cell">Amount:</div>
<div class="cell pos-item-disc">{%= amount %}</div> <div class="cell pos-item-disc">{%= amount %}</div>
=======
<h5 style="margin-top:5px">Item <span class="text-primary no-margin font-montserrat">{%= item_name %}</h5>
<div class="pos-bill-item" data-item-code="{%= item_code %}">
<div class="form-group edit-pos-item">
<label class=" text-left col-xs-4">Price:</label>
<div class="col-xs-8">
<input class="form-control text-right pos-item-price" disabled value="{%= rate %}">
</div>
</div>
<div class="form-group edit-pos-item">
<label class=" text-left col-xs-4">Qty:</label>
<div class="col-xs-8">
<input class="form-control text-right pos-item-qty" disabled value="{%= qty %}">
</div>
</div>
<div class="form-group edit-pos-item">
<label class=" text-left col-xs-4">Discount:</label>
<div class="col-xs-8">
<input class="form-control text-right pos-item-disc" disabled value="{%= discount_percentage %}">
</div>
</div>
<div class="form-group edit-pos-item">
<label class=" text-left col-xs-4">Amount:</label>
<div class="col-xs-8">
<input class="form-control text-right " disabled value="{%= amount %}">
</div>
>>>>>>> added event on numeric keypad
</div> </div>
</div> </div>

11
erpnext/public/less/erpnext.less
View File

@ -198,6 +198,17 @@
} }
.pos-keyboard-key, .delete-btn { .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; border: 1px solid #d1d8dd;
height:69px; height:69px;
width:69px; width:69px;