Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index

Jenkinsfile

@@ -54,6 +54,10 @@ pipeline {
             }
         }
         stage('Test') {
+            when { not { anyOf {
+                branch 'test'
+                branch 'master'
+            }}}
             environment {
                 NODE_ENV = ""
             }

back/process.yml

@@ -4,3 +4,4 @@ apps:
     instances: 1
     max_restarts: 3
     restart_delay: 15000
+    node_args: --tls-min-v1.0

db/docker.js

@@ -54,7 +54,7 @@ module.exports = class Docker {
                 this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort'];
             }
 
-            await this.waitForHealthy();
+            if (runChown) await this.wait();
         } catch (err) {
             if (this.isRandom)
                 await this.rm();

front/salix/module.js

@@ -73,7 +73,7 @@ export function config($translateProvider, $translatePartialLoaderProvider, $htt
                 return locale;
             if (langOptions.langAliases[locale])
                 return langOptions.langAliases[locale];
-            return fallbackLang;
+            return langOptions.fallbackLang;
         });
 
     $translatePartialLoaderProvider.addPart(appName);

gulpfile.js

@@ -48,7 +48,7 @@ function backWatch(done) {
 
     // XXX: Workaround to avoid nodemon bug
     // https://github.com/remy/nodemon/issues/1346
-    let commands = ['node --inspect ./node_modules/gulp/bin/gulp.js'];
+    let commands = ['node --tls-min-v1.0 --inspect ./node_modules/gulp/bin/gulp.js'];
     if (!isWindows) commands.unshift('sleep 1');
 
     nodemon({
@@ -136,7 +136,7 @@ function backTest(done) {
     const nodemon = require('gulp-nodemon');
 
     nodemon({
-        exec: ['node ./node_modules/gulp/bin/gulp.js'],
+        exec: ['node --tls-min-v1.0 ./node_modules/gulp/bin/gulp.js'],
         args: ['backTestOnce'],
         watch: backSources,
         done: done

modules/claim/front/locale/es.yml

@@ -15,4 +15,4 @@ Show Pickup order: Ver orden de recogida
 Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
 Claim deleted!: Reclamación eliminada!
 claim: reclamación
-Photos: Fotos
+Photos: Fotos

modules/client/back/methods/client/specs/sendSms.spec.js

@@ -0,0 +1,27 @@
+const app = require('vn-loopback/server/server');
+
+describe('client sendSms()', () => {
+    let createdLog;
+
+    afterAll(async done => {
+        await app.models.ClientLog.destroyById(createdLog.id);
+
+        done();
+    });
+
+    it('should send a message and log it', async() => {
+        let ctx = {req: {accessToken: {userId: 9}}};
+        let id = 101;
+        let destination = 222222222;
+        let message = 'this is the message created in a test';
+
+        let sms = await app.models.Client.sendSms(ctx, id, destination, message);
+
+        logId = sms.logId;
+
+        createdLog = await app.models.ClientLog.findById(logId);
+        let json = JSON.parse(JSON.stringify(createdLog.newInstance));
+
+        expect(json.message).toEqual(message);
+    });
+});

modules/client/back/methods/sms/send.spec.js

@@ -0,0 +1,37 @@
+const app = require('vn-loopback/server/server');
+const soap = require('soap');
+
+describe('sms send()', () => {
+    it('should return the expected message and status code', async() => {
+        const code = 200;
+        const smsConfig = await app.models.SmsConfig.findOne();
+        const soapClient = await soap.createClientAsync(smsConfig.uri);
+        spyOn(soap, 'createClientAsync').and.returnValue(soapClient);
+        spyOn(soapClient, 'sendSMSAsync').and.returnValue([{
+            result: {
+                $value:
+                       `<xtratelecom-sms-response>
+                            <sms>
+                                <codigo>
+                                    ${code}
+                                </codigo>
+                                <descripcion>
+                                    Envio en procesamiento
+                                </descripcion>
+                                <messageId>
+                                    1
+                                </messageId>
+                            </sms>
+                            <procesoId>
+                                444328681
+                            </procesoId>
+                        </xtratelecom-sms-response>`
+            }
+        }]);
+        let ctx = {req: {accessToken: {userId: 1}}};
+        let result = await app.models.Sms.send(ctx, 105, 'destination', 'My SMS Body');
+
+        expect(result.statusCode).toEqual(200);
+        expect(result.status).toContain('Fake response');
+    });
+});

modules/ticket/back/methods/ticket/specs/sendSms.spec.js

@@ -0,0 +1,27 @@
+const app = require('vn-loopback/server/server');
+
+describe('ticket sendSms()', () => {
+    let logId;
+
+    afterAll(async done => {
+        await app.models.TicketLog.destroyById(logId);
+
+        done();
+    });
+
+    it('should send a message and log it', async() => {
+        let ctx = {req: {accessToken: {userId: 9}}};
+        let id = 11;
+        let destination = 222222222;
+        let message = 'this is the message created in a test';
+
+        let sms = await app.models.Ticket.sendSms(ctx, id, destination, message);
+
+        logId = sms.logId;
+
+        let createdLog = await app.models.TicketLog.findById(logId);
+        let json = JSON.parse(JSON.stringify(createdLog.newInstance));
+
+        expect(json.message).toEqual(message);
+    });
+});

modules/ticket/front/sale/index.html

@@ -99,8 +99,8 @@
                     </vn-td>
                 <vn-td shrink>
                     <img 
-                        ng-src="{{::$root.imagePath}}/50x50/{{sale.image}}"
-                        zoom-image="{{::$root.imagePath}}/1600x900/{{sale.image}}"
+                        ng-src="{{::$root.imagePath}}/catalog/50x50/{{sale.image}}"
+                        zoom-image="{{::$root.imagePath}}/catalog/1600x900/{{sale.image}}"
                         on-error-src/>
                 </vn-td>
                 <vn-td vn-focus number>