Merge branch 'master' into test

back/model-config.json

@@ -133,6 +133,9 @@
     "Postcode": {
         "dataSource": "vn"
     },
+    "Prefix": {
+        "dataSource": "vn"
+    },
     "ReferenceRate": {
         "dataSource": "vn"
     },

back/models/prefix.json

@@ -0,0 +1,27 @@
+{
+    "name": "Prefix",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "pbx.prefix"
+        }
+    },
+    "properties": {
+        "country": {
+            "type": "string",
+            "id": true
+        },
+        "prefix": {
+            "type": "string"
+        }
+    },
+    "acls": [
+        {
+            "property": "*",
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

modules/client/back/methods/client/summary.js

@@ -54,7 +54,7 @@ module.exports = Self => {
                 {
                     relation: 'country',
                     scope: {
-                        fields: ['id', 'name'],
+                        fields: ['id', 'name', 'code'],
                         include: {
                             relation: 'saySimpleCountry',
                         }

print/templates/reports/buy-label-barcode/assets/css/style.css

@@ -33,7 +33,9 @@ td {
     font-size: 26px;
 }
 .lg-txt {
-    font-size: 32px;
+    font-size: 40px;
+    padding: 0px;
+    line-height: 1;
 }
 .xl-txt {
     font-size: 50px;

print/templates/reports/buy-label-barcode/buy-label-barcode.html

@@ -36,12 +36,12 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="lg-txt xl-width bold center">
+				<td class="bold center lg-txt xl-width">
 					<div class="overflow-line">
 						{{formatNumber(buy.itemFk)}}
 					</div>
 				</td>
-				<td colspan="2" class="md-txt md-width center">
+				<td colspan="2" class="center md-txt md-width">
 					<div class="overflow-line">
 						{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
 					</div>