Skip to content

Commit df0dba5

Browse files
committed
🌈 pre-commit
> Made via .github/workflows/DINAR-PORT.yml
1 parent 6327ddf commit df0dba5

File tree

6 files changed

+185
-125
lines changed

6 files changed

+185
-125
lines changed
Lines changed: 65 additions & 34 deletions
Loading
Lines changed: 65 additions & 35 deletions
Loading

pos_order_merge/static/src/js/merge.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
odoo.define("pos_order_merge.merge", function(require) {
1+
odoo.define("pos_order_merge.merge", function (require) {
22
"use strict";
33

44
var gui = require("point_of_sale.gui");
@@ -11,12 +11,12 @@ odoo.define("pos_order_merge.merge", function(require) {
1111

1212
var _super_posmodel = models.PosModel.prototype;
1313
models.PosModel = models.PosModel.extend({
14-
order_merge: function() {
14+
order_merge: function () {
1515
this.order_merge_status = true;
1616
this.set_table(null);
1717
},
1818
// Changes the current table.
19-
set_table: function(table) {
19+
set_table: function (table) {
2020
if (!table) {
2121
// No table ? go back to the floor plan, see ScreenSelector
2222
this.set_order(null);
@@ -36,7 +36,7 @@ odoo.define("pos_order_merge.merge", function(require) {
3636
}
3737
},
3838
// This is called when an order is removed from the order collection.
39-
on_removed_order: function(removed_order, index, reason) {
39+
on_removed_order: function (removed_order, index, reason) {
4040
if (this.order_merge_status) {
4141
return;
4242
}
@@ -49,7 +49,7 @@ odoo.define("pos_order_merge.merge", function(require) {
4949

5050
previous_screen: "floors",
5151

52-
renderElement: function() {
52+
renderElement: function () {
5353
var self = this;
5454
this._super();
5555

@@ -73,12 +73,12 @@ odoo.define("pos_order_merge.merge", function(require) {
7373
}
7474

7575
// Change the table for merge
76-
this.$(".change_table").click(function() {
76+
this.$(".change_table").click(function () {
7777
self.gui.show_screen(self.previous_screen);
7878
});
7979

8080
// Back to current order
81-
this.$(".back").click(function() {
81+
this.$(".back").click(function () {
8282
self.pos.order_merge_status = false;
8383
var current_order = self.get_order_by_uid(self.pos.main_order_uid);
8484
if (current_order) {
@@ -87,13 +87,13 @@ odoo.define("pos_order_merge.merge", function(require) {
8787
}
8888
});
8989
},
90-
order_was_selected: function(uid) {
91-
var res = _.find(this.mergeorders, function(id) {
90+
order_was_selected: function (uid) {
91+
var res = _.find(this.mergeorders, function (id) {
9292
return id === uid;
9393
});
9494
return res || false;
9595
},
96-
orderselect: function($el, uid) {
96+
orderselect: function ($el, uid) {
9797
var merge = this.order_was_selected(uid);
9898
var selected = true;
9999
if (merge) {
@@ -117,7 +117,7 @@ odoo.define("pos_order_merge.merge", function(require) {
117117
);
118118
this.change_button();
119119
},
120-
show: function() {
120+
show: function () {
121121
var self = this;
122122
this._super();
123123
this.renderElement();
@@ -128,7 +128,7 @@ odoo.define("pos_order_merge.merge", function(require) {
128128
$mergemethods.children().hide();
129129
var $merge_buttons = $mergemethods.find(".button");
130130

131-
this.$(".merge-orders").on("click", ".order", function() {
131+
this.$(".merge-orders").on("click", ".order", function () {
132132
var uid = $(this).data("uid");
133133
var $el = $(this);
134134
self.orderselect($el, uid);
@@ -139,22 +139,22 @@ odoo.define("pos_order_merge.merge", function(require) {
139139
}
140140
});
141141

142-
$merge_buttons.click(function() {
142+
$merge_buttons.click(function () {
143143
self.merge();
144144
});
145145
},
146-
merge: function() {
146+
merge: function () {
147147
var self = this;
148148
var main_order = this.get_order_by_uid(this.pos.main_order_uid);
149149

150150
this.gui.show_screen("products");
151151
this.pos.set_order(main_order);
152152

153-
this.mergeorders.forEach(function(uid) {
153+
this.mergeorders.forEach(function (uid) {
154154
var order = self.get_order_by_uid(uid);
155155
var orderlines = order.get_orderlines();
156156
if (orderlines && orderlines.length) {
157-
orderlines.forEach(function(line) {
157+
orderlines.forEach(function (line) {
158158
var temp_line = line.export_as_JSON();
159159
main_order.add_orderline(
160160
new models.Orderline(
@@ -171,7 +171,7 @@ odoo.define("pos_order_merge.merge", function(require) {
171171

172172
this.pos.order_merge_status = false;
173173
},
174-
get_order_by_uid: function(uid) {
174+
get_order_by_uid: function (uid) {
175175
var orders = this.pos.get("orders").models;
176176
for (var i = 0; i < orders.length; i++) {
177177
if (orders[i].uid === uid) {
@@ -180,7 +180,7 @@ odoo.define("pos_order_merge.merge", function(require) {
180180
}
181181
return false;
182182
},
183-
change_button: function() {
183+
change_button: function () {
184184
if (this.mergeorders.length) {
185185
this.$(".mergemethods .button").addClass("highlight");
186186
} else {
@@ -192,14 +192,14 @@ odoo.define("pos_order_merge.merge", function(require) {
192192
gui.define_screen({
193193
name: "order_merge",
194194
widget: OrderMergeScreenWidget,
195-
condition: function() {
195+
condition: function () {
196196
return this.pos.config.iface_order_merge;
197197
},
198198
});
199199

200200
var OrderMergeButton = screens.ActionButtonWidget.extend({
201201
template: "OrderMergeButton",
202-
button_click: function() {
202+
button_click: function () {
203203
if (this.pos.get("orders").models.length > 1) {
204204
// The main order where other orders will be merged
205205
this.pos.main_order_uid = this.pos.get_order().uid;
@@ -212,7 +212,7 @@ odoo.define("pos_order_merge.merge", function(require) {
212212
screens.define_action_button({
213213
name: "order_merge",
214214
widget: OrderMergeButton,
215-
condition: function() {
215+
condition: function () {
216216
return this.pos.config.iface_order_merge;
217217
},
218218
});

0 commit comments

Comments
 (0)