[FIX] pos_self_order: decode url when generating image qr code
decode url when generating image qr code closes odoo/odoo#140870 Related: odoo/enterprise#50102 Signed-off-by: David Monnom (moda) <moda@odoo.com>
This commit is contained in:
@@ -241,7 +241,7 @@
|
||||
<field name="combo_price">0</field>
|
||||
</record>
|
||||
<record id="burger_combo" model="pos.combo">
|
||||
<field name="name">Burger Choice</field>
|
||||
<field name="name">Burgers Choice</field>
|
||||
<field name="combo_line_ids" eval="[(6, 0, [ref('cheeseburger_combo_line'), ref('bacon_burger_combo_line')])]"/>
|
||||
</record>
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
<field name="combo_price">2</field>
|
||||
</record>
|
||||
<record id="drink_combo" model="pos.combo">
|
||||
<field name="name">Desks Combo</field>
|
||||
<field name="name">Drinks choice</field>
|
||||
<field name="combo_line_ids" eval="[(6, 0, [ref('coke_combo_line'), ref('water_combo_line'), ref('maid_combo_line'), ref('milkshake_combo_line')])]"/>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -103,12 +103,12 @@ class ResConfigSettings(models.TransientModel):
|
||||
|
||||
for table in table_ids:
|
||||
qr_images.append({
|
||||
'image': self._generate_single_qr_code(self.pos_config_id._get_self_order_url(table.id)),
|
||||
'image': self._generate_single_qr_code(url_unquote(self.pos_config_id._get_self_order_url(table.id))),
|
||||
'name': f"{table.floor_id.name} - {table.name}",
|
||||
})
|
||||
else:
|
||||
qr_images.append({
|
||||
'image': self._generate_single_qr_code(self.pos_config_id._get_self_order_url()),
|
||||
'image': self._generate_single_qr_code(url_unquote(self.pos_config_id._get_self_order_url())),
|
||||
'name': "generic",
|
||||
})
|
||||
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
/** @odoo-module */
|
||||
|
||||
import { Component, onWillStart, useState } from "@odoo/owl";
|
||||
import { useSelfOrder } from "@pos_self_order/app/self_order_service";
|
||||
import { Component, onMounted, useState } from "@odoo/owl";
|
||||
|
||||
export class LoadingOverlay extends Component {
|
||||
static template = "pos_self_order.LoadingOverlay";
|
||||
static props = ["action", "removeTopClasses?"];
|
||||
|
||||
setup() {
|
||||
this.selfOrder = useSelfOrder();
|
||||
this.state = useState({
|
||||
loading: false,
|
||||
});
|
||||
|
||||
onWillStart(() => {
|
||||
onMounted(() => {
|
||||
setTimeout(() => {
|
||||
this.state.loading = true;
|
||||
}, 200);
|
||||
|
||||
@@ -14,7 +14,6 @@ export class CartPage extends Component {
|
||||
setup() {
|
||||
this.selfOrder = useSelfOrder();
|
||||
this.router = useService("router");
|
||||
this.sendInProgress = false;
|
||||
this.state = useState({
|
||||
selectTable: false,
|
||||
cancelConfirmation: false,
|
||||
|
||||
Reference in New Issue
Block a user