Browse Source

[UPDT] Refresh button added 'product_return_pos'

pull/145/head
Ajmal JK 5 years ago
parent
commit
504e5cf755
  1. 2
      product_return_pos/__manifest__.py
  2. 5
      product_return_pos/doc/RELEASE_NOTES.md
  3. 6
      product_return_pos/static/src/css/pos_return.css
  4. 17
      product_return_pos/static/src/js/pos_return.js
  5. 15
      product_return_pos/static/src/xml/pos_return.xml

2
product_return_pos/__manifest__.py

@ -21,7 +21,7 @@
############################################################################# #############################################################################
{ {
'name': 'Product Return In POS', 'name': 'Product Return In POS',
'version': '13.0.1.0.1', 'version': '13.0.1.0.2',
'category': 'Point of Sale', 'category': 'Point of Sale',
'summary': 'POS Order Return', 'summary': 'POS Order Return',
'author': 'Cybrosys Techno Solutions', 'author': 'Cybrosys Techno Solutions',

5
product_return_pos/doc/RELEASE_NOTES.md

@ -9,3 +9,8 @@
#### Version 13.0.1.0.1 #### Version 13.0.1.0.1
##### UPDT ##### UPDT
- Auto refresh added. - Auto refresh added.
#### 19.03.2020
#### Version 13.0.1.0.2
##### UPDT
- Refresh Button added.

6
product_return_pos/static/src/css/pos_return.css

@ -39,6 +39,12 @@
margin-top:8px; margin-top:8px;
left: 50%; left: 50%;
} }
.return-screen .refreshbutton{
right: auto;
margin-left: 90px;
margin-top:8px;
left: 85%;
}
.reprint_order_screen .searchbox input{ .reprint_order_screen .searchbox input{
width: 120px; width: 120px;
} }

17
product_return_pos/static/src/js/pos_return.js

@ -4,7 +4,6 @@ odoo.define('product_return_pos.return',function(require) {
var models = require('point_of_sale.models'); var models = require('point_of_sale.models');
var screens = require('point_of_sale.screens'); var screens = require('point_of_sale.screens');
var ScreenWidget = screens.ScreenWidget; var ScreenWidget = screens.ScreenWidget;
var ReceiptScreenWidget = screens.ReceiptScreenWidget;
var gui = require('point_of_sale.gui'); var gui = require('point_of_sale.gui');
var core = require('web.core'); var core = require('web.core');
var QWeb = core.qweb; var QWeb = core.qweb;
@ -31,16 +30,6 @@ models.load_models({
} }
}); });
ReceiptScreenWidget.include({
renderElement: function() {
this._super();
this.$('.next').click(function(){
location.reload();
});
},
});
var ReturnWidget = PopupWidget.extend({ var ReturnWidget = PopupWidget.extend({
template:'ReturnWidget', template:'ReturnWidget',
@ -177,10 +166,14 @@ var OrderListScreenWidget = ScreenWidget.extend({
var self = this; var self = this;
this._super(); this._super();
this.renderElement(); this.renderElement();
var orders = this.pos.orders;
this.$('.back').click(function(){ this.$('.back').click(function(){
self.gui.back(); self.gui.back();
}); });
var orders = this.pos.orders; this.$('.refresh').click(function(){
location.reload();
});
this.render_list(orders); this.render_list(orders);
var search_timeout = null; var search_timeout = null;
this.$('.searchbox input').on('keypress',function(event){ this.$('.searchbox input').on('keypress',function(event){

15
product_return_pos/static/src/xml/pos_return.xml

@ -3,7 +3,8 @@
<t t-name="ReturnButton"> <t t-name="ReturnButton">
<div class='control-button'> <div class='control-button'>
<i class='fa fa-rotate-left' /> Return <i class='fa fa-rotate-left'/>
Return
</div> </div>
</t> </t>
@ -11,7 +12,7 @@
<tr class='order-line' t-att-data-id='order.id'> <tr class='order-line' t-att-data-id='order.id'>
<td><t t-esc='order.pos_reference' /></td> <td><t t-esc='order.pos_reference' /></td>
<td><t t-if="order.return_ref"> <td><t t-if="order.return_ref">
<t t-esc='order.return_ref' /> <t t-esc='order.return_ref'/>
</t></td> </t></td>
<td><t t-esc='order.partner_id[1]' /></td> <td><t t-esc='order.partner_id[1]' /></td>
<td><t t-esc='order.date_order' /></td> <td><t t-esc='order.date_order' /></td>
@ -27,12 +28,18 @@
<i class='fa fa-angle-double-left'></i> <i class='fa fa-angle-double-left'></i>
Cancel Cancel
</span> </span>
<span class='searchbox'> <span class='searchbox'>
<input placeholder='Search' /> <input placeholder='Search'/>
<span class='search-clear'></span> <span class='search-clear'></span>
</span> </span>
<span class='searchbox'></span> <span class='searchbox'></span>
<span class='button refresh refreshbutton'>
<i class="fa fa-refresh"></i>
Refresh
</span>
</section> </section>
<section class="full-content"> <section class="full-content">
<div class='window'> <div class='window'>
@ -64,7 +71,7 @@
<div class="popup popup-selection product_return_pos"> <div class="popup popup-selection product_return_pos">
<p class="title">Return Order</p> <p class="title">Return Order</p>
<div class='selection scrollable-y touch-scrollable'> <div class='selection scrollable-y touch-scrollable'>
<table id = "list" cellspacing = "1px" cellpadding = "10px" text-align = "center" <table id="list" cellspacing="1px" cellpadding="10px" text-align="center"
width="100%" style="border:1px;padding-left:1.16cm;"> width="100%" style="border:1px;padding-left:1.16cm;">
<thead> <thead>
<tr> <tr>

Loading…
Cancel
Save