display a popup if the meal voucher was already scan on this order
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-
14 14 barcode_meal_voucher_payment_action: function (code) { 15 15 16 // Display the payment screen, if it is not the current one. 17 if (this.pos.gui.current_screen.template !== "PaymentScreenWidget"){ 18 this.gui.show_screen("payment"); 19 } 20 var paymentScreen = this.pos.gui.current_screen; 21 var order = this.pos.get_order(); 22 var amount = code.value; 23 var cashregister = null; 24 // find a meal voucher cash register, if exist 25 for ( var i = 0; i < this.pos.cashregisters.length; i++ ) { 26 if ( this.pos.cashregisters[i].journal.meal_voucher_type === "paper" ){ 27 cashregister = this.pos.cashregisters[i]; 28 break; 16 var oder = this.pos.get_order(); -
Master
coquille : oder au lieu de order (nom de la variable dans les lignes supprimées) Ayant intégré la branche du ticket #2244 avant celle-ci, il y a un conflit (beaucoup de code ajouté dans ce fichier pour #2244), je fusionne et fait un rectificatif ensuite
-
-
added 4 commits
-
5db467b0...2d9688f3 - 3 commits from branch
dev_cooperatic
- ae3e4f87 - Merge branch 'dev_cooperatic' into '2245-made-paper-meal-vouhcer-usable-once'
Toggle commit list -
5db467b0...2d9688f3 - 3 commits from branch
-
merged
Toggle commit list