Merge branch 'dev_cooperatic' into 3292-alert-message-barrecode

members/admin.py

@@ -351,6 +351,7 @@ def manage_regular_shifts(request):
         'open_on_sunday': getattr(settings, 'OPEN_ON_SUNDAY', False),
         'show_ftop_button': getattr(settings, 'BDM_SHOW_FTOP_BUTTON', True),
         'has_committe_shift': committees_shift_id is not None,
+        'committees_shift_id': committees_shift_id,
         'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', '')
     }
     return HttpResponse(template.render(context, request))

shelfs/static/js/shelf_inventory.js

@@ -158,6 +158,9 @@ function select_product_from_bc(barcode) {
                 qty = scannedProduct.qty;
             }
         }
+    } else {
+        alert("Le code-barre " + barcode + " n'est pas reconnu comme un EAN13 valide.'");
+        return -1;
     }
 
     if (editing_item === null) {

templates/members/admin/manage_regular_shifts.html

@@ -95,7 +95,8 @@
   var max_begin_hour = '{{max_begin_hour}}'
   var couchdb_dbname = '{{db}}';
   var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
-  var committees_shift_id = '{{ASSOCIATE_MEMBER_SHIFT}}';
+  var committees_shift_id = '{{committees_shift_id}}';
+  var ASSOCIATE_MEMBER_SHIFT = '{{ASSOCIATE_MEMBER_SHIFT}}';
 </script>
 <script src='{% static "js/common.js" %}?v=1651853225'></script>
 <script src='{% static "js/all_common.js" %}?v=1651853225'></script>