Merge branch 'dev_cooperatic' into aide_a_la_commande

.gitignore

@@ -10,6 +10,7 @@ outils/settings_secret.py
 outils/config.py
 outils/texts/*
 outils/js_errors.log
+outils/scripts/scripts_settings.py
 db.sqlite3
 */max_timeslot_carts.txt
 .gitlab-ci.yml

coops_configurations/config_lacagette.py

@@ -100,6 +100,6 @@ ENTRANCE_COME_FOR_SHOPING_MSG = "Hey coucou toi ! Cet été nous sommes plus de
 
 # Members space / shifts
 UNSUBSCRIBED_MSG = 'Vous êtes désincrit·e, merci de remplir <a href="https://docs.google.com/forms/d/e/1FAIpQLSfPiC2PkSem9x_B5M7LKpoFNLDIz0k0V5I2W3Mra9AnqnQunw/viewform">ce formulaire</a> pour vous réinscrire sur un créneau.<br />Vous pouvez également contacter le Bureau des Membres en remplissant <a href="https://docs.google.com/forms/d/e/1FAIpQLSeZP0m5-EXPVJxEKJk6EjwSyZJtnbiGdYDuAeFI3ENsHAOikg/viewform">ce formulaire</a>'
-
+CONFIRME_PRESENT_BTN = 'Clique ici pour valider ta présence'
 
 

members/views.py

@@ -23,7 +23,8 @@ def index(request):
         'WELCOME_ENTRANCE_MSG': getattr(settings, 'WELCOME_ENTRANCE_MSG', 'Bienvenue !'),
         'WELCOME_SUBTITLE_ENTRANCE_MSG': getattr(settings, 'WELCOME_SUBTITLE_ENTRANCE_MSG', ''),
         'ENTRANCE_SHOPPING_BTN': getattr(settings, 'ENTRANCE_SHOPPING_BTN', 'Je viens faire mes courses'),
-        'ENTRANCE_SERVICE_BTN': getattr(settings, 'ENTRANCE_SERVICE_BTN', 'Je viens faire mon service')
+        'ENTRANCE_SERVICE_BTN': getattr(settings, 'ENTRANCE_SERVICE_BTN', 'Je viens faire mon service'),
+        'CONFIRME_PRESENT_BTN' : getattr(settings, 'CONFIRME_PRESENT_BTN', 'Présent.e')
     }
     for_shoping_msg = getattr(settings, 'ENTRANCE_COME_FOR_SHOPING_MSG', '')
 

outils/scripts/import_associated_members.py

+# coding: utf-8
+import sys, getopt, os
+sys.path.append(os.path.abspath('../..'))
+from outils.common import OdooAPI
+from openpyxl import Workbook
+from openpyxl import load_workbook
+from openpyxl.styles import Alignment
+import datetime
+
+from openpyxl.utils.exceptions import InvalidFileException
+
+
+def main():
+    """ Pass file as script arg """
+    if len(sys.argv) < 2:
+        print("Il faut renseigner le chemin du fichier contenant les données des rattachés (format Excel).")
+        exit(2)
+
+    api = OdooAPI()
+    data_file = sys.argv[1]
+
+    try:
+        wb = load_workbook(data_file)
+    except InvalidFileException:
+        print("Le fichier fourni est invalide, il doit être au format Excel (.xlsx,.xlsm,.xltx,.xltm)")
+        exit(2)
+
+    while True:
+        try:
+            worksheet_number = input(f'Numéro de la feuille contenant les données (entre 0 et {len(wb.worksheets)-1}) : ')
+            worksheet_number = int(worksheet_number)
+            ws = wb.worksheets[worksheet_number]
+        except ValueError:
+            print("Veuillez rentrer un numéro entier.")
+            continue
+        except IndexError:
+            print("Cette feuille n'existe pas.")
+            continue
+        else:
+            break
+
+    columns_valid = input("""
+Les colonnes doivent être les suivantes :
+A: active*
+B: barode_base*
+C: name*
+D: (ignorée)
+E: date_inclusion
+F: email
+G: birthdate
+H: mobile
+I: phone
+J: street
+K: street2
+L: zip
+M: city
+N: sex
+O: (ignorée)
+P: parent_member_id*
+
+(* ces champs doivent être renseignés)
+Vous confirmez ? (o/n) """)
+
+    while True:
+        if (columns_valid == 'n' or columns_valid == 'N'):
+            print("Veuillez formatter correctement le fichier avant de continuer !")
+            exit()
+        elif (columns_valid == 'o' or columns_valid == 'O'):
+            break
+        else: 
+            columns_valid = input("Vous confirmez ? (o/n) ")
+            continue
+
+    users = []
+    has_error = False
+
+    for row in ws.iter_rows(min_row=2, values_only=True):
+        # active
+        if row[0] is None or row[0] is False or row[0] == "=FALSE()" or row[0] == "=false":
+            active = False 
+        else:
+            active = True
+
+        # If line is not empty (mandatory field check)
+        if row[2] is not None:
+            user = {
+                "is_member": False,
+                "is_associated_people": True,
+                "active": active,
+                "name": row[2],
+                "parent_id": int(row[15])  # for development, override with local existing member id
+            }
+
+            if row[1] is not None and row[1] != "NON":
+                try:
+                    user["barcode_base"] = int(row[1])
+                except Exception:
+                    print(f"[Mauvais format du champ 'barcode_base' pour l'utilisateur '{row[2]}' (Attendu : nombre entier)")
+                    has_error = True
+
+            if row[5] is not None:
+                user["email"] = row[5]
+
+            if row[6] is not None:
+                user["birthdate"] = str(row[6].date())
+
+            if row[7] is not None:
+                try:
+                    mobile = str(row[7]).replace(" ", "")
+                    if mobile[0] != '+' and mobile[0] != '0':
+                        mobile = '0' + mobile
+                    user["mobile"] = mobile
+                except Exception:
+                    print(f"[Mauvais format du champ 'mobile' pour l'utilisateur '{row[2]}'")
+                    has_error = True
+
+            if row[8] is not None:
+                try:
+                    phone = str(row[8]).replace(" ", "")
+                    if phone[0] != '+' and phone[0] != '0':
+                        phone = '0' + phone
+                    user["phone"] = phone
+                except Exception:
+                    print(f"[Mauvais format du champ 'phone' pour l'utilisateur '{row[2]}'")
+                    has_error = True
+
+            if row[9] is not None:
+                user["street"] = row[9]
+
+            if row[10] is not None:
+                user["street2"] = row[10]
+
+            if row[11] is not None:
+                try:
+                    zipcode = str(int(row[11]))
+                    if len(zipcode) == 4:
+                        zipcode = '0' + zipcode
+                    user["zip"] = zipcode
+                except Exception:
+                    print(f"[Mauvais format du champ 'zipcode' pour l'utilisateur '{row[2]}'")
+                    has_error = True
+                
+            if row[12] is not None:
+                user["city"] = row[12]
+
+            if row[13] == "Femme":
+                user["sex"]  = "f"
+            elif row[13] == "Homme":
+                user["sex"]  = "m"
+
+            users.append(user)
+
+    if has_error:
+        print("L'import a été interrompu, veuillez régler les erreurs.")
+        exit(2)
+
+    res = None
+    ids = []
+    marshal_none_error = 'cannot marshal None unless allow_none is enabled'
+    
+    for user in users:
+        try:
+            res = api.create('res.partner', user)
+
+            if res:
+                print(f"Rattaché.e importé.e avec succès : {user['name']} (id : {res})")
+                ids.append(res)
+        except Exception as e:
+            if not (marshal_none_error in str(e)):
+                print(f"Erreur lors de l'insertion de {user['name']}, vérifiez ses données dans le tableau ({str(e)})")
+            else:
+                pass
+
+    # TODO : remove barcode?
+    # fields = {
+    #     "barcode": ""
+    # }
+    # result_update = api.update('res.partner', ids, fields)
+    # TODO : "date_inclusion" (row[4])
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file

outils/scripts/scripts_settings_example.py

+SECRET_KEY = 'Mettre_plein_de_caracteres_aleatoires_iezezezeezezci'
+
+ODOO = {
+    'url': 'http://127.0.0.1:8069'
+    'user': 'api',
+    'passwd': 'xxxxxxxxxxxx',
+    'db': 'bd_test',
+}
+
+COUCHDB = {
+    'url': 'http://127.0.0.1:5984',
+    'dbs': {
+              'member': 'coops',
+              'inventory': 'inventory',
+              'envelops': 'envelop',
+              'shop': 'shopping_carts'
+            }
+}

reception/static/js/reception_produits.js

@@ -1336,6 +1336,15 @@ function openFAQ() {
 function openErrorReport() {
     openModal($('#templates #modal_error_report').html(), saveErrorReport, 'Confirmer');
 
+    // listener for error report textarea
+    // this is necessary because default behavior is overwritten by the listener defined in jquery.pos.js;
+    $("#error_report").keypress(function(e) {
+        var key = e.keyCode;
+        if (key === 13) {
+            this.value += "\n";
+        }
+    });
+
     var textarea = document.getElementById("error_report");
 
     textarea.value = user_comments;
@@ -1481,7 +1490,7 @@ $(document).ready(function() {
             reception_status = orders[Object.keys(orders)[0]].reception_status;
 
             // Load user comments from local storage, get it from first order
-            user_comments = orders[Object.keys(orders)[0]].user_comments;
+            user_comments = orders[Object.keys(orders)[0]].user_comments || "";
         }
 
         // Fetch orders data

templates/members/index.html

@@ -161,7 +161,7 @@
     <div class="validation_wrapper col-6">
         <section id="service_validation" class="col-6 grid-6 has-gutter">
             <div class="col-2"></div>
-            <a class="col-2 btn present">Présent.e</a>
+            <a class="col-2 btn present">{{CONFIRME_PRESENT_BTN|safe}}</a>
             <span class="loading2"><img width="75" src="/static/img/Pedro_luis_romani_ruiz.gif" alt="Chargement en cours...." /></span>
             <div class="col-2"></div>
         </section>