summaryrefslogtreecommitdiff
path: root/addons/pos_restaurant/static/src/js
diff options
context:
space:
mode:
authorGert Pellin <gpe@odoo.com>2019-08-29 14:42:23 +0000
committerPierre Masereel <pim@odoo.com>2019-09-13 10:05:44 +0000
commit6f950482d3af0605dfd5246ef3a3b7acbacb9c39 (patch)
tree1e0015c4c33c21692f6e04b8633ae88867a958e4 /addons/pos_restaurant/static/src/js
parentbc863ef4a52bb337a6d080cd1f8e3080f555be2c (diff)
[FIX] point_of_sale, pos_restaurant: merging products
Before this fix product lines did not merge on adding a same product after transfering an order or re-opening an order that was synced. To verefy if lines can be merged an unused field 'type' was compared. Removing this field fixes the problem.
Diffstat (limited to 'addons/pos_restaurant/static/src/js')
-rw-r--r--addons/pos_restaurant/static/src/js/tours/pos_restaurant.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/addons/pos_restaurant/static/src/js/tours/pos_restaurant.js b/addons/pos_restaurant/static/src/js/tours/pos_restaurant.js
index d492be57050..37e3cc1adc2 100644
--- a/addons/pos_restaurant/static/src/js/tours/pos_restaurant.js
+++ b/addons/pos_restaurant/static/src/js/tours/pos_restaurant.js
@@ -184,8 +184,17 @@ odoo.define('pos_reataurant.tour.synchronized_table_management', function (requi
// Test transfering an order
steps = steps.concat(transfer_order_to_table('T4', '002-0001'));
+ // Test if products still get merged after transfering the order
+ steps = steps.concat(add_product_to_order('Coca-Cola'));
+ steps = steps.concat({
+ content: 'check the order-line for Coca-Cola has 2 Units',
+ trigger: '.orderlines:has(.orderline .product-name:contains("Coca-Cola")) .info-list:contains("2.000")',
+ run: function () {},
+ })
+ steps = steps.concat(generate_product_screen_keypad_steps('1'));
+
steps = steps.concat(goto_payment_screen_and_select_payment_method());
- steps = steps.concat(generate_payment_screen_keypad_steps('4.40'));
+ steps = steps.concat(generate_payment_screen_keypad_steps('4.4'));
steps = steps.concat(finish_order());
steps = steps.concat(open_table('T2'));