diff --git a/pos_loyalty/static/src/js/pos.js b/pos_loyalty/static/src/js/pos.js
index 9a6a8936..91f07f86 100644
--- a/pos_loyalty/static/src/js/pos.js
+++ b/pos_loyalty/static/src/js/pos.js
@@ -2,8 +2,8 @@
  * Copyright 2017 RGB Consulting S.L. (https://www.rgbconsulting.com)
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 
-odoo.define('pos_loyalty.loyalty_program', function (require){
-"use strict"
+odoo.define('pos_loyalty.loyalty_program', function(require) {
+    "use strict"
 
     var models = require('point_of_sale.models');
     var screens = require('point_of_sale.screens');
@@ -15,74 +15,92 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
     var QWeb = core.qweb;
     var _t = core._t;
 
-    models.load_fields('res.partner','loyalty_points');
-
-    models.load_models([
-        {
-            model: 'loyalty.program',
-            condition: function(self){ return !!self.config.loyalty_id[0]; },
-            fields: ['name','pp_currency','pp_product','pp_order','rounding'],
-            domain: function(self){ return [['id','=',self.config.loyalty_id[0]]]; },
-            loaded: function(self,loyalties){ 
-                self.loyalty = loyalties[0];
-            },
-        },{
-            model: 'loyalty.rule',
-            condition: function(self){ return !!self.loyalty; },
-            fields: ['name','type','product_id','category_id','cumulative','pp_product','pp_currency'],
-            domain: function(self){ return [['loyalty_program_id','=',self.loyalty.id]]; },
-            loaded: function(self,rules){ 
-
-                self.loyalty.rules = rules; 
-                self.loyalty.rules_by_product_id = {};
-                self.loyalty.rules_by_category_id = {};
-
-                function update_rules(rules, rule, id) {
-                    if (!rules[id]){
-                        rules[id] = [rule];
-                    } else if (rule.cumulative){
-                        rules[id].unshift(rule);
-                    } else {
-                        rules[id].push(rule);
-                    }
-                }
+    models.load_fields('res.partner', 'loyalty_points');
 
-                _.each(rules, function(rule) {
-                    if (rule.type === 'product')
-                        update_rules(self.loyalty.rules_by_product_id, rule, rule.product_id[0])
-                    else if (rule.type === 'category')
-                        update_rules(self.loyalty.rules_by_category_id, rule, rule.category_id[0]);
-                });
-            },
-        },{
-            model: 'loyalty.reward',
-            condition: function(self){ return !!self.loyalty; },
-            fields: ['name','type','minimum_points','gift_product_id','point_cost','discount_product_id','discount','discount_max','point_product_id'],
-            domain: function(self){ return [['loyalty_program_id','=',self.loyalty.id]]; },
-            loaded: function(self,rewards){
-                self.loyalty.rewards = rewards; 
-                self.loyalty.rewards_by_id = {};
-                for (var i = 0; i < rewards.length;i++) {
-                    self.loyalty.rewards_by_id[rewards[i].id] = rewards[i];
+    models.load_models([{
+        model: 'loyalty.program',
+        condition: function(self) {
+            return !!self.config.loyalty_id[0];
+        },
+        fields: ['name', 'pp_currency', 'pp_product', 'pp_order', 'rounding'],
+        domain: function(self) {
+            return [
+                ['id', '=', self.config.loyalty_id[0]]
+            ];
+        },
+        loaded: function(self, loyalties) {
+            self.loyalty = loyalties[0];
+        },
+    }, {
+        model: 'loyalty.rule',
+        condition: function(self) {
+            return !!self.loyalty;
+        },
+        fields: ['name', 'type', 'product_id', 'category_id', 'cumulative', 'pp_product', 'pp_currency'],
+        domain: function(self) {
+            return [
+                ['loyalty_program_id', '=', self.loyalty.id]
+            ];
+        },
+        loaded: function(self, rules) {
+
+            self.loyalty.rules = rules;
+            self.loyalty.rules_by_product_id = {};
+            self.loyalty.rules_by_category_id = {};
+
+            function update_rules(rules, rule, id) {
+                if (!rules[id]) {
+                    rules[id] = [rule];
+                } else if (rule.cumulative) {
+                    rules[id].unshift(rule);
+                } else {
+                    rules[id].push(rule);
                 }
-            },
+            }
+
+            _.each(rules, function(rule) {
+                if (rule.type === 'product')
+                    update_rules(self.loyalty.rules_by_product_id, rule, rule.product_id[0])
+                else if (rule.type === 'category')
+                    update_rules(self.loyalty.rules_by_category_id, rule, rule.category_id[0]);
+            });
         },
-    ],{'after': 'product.product'});
+    }, {
+        model: 'loyalty.reward',
+        condition: function(self) {
+            return !!self.loyalty;
+        },
+        fields: ['name', 'type', 'minimum_points', 'gift_product_id', 'point_cost', 'discount_product_id', 'discount', 'discount_max', 'point_product_id'],
+        domain: function(self) {
+            return [
+                ['loyalty_program_id', '=', self.loyalty.id]
+            ];
+        },
+        loaded: function(self, rewards) {
+            self.loyalty.rewards = rewards;
+            self.loyalty.rewards_by_id = {};
+            for (var i = 0; i < rewards.length; i++) {
+                self.loyalty.rewards_by_id[rewards[i].id] = rewards[i];
+            }
+        },
+    }, ], {
+        'after': 'product.product'
+    });
 
     var _orderline_super = models.Orderline.prototype;
     models.Orderline = models.Orderline.extend({
-        get_reward: function(){
+        get_reward: function() {
             return this.pos.loyalty.rewards_by_id[this.reward_id];
         },
-        set_reward: function(reward){
+        set_reward: function(reward) {
             this.reward_id = reward.id;
         },
-        export_as_JSON: function(){
+        export_as_JSON: function() {
             var json = _orderline_super.export_as_JSON.apply(this, arguments);
             json.reward_id = this.reward_id;
             return json;
         },
-        init_from_JSON: function(json){
+        init_from_JSON: function(json) {
             _orderline_super.init_from_JSON.apply(this, arguments);
             this.reward_id = json.reward_id;
         },
@@ -92,25 +110,25 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
     models.Order = models.Order.extend({
 
         /* The total of points won, excluding the points spent on rewards */
-        get_won_points: function(){
+        get_won_points: function() {
             if (!this.pos.loyalty || !this.get_client()) {
                 return 0;
             }
 
             var orderLines = this.get_orderlines();
-            var rounding   = this.pos.loyalty.rounding;
+            var rounding = this.pos.loyalty.rounding;
 
             var product_sold = 0;
-            var total_sold   = 0;
+            var total_sold = 0;
             var total_points = 0;
 
             for (var i = 0; i < orderLines.length; i++) {
                 var line = orderLines[i];
                 var product = line.get_product();
-                var rules  = this.pos.loyalty.rules_by_product_id[product.id] || [];
+                var rules = this.pos.loyalty.rules_by_product_id[product.id] || [];
                 var overriden = false;
 
-                if (line.get_reward()) {  // Reward products are ignored
+                if (line.get_reward()) { // Reward products are ignored
                     continue;
                 }
 
@@ -127,7 +145,7 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                 }
 
                 // Test the category rules
-                if ( product.pos_categ_id ) {
+                if (product.pos_categ_id) {
                     var category = this.pos.db.get_category_by_id(product.pos_categ_id[0]);
                     while (category && !overriden) {
                         var rules = this.pos.loyalty.rules_by_category_id[category.id] || [];
@@ -150,13 +168,13 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
 
                 if (!overriden) {
                     product_sold += line.get_quantity();
-                    total_sold   += line.get_price_with_tax();
+                    total_sold += line.get_price_with_tax();
                 }
             }
 
-            total_points += round_pr( total_sold * this.pos.loyalty.pp_currency, rounding );
-            total_points += round_pr( product_sold * this.pos.loyalty.pp_product, rounding );
-            total_points += round_pr( this.pos.loyalty.pp_order, rounding );
+            total_points += round_pr(total_sold * this.pos.loyalty.pp_currency, rounding);
+            total_points += round_pr(product_sold * this.pos.loyalty.pp_product, rounding);
+            total_points += round_pr(this.pos.loyalty.pp_order, rounding);
 
             return total_points;
         },
@@ -166,9 +184,9 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
             if (!this.pos.loyalty || !this.get_client()) {
                 return 0;
             } else {
-                var lines    = this.get_orderlines();
+                var lines = this.get_orderlines();
                 var rounding = this.pos.loyalty.rounding;
-                var points   = 0;
+                var points = 0;
 
                 for (var i = 0; i < lines.length; i++) {
                     var line = lines[i];
@@ -207,12 +225,12 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
         },
 
         /* The number of loyalty points currently owned by the customer */
-        get_current_points: function(){
+        get_current_points: function() {
             return this.get_client() ? this.get_client().loyalty_points : 0;
         },
 
         /* The total number of points spendable on rewards */
-        get_spendable_points: function(){
+        get_spendable_points: function() {
             if (!this.pos.loyalty || !this.get_client()) {
                 return 0;
             } else {
@@ -220,7 +238,7 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
             }
         },
 
-        has_discount_reward: function(){
+        has_discount_reward: function() {
             var res = false;
             var lines = this.get_orderlines();
 
@@ -236,7 +254,7 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
         },
 
         /* The list of rewards that the current customer can get */
-        get_available_rewards: function(){
+        get_available_rewards: function() {
             var client = this.get_client();
             if (!client) {
                 return [];
@@ -248,11 +266,11 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
 
                 if (reward.minimum_points > this.get_spendable_points()) {
                     continue;
-                } else if(reward.type === 'gift'  &&
-                          reward.point_cost > this.get_spendable_points()) {
+                } else if (reward.type === 'gift' &&
+                    reward.point_cost > this.get_spendable_points()) {
                     continue;
-                } else if(reward.type === 'discount' &&
-                         (discount_reward_set || reward.point_cost > this.get_spendable_points())){
+                } else if (reward.type === 'discount' &&
+                    (discount_reward_set || reward.point_cost > this.get_spendable_points())) {
                     continue;
                 }
                 rewards.push(reward);
@@ -260,7 +278,7 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
             return rewards;
         },
 
-        apply_reward: function(reward){
+        apply_reward: function(reward) {
             var client = this.get_client();
             if (!client) {
                 return;
@@ -275,17 +293,19 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                     price: 0,
                     quantity: 1,
                     merge: false,
-                    extras: { reward_id: reward.id },
+                    extras: {
+                        reward_id: reward.id
+                    },
                 });
 
             } else if (reward.type === 'discount') {
 
                 var crounding = this.pos.currency.rounding;
                 var order_total = this.get_total_with_tax();
-                var discount = round_pr(order_total * reward.discount,crounding);
+                var discount = round_pr(order_total * reward.discount, crounding);
                 var discount_max = reward.discount_max
 
-                if (discount_max && discount > discount_max ) {
+                if (discount_max && discount > discount_max) {
                     discount = discount_max;
                 }
 
@@ -299,7 +319,9 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                     price: -discount,
                     quantity: 1,
                     merge: false,
-                    extras: { reward_id: reward.id },
+                    extras: {
+                        reward_id: reward.id
+                    },
                 });
 
             } else if (reward.type === 'resale') {
@@ -315,39 +337,41 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                     return;
                 }
 
-                if ( round_pr( spendable * product.price, crounding ) > order_total ) {
-                    spendable = round_pr( Math.floor(order_total / product.price), lrounding);
+                if (round_pr(spendable * product.price, crounding) > order_total) {
+                    spendable = round_pr(Math.floor(order_total / product.price), lrounding);
                 }
 
-                if ( spendable < 0.00001 ) {
+                if (spendable < 0.00001) {
                     return;
                 }
 
                 this.add_product(product, {
                     quantity: -spendable,
                     merge: false,
-                    extras: { reward_id: reward.id },
+                    extras: {
+                        reward_id: reward.id
+                    },
                 });
             }
         },
 
-        finalize: function(){
+        finalize: function() {
             var client = this.get_client();
-            if ( client ) {
+            if (client) {
                 client.loyalty_points = this.get_new_total_points();
                 this.pos.gui.screen_instances.clientlist.partner_cache.clear_node(client.id);
             }
             _order_super.finalize.apply(this, arguments);
         },
 
-        export_for_printing: function(){
+        export_for_printing: function() {
             var json = _order_super.export_for_printing.apply(this, arguments);
             if (this.pos.loyalty && this.get_client()) {
                 json.loyalty = {
-                    rounding:     this.pos.loyalty.rounding || 1,
-                    name:         this.pos.loyalty.name,
-                    client:       this.get_client().name,
-                    points_won  : this.get_won_points(),
+                    rounding: this.pos.loyalty.rounding || 1,
+                    name: this.pos.loyalty.name,
+                    client: this.get_client().name,
+                    points_won: this.get_won_points(),
                     points_spent: this.get_spent_points(),
                     points_total: this.get_new_total_points(),
                 };
@@ -355,7 +379,7 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
             return json;
         },
 
-        export_as_JSON: function(){
+        export_as_JSON: function() {
             var json = _order_super.export_as_JSON.apply(this, arguments);
             json.loyalty_points = this.get_new_points();
             return json;
@@ -364,9 +388,9 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
 
     var LoyaltyButton = screens.ActionButtonWidget.extend({
         template: 'LoyaltyButton',
-        button_click: function(){
+        button_click: function() {
             var self = this;
-            var order  = this.pos.get_order();
+            var order = this.pos.get_order();
             var client = order.get_client();
             if (!client) {
                 this.gui.show_screen('clientlist');
@@ -375,9 +399,9 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
 
             var rewards = order.get_available_rewards();
             if (rewards.length === 0) {
-                this.gui.show_popup('error',{
+                this.gui.show_popup('error', {
                     'title': _t('No Rewards Available'),
-                    'body':  _t('There are no rewards available for this customer as part of the loyalty program'),
+                    'body': _t('There are no rewards available for this customer as part of the loyalty program'),
                 });
             } else if (rewards.length === 1 && this.pos.loyalty.rewards.length === 1) {
                 order.apply_reward(rewards[0]);
@@ -386,13 +410,13 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                 for (var i = 0; i < rewards.length; i++) {
                     list.push({
                         label: rewards[i].name,
-                        item:  rewards[i],
+                        item: rewards[i],
                     });
                 }
-                this.gui.show_popup('selection',{
+                this.gui.show_popup('selection', {
                     'title': _t('Please select a reward'),
                     'list': list,
-                    'confirm': function(reward){
+                    'confirm': function(reward) {
                         order.apply_reward(reward);
                     },
                 });
@@ -403,24 +427,24 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
     screens.define_action_button({
         'name': 'loyalty',
         'widget': LoyaltyButton,
-        'condition': function(){
+        'condition': function() {
             return this.pos.loyalty && this.pos.loyalty.rewards.length;
         },
     });
 
     screens.OrderWidget.include({
-        update_summary: function(){
+        update_summary: function() {
             this._super();
 
             var order = this.pos.get_order();
 
             var $loypoints = $(this.el).find('.summary .loyalty-points');
 
-            if(this.pos.loyalty && order.get_client()){
-                var points_won      = order.get_won_points();
-                var points_spent    = order.get_spent_points();
-                var points_total    = order.get_new_total_points();
-                $loypoints.replaceWith($(QWeb.render('LoyaltyPoints',{
+            if (this.pos.loyalty && order.get_client()) {
+                var points_won = order.get_won_points();
+                var points_spent = order.get_spent_points();
+                var points_total = order.get_new_total_points();
+                $loypoints.replaceWith($(QWeb.render('LoyaltyPoints', {
                     widget: this,
                     rounding: this.pos.loyalty.rounding,
                     points_won: points_won,
@@ -430,12 +454,12 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
                 $loypoints = $(this.el).find('.summary .loyalty-points');
                 $loypoints.removeClass('oe_hidden');
 
-                if(points_total < 0){
+                if (points_total < 0) {
                     $loypoints.addClass('negative');
-                }else{
+                } else {
                     $loypoints.removeClass('negative');
                 }
-            }else{
+            } else {
                 $loypoints.empty();
                 $loypoints.addClass('oe_hidden');
             }
@@ -450,4 +474,4 @@ odoo.define('pos_loyalty.loyalty_program', function (require){
             }
         },
     });
-});
+});
\ No newline at end of file
diff --git a/pos_loyalty/static/src/js/tests.js b/pos_loyalty/static/src/js/tests.js
index 3e5514a0..eff9f481 100644
--- a/pos_loyalty/static/src/js/tests.js
+++ b/pos_loyalty/static/src/js/tests.js
@@ -2,7 +2,7 @@
 // Copyright 2018 Lambda IS DOOEL <https://www.lambda-is.com>
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
+odoo.define('pos_loyalty.tour.test_pos_loyalty', function(require) {
     "use strict";
 
     // Some of the steps are taken from the pos_basic_order tour in point_of_sale.
@@ -23,7 +23,7 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
         }, {
             content: 'Check if customer ' + customer_name + ' is added',
             trigger: '.button.set-customer:contains("' + customer_name + '")',
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }];
     }
 
@@ -44,7 +44,7 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
         }, {
             content: 'the ' + product_name + ' have been added to the order',
             trigger: '.order .product-name:contains("' + product_name + '")',
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }];
     }
 
@@ -52,12 +52,13 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
         return [{
             content: 'check if ' + product_name + ' is in order',
             trigger: '.orderline .product-name:contains("' + product_name + '")',
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }]
     }
 
     function generate_keypad_steps(amount_str, keypad_selector) {
-        var i, steps = [], current_char;
+        var i, steps = [],
+            current_char;
         for (i = 0; i < amount_str.length; ++i) {
             current_char = amount_str[i];
             steps.push({
@@ -81,7 +82,7 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
         return [{
             content: 'order total contains ' + total_str,
             trigger: '.order .total .value:contains("' + total_str + '")',
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }];
     }
 
@@ -102,11 +103,11 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
         }, {
             content: "verify that the order is being sent to the backend",
             trigger: ".js_connecting:visible",
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }, {
             content: "verify that the order has been succesfully sent to the backend",
             trigger: ".js_connected:visible",
-            run: function () {}, // it's a check
+            run: function() {}, // it's a check
         }, {
             content: "next order",
             trigger: '.button.next:visible',
@@ -114,10 +115,10 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
     }
 
     var steps = [{
-            content: 'waiting for loading to finish',
-            trigger: '.o_main_content:has(.loader:hidden)',
-            run: function () {}, // it's a check
-        }];
+        content: 'waiting for loading to finish',
+        trigger: '.o_main_content:has(.loader:hidden)',
+        run: function() {}, // it's a check
+    }];
 
     steps = steps.concat(add_customer('Agrolait'));
     steps = steps.concat(add_product_to_order('Peaches'));
@@ -131,21 +132,24 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
     steps = steps.concat([{
         content: "verify tendered",
         trigger: '.col-tendered:contains("12.20")',
-        run: function () {}, // it's a check
+        run: function() {}, // it's a check
     }, {
         content: "verify change",
         trigger: '.col-change:contains("2.00")',
-        run: function () {}, // it's a check
+        run: function() {}, // it's a check
     }]);
 
     steps = steps.concat(finish_order());
 
-    Tour.register('test_pos_loyalty_acquire_points', { test: true, url: '/pos/web' }, steps);
+    Tour.register('test_pos_loyalty_acquire_points', {
+        test: true,
+        url: '/pos/web'
+    }, steps);
 
     steps = [{
         content: 'waiting for loading to finish',
         trigger: '.o_main_content:has(.loader:hidden)',
-        run: function () {}, // it's a check
+        run: function() {}, // it's a check
     }];
     steps = steps.concat(add_customer('Agrolait'));
     steps = steps.concat(add_reward('Free Peaches'));
@@ -155,9 +159,12 @@ odoo.define('pos_loyalty.tour.test_pos_loyalty', function (require) {
     steps = steps.concat([{
         content: "verify tendered",
         trigger: '.col-tendered:contains("0.00")',
-        run: function () {}, // it's a check
+        run: function() {}, // it's a check
     }]);
     steps = steps.concat(finish_order());
 
-    Tour.register('test_pos_loyalty_spend_points', { test: true, url: '/pos/web' }, steps);
-})
+    Tour.register('test_pos_loyalty_spend_points', {
+        test: true,
+        url: '/pos/web'
+    }, steps);
+})
\ No newline at end of file