added event on numeric keypad
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index b1f1985..1db761e 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -85,12 +85,13 @@
}
.item-cart {
overflow-y: scroll;
- height: calc(100vh - 60vh);
+ height: calc(100vh - 72vh);
}
.edit-pos-item {
- height: 40px;
+ height: 50px;
font-size: 14px;
border-top: 1px solid #d1d8dd;
+ padding-top: 12px;
}
.pos-bill-item:hover {
background-color: #f5f7fa;
@@ -171,6 +172,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;
font-size: 20px;
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index c634135..1019647 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -73,15 +73,15 @@
{% for(var i=0; i<3; i++) { %}
<div class="row text-right">
{% for(var j=i*3; j<(i+1)*3; j++) { %}
- <button type="button" class="btn btn-default pos-keyboard-key">{{j+1}}</button>
+ <button type="button" class="btn btn-default numeric-keypad" val="{{j+1}}">{{j+1}}</button>
{% } %}
- <button type="button" class="btn text-center btn-default pos-keyboard-key">{{ chartData[i] }}</button>
+ <button type="button" id = "pos-item-{{ chartData[i].toLowerCase() }}" class="btn text-center btn-default numeric-keypad pos-operation">{{ chartData[i] }}</button>
</div>
{% } %}
<div class="row text-right">
- <button type="button" class="btn btn-default delete-btn">Del</button>
- <button type="button" class="btn btn-default pos-keyboard-key">0</button>
- <button type="button" class="btn btn-default pos-keyboard-key">.</button>
+ <button type="button" class="btn btn-default numeric-keypad numeric-del">Del</button>
+ <button type="button" class="btn btn-default numeric-keypad" val="0">0</button>
+ <button type="button" class="btn btn-default numeric-keypad" val=".">.</button>
<button type="button" class="btn btn-primary pos-pay">Pay</button>
</div>
</div>
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index 1a1f1e2..21868a6 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -18,13 +18,13 @@
</div>
<div class="col-xs-2 text-right">
<div class="row input-sm">
- <input type="tel" value="{%= discount_percentage %}" class="form-control text-right pos-item-discount">
+ <input type="tel" value="{%= discount_percentage %}" class="form-control text-right pos-item-disc">
</div>
</div>
<div class="col-xs-3 text-right">
<div class="text-muted" style="margin-top: 5px;">
{% if(enabled) { %}
- <input type="tel" value="{%= rate %}" class="form-control input-sm pos-item-rate text-right">
+ <input type="tel" value="{%= rate %}" class="form-control input-sm pos-item-price text-right">
{% } else { %}
<h6>{%= format_currency(rate) %}</h6>
{% } %}
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
index 491938e..833cdd9 100644
--- a/erpnext/public/js/pos/pos_selected_item.html
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -3,25 +3,25 @@
<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" value="{%= rate %}">
+ <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" value="{%= qty %}">
+ <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" value="{%= discount_percentage %}">
+ <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 " value="{%= amount %}">
+ <input class="form-control text-right " disabled value="{%= amount %}">
</div>
</div>
</div>
\ No newline at end of file
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 34ea901..3ad8a0b 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -104,13 +104,14 @@
.item-cart {
overflow-y: scroll;
- height: ~"calc(100vh - 60vh)";
+ height: ~"calc(100vh - 72vh)";
}
.edit-pos-item {
- height: 40px;
+ height: 50px;
font-size: 14px;
border-top: 1px solid @border-color;
+ padding-top: 12px;
}
.pos-bill-item:hover {
@@ -213,6 +214,17 @@
.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;
font-size:20px;