Merge branch 'dev' into 3609-ticket_basic-data

modules/account/back/models/role-config.js

@@ -1,7 +1,13 @@
 
 module.exports = Self => {
     Self.getSynchronizer = async function() {
-        return await Self.findOne({fields: ['id']});
+        let NODE_ENV = process.env.NODE_ENV;
+        if (!NODE_ENV || NODE_ENV == 'development')
+            return null;
+
+        return await Self.findOne({
+            fields: ['id', 'rolePrefix', 'userPrefix', 'userHost']
+        });
     };
 
     Object.assign(Self.prototype, {
@@ -14,17 +20,16 @@ module.exports = Self => {
         },
 
         async syncUser(userName, info, password) {
-            const mysqlHost = '%';
-
             let mysqlUser = userName;
-            if (this.dbType == 'MySQL') mysqlUser = `!${mysqlUser}`;
+            if (this.dbType == 'MySQL')
+                mysqlUser = this.userPrefix + mysqlUser;
 
             const [row] = await Self.rawSql(
                 `SELECT COUNT(*) AS nRows
                     FROM mysql.user
                     WHERE User = ?
                         AND Host = ?`,
-                [mysqlUser, mysqlHost]
+                [mysqlUser, this.userHost]
             );
             let userExists = row.nRows > 0;
 
@@ -35,11 +40,10 @@ module.exports = Self => {
                         FROM mysql.global_priv
                         WHERE User = ?
                             AND Host = ?`,
-                    [mysqlUser, mysqlHost]
+                    [mysqlUser, this.userHost]
                 );
                 const priv = row && JSON.parse(row.priv);
-                const role = priv && priv.default_role;
-                isUpdatable = !row || (role && role.startsWith('z-'));
+                isUpdatable = !row || (priv && priv.autogenerated);
             }
 
             if (!isUpdatable) {
@@ -51,31 +55,27 @@ module.exports = Self => {
                 if (password) {
                     if (!userExists) {
                         await Self.rawSql('CREATE USER ?@? IDENTIFIED BY ?',
-                            [mysqlUser, mysqlHost, password]
-                        );
+                            [mysqlUser, this.userHost, password]);
                         userExists = true;
                     } else {
                         switch (this.dbType) {
                         case 'MariaDB':
                             await Self.rawSql('ALTER USER ?@? IDENTIFIED BY ?',
-                                [mysqlUser, mysqlHost, password]
-                            );
+                                [mysqlUser, this.userHost, password]);
                             break;
                         default:
                             await Self.rawSql('SET PASSWORD FOR ?@? = PASSWORD(?)',
-                                [mysqlUser, mysqlHost, password]
-                            );
+                                [mysqlUser, this.userHost, password]);
                         }
                     }
                 }
 
                 if (userExists && this.dbType == 'MariaDB') {
-                    let role = `z-${info.user.role().name}`;
+                    let role = `${this.rolePrefix}${info.user.role().name}`;
 
                     try {
                         await Self.rawSql('REVOKE ALL, GRANT OPTION FROM ?@?',
-                            [mysqlUser, mysqlHost]
-                        );
+                            [mysqlUser, this.userHost]);
                     } catch (err) {
                         if (err.code == 'ER_REVOKE_GRANTS')
                             console.warn(`${err.code}: ${err.sqlMessage}: ${err.sql}`);
@@ -83,21 +83,18 @@ module.exports = Self => {
                             throw err;
                     }
                     await Self.rawSql('GRANT ? TO ?@?',
-                        [role, mysqlUser, mysqlHost]
-                    );
+                        [role, mysqlUser, this.userHost]);
 
                     if (role) {
                         await Self.rawSql('SET DEFAULT ROLE ? FOR ?@?',
-                            [role, mysqlUser, mysqlHost]
-                        );
+                            [role, mysqlUser, this.userHost]);
                     } else {
                         await Self.rawSql('SET DEFAULT ROLE NONE FOR ?@?',
-                            [mysqlUser, mysqlHost]
-                        );
+                            [mysqlUser, this.userHost]);
                     }
                 }
             } else if (userExists)
-                await Self.rawSql('DROP USER ?@?', [mysqlUser, mysqlHost]);
+                await Self.rawSql('DROP USER ?@?', [mysqlUser, this.userHost]);
         }
     });
 };

modules/account/back/models/role-config.json

@@ -16,6 +16,18 @@
 		},
 		"mysqlPassword": {
 			"type": "string"
+		},
+		"rolePrefix": {
+			"type": "string"
+		},
+		"userPrefix": {
+			"type": "string"
+		},
+		"userHost": {
+			"type": "string"
+		},
+		"tplUser": {
+			"type": "string"
 		}
 	}
 }

modules/claim/front/search-panel/index.html

@@ -28,7 +28,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                where="{role: {inq: ['salesPerson', 'officeBoss']}}"
+                where="{role: {inq: ['salesBoss', 'salesPerson', 'officeBoss']}}"
                 label="Salesperson">
                 <tpl-item>{{firstName}} {{name}}</tpl-item>
             </vn-autocomplete>
@@ -38,7 +38,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                where="{role: 'salesPerson'}"
+                where="{role: {inq: ['salesBoss', 'salesPerson']}}"
                 label="Attended by">
                 <tpl-item>{{firstName}} {{name}}</tpl-item>
             </vn-autocomplete>

print/methods/closure/closure.js

@@ -12,8 +12,6 @@ module.exports = {
         const failedtickets = [];
         for (const ticket of tickets) {
             try {
-                await db.rawSql('START TRANSACTION');
-
                 await db.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]);
 
                 const invoiceOut = await db.findOne(`
@@ -91,9 +89,7 @@ module.exports = {
                     const email = new Email('delivery-note-link', args);
                     await email.send();
                 }
-                await db.rawSql('COMMIT');
             } catch (error) {
-                await db.rawSql('ROLLBACK');
                 // Domain not found
                 if (error.responseCode == 450)
                     return invalidEmail(ticket);

print/templates/reports/invoice/assets/css/style.css

@@ -5,7 +5,7 @@ h2 {
 
 .table-title {
     margin-bottom: 15px;
-    font-size: 0.8rem
+    font-size: .8rem
 }
 
 .table-title h2 {
@@ -16,9 +16,12 @@ h2 {
     font-size: 22px
 }
 
+
 #nickname h2 {
     max-width: 400px;
-    word-wrap: break-word
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
 }
 
 #phytosanitary {

print/templates/reports/invoice/invoice.html

@@ -85,7 +85,7 @@
                                 <!-- End of rectified invoices block -->
                 
                                 <!-- Sales block -->
-                                <div class="vn-mt-lg no-page-break" v-for="ticket in tickets">
+                                <div class="vn-mt-lg" v-for="ticket in tickets">
                                     <div class="table-title clearfix">
                                         <div class="pull-left">
                                             <h2>{{$t('deliveryNote')}}</strong>