[imp] nivified receipt view

bzr revid: nicolas.vanhoren@openerp.com-20111121141428-tv18n8itxjo20tvk

2 files changed, 64 insertions, 64 deletions

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 3b2d8b924b5..d1611cd87d8 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -166,7 +166,7 @@ openerp.point_of_sale = function(db) {
     NumpadState, NumpadWidget, Order, OrderButtonView, OrderCollection, OrderWidget, Orderline,
     OrderlineCollection, OrderlineWidget, PaymentButtonWidget, PaymentWidget, Paymentline,
     PaymentlineCollection, PaymentlineWidget, PaypadWidget, Product, ProductCollection,
-    ProductListWidget, ProductWidget, ReceiptLineWidget, ReceiptView, Shop, ShopView, StepsWidget;
+    ProductListWidget, ProductWidget, ReceiptLineWidget, ReceiptWidget, Shop, ShopView, StepsWidget;
 
     /*
      ---
@@ -912,64 +912,61 @@ openerp.point_of_sale = function(db) {
             this.$element.html(this.template_fct(this.model.toJSON()));
         },
     });
-    ReceiptView = (function() {
-        __extends(ReceiptView, Backbone.View);
-        function ReceiptView() {
-            ReceiptView.__super__.constructor.apply(this, arguments);
-        }
-
-        ReceiptView.prototype.initialize = function(options) {
+    ReceiptWidget = db.web.Widget.extend({
+        init: function(parent, options) {
+            this._super(parent);
+            this.model = options.model;
             this.shop = options.shop;
             this.shop.bind('change:selectedOrder', this.changeSelectedOrder, this);
             this.bindOrderLineEvents();
-            return this.bindPaymentLineEvents();
-        };
-        ReceiptView.prototype.events = {
-            "click button#pos-finish-order": "finishOrder"
-        };
-        ReceiptView.prototype.finishOrder = function() {
+            this.bindPaymentLineEvents();
+        },
+        start: function () {
+            $('button#pos-finish-order', this.$element).click(_.bind(this.finishOrder, this));
+        },
+        finishOrder: function() {
             $('.step-screen').hide();
             $('#products-screen').show();
             this.shop.get('selectedOrder').destroy();
-        };
-        ReceiptView.prototype.receiptLineList = function() {
-            return $(this.el).find('#receiptlines');
-        };
-        ReceiptView.prototype.bindOrderLineEvents = function() {
+        },
+        receiptLineList: function() {
+            return this.$element.find('#receiptlines');
+        },
+        bindOrderLineEvents: function() {
             this.currentOrderLines = (this.shop.get('selectedOrder')).get('orderLines');
             this.currentOrderLines.bind('add', this.addReceiptLine, this);
-            this.currentOrderLines.bind('change', this.render, this);
-            return this.currentOrderLines.bind('remove', this.render, this);
-        };
-        ReceiptView.prototype.bindPaymentLineEvents = function() {
+            this.currentOrderLines.bind('change', this.render_element, this);
+            this.currentOrderLines.bind('remove', this.render_element, this);
+        },
+        bindPaymentLineEvents: function() {
             this.currentPaymentLines = (this.shop.get('selectedOrder')).get('paymentLines');
-            return this.currentPaymentLines.bind('all', this.updateReceiptSummary, this);
-        };
-        ReceiptView.prototype.changeSelectedOrder = function() {
+            this.currentPaymentLines.bind('all', this.updateReceiptSummary, this);
+        },
+        changeSelectedOrder: function() {
             this.currentOrderLines.unbind();
             this.bindOrderLineEvents();
             this.currentPaymentLines.unbind();
             this.bindPaymentLineEvents();
-            return this.render();
-        };
-        ReceiptView.prototype.addReceiptLine = function(newOrderItem) {
+            this.render_element();
+        },
+        addReceiptLine: function(newOrderItem) {
             var x = new ReceiptLineWidget(null, {
                     model: newOrderItem
             });
             x.appendTo(this.receiptLineList());
-            return this.updateReceiptSummary();
-        };
-        ReceiptView.prototype.render = function() {
-            this.receiptLineList().empty();
+            this.updateReceiptSummary();
+        },
+        render_element: function() {
+            this.$element.html(qweb_template('pos-receipt-view'));
             this.currentOrderLines.each(__bind( function(orderItem) {
                 var x = new ReceiptLineWidget(null, {
                         model: orderItem
                 });
                 x.appendTo(this.receiptLineList());
             }, this));
-            return this.updateReceiptSummary();
-        };
-        ReceiptView.prototype.updateReceiptSummary = function() {
+            this.updateReceiptSummary();
+        },
+        updateReceiptSummary: function() {
             var change, currentOrder, tax, total;
             currentOrder = this.shop.get('selectedOrder');
             total = currentOrder.getTotal();
@@ -977,10 +974,9 @@ openerp.point_of_sale = function(db) {
             change = currentOrder.getPaidTotal() - total;
             $('#receipt-summary-tax').html(tax.toFixed(2));
             $('#receipt-summary-total').html(total.toFixed(2));
-            return $('#receipt-summary-change').html(change.toFixed(2));
-        };
-        return ReceiptView;
-    })();
+            $('#receipt-summary-change').html(change.toFixed(2));
+        },
+    });
     OrderButtonView = (function() {
         __extends(OrderButtonView, Backbone.View);
         function OrderButtonView() {
@@ -1058,10 +1054,11 @@ openerp.point_of_sale = function(db) {
             });
             this.paymentView.render_element();
             this.paymentView.start();
-            this.receiptView = new ReceiptView({
+            this.receiptView = new ReceiptWidget(null, {
                 shop: this.shop,
-                el: $('#receipt-screen')
             });
+            debugger;
+            this.receiptView.replace($('#receipt-screen'));
             this.numpadView = new NumpadWidget(null, 'numpad', {
                 state: this.numpadState
             });
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index feeec5bdc4c..74ff2229729 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -117,28 +117,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="receipt-screen" class="step-screen" style="display:none">
-                    <header><h2>Receipt</h2></header>
-                    <div class="pos-step-container">
-                        <div class="pos-receipt-container">
-                            <div class="pos-sale-ticket">
-                                OpenERP Point of Sale<br />
-                                <br />
-                                <div class="pos-rigth-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
-                                    Date.CultureInfo.formatPatterns.longTime)"/></div>
-                                <br />
-                                <table id="receiptlines"></table>
-                                <br />
-                                <table>
-                                    <tr><td>Total:</td><td class="pos-rigth-align"><span id="receipt-summary-total"></span> €</td></tr>
-                                    <tr><td>Tax:</td><td class="pos-rigth-align"><span id="receipt-summary-tax"></span> €</td></tr>
-                                    <tr><td>Change:</td><td class="pos-rigth-align"><span id="receipt-summary-change"></span> €</td></tr>
-                                </table>
-                            </div>
-                        </div>
-                        <button id="pos-finish-order">Next Order</button>
-                    </div>
-                </div>
+                <span id="receipt-screen"></span>
             </div>
         </div>
     </div>
@@ -240,4 +219,28 @@
         <button class="select-order">Order</button>
         <button class="close-order">X</button>
     </t>
+    <t t-name="pos-receipt-view">
+        <div id="receipt-screen" class="step-screen" style="display:none">
+            <header><h2>Receipt</h2></header>
+            <div class="pos-step-container">
+                <div class="pos-receipt-container">
+                    <div class="pos-sale-ticket">
+                        OpenERP Point of Sale<br />
+                        <br />
+                        <div class="pos-rigth-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
+                            Date.CultureInfo.formatPatterns.longTime)"/></div>
+                        <br />
+                        <table id="receiptlines"></table>
+                        <br />
+                        <table>
+                            <tr><td>Total:</td><td class="pos-rigth-align"><span id="receipt-summary-total"></span> €</td></tr>
+                            <tr><td>Tax:</td><td class="pos-rigth-align"><span id="receipt-summary-tax"></span> €</td></tr>
+                            <tr><td>Change:</td><td class="pos-rigth-align"><span id="receipt-summary-change"></span> €</td></tr>
+                        </table>
+                    </div>
+                </div>
+                <button id="pos-finish-order">Next Order</button>
+            </div>
+        </div>
+    </t>
 </templates>
\ No newline at end of file