Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada

CHANGELOG.md

@@ -8,9 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2302.01] - 2023-01-12
 
 ### Added
-
+- [General](Inicio) Permite recuperar la contraseña
--
 
 ### Changed
+- [Supplier](Crear/Editar) Permite añadir Proveedores con la misma razón social pero con países distintos
 
-- Se permite añadir Proveedores con la misma razón social pero con países distintos
+
+### Removed
+- [Tickets](Control clientes) Eliminada sección

db/changes/230201/00-kkearSaleChecked.sql

@@ -0,0 +1,2 @@
+DELETE FROM `salix`.`ACL` WHERE model="SaleChecked";
+DROP TABLE IF EXISTS `vn`.`saleChecked`;

e2e/helpers/selectors.js

@@ -30,7 +30,7 @@ export default {
         firstModuleRemovePinIcon: 'vn-home a:nth-child(1) vn-icon[icon="remove_circle"]'
     },
     recoverPassword: {
-        recoverPasswordButton: 'vn-login a[ui-sref="recoverPassword"]',
+        recoverPasswordButton: 'vn-login a[ui-sref="recover-password"]',
         email: 'vn-recover-password vn-textfield[ng-model="$ctrl.email"]',
         sendEmailButton: 'vn-recover-password vn-submit',
     },

e2e/paths/01-salix/04_recoverPassword.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors';
 import getBrowser from '../../helpers/puppeteer';
 
-// https://redmine.verdnatura.es/issues/4995 fix login
+describe('RecoverPassword path', async() => {
-xdescribe('RecoverPassword path', async() => {
     let browser;
     let page;
 
@@ -11,7 +10,7 @@ xdescribe('RecoverPassword path', async() => {
         page = browser.page;
 
         await page.waitToClick(selectors.recoverPassword.recoverPasswordButton);
-        await page.waitForState('recoverPassword');
+        await page.waitForState('recover-password');
     });
 
     afterAll(async() => {

front/core/services/auth.js

@@ -24,7 +24,7 @@ export default class Auth {
     initialize() {
         let criteria = {
             to: state => {
-                const outLayout = ['login', 'recoverPassword', 'resetPassword'];
+                const outLayout = ['login', 'recover-password', 'reset-password'];
                 return !outLayout.some(ol => ol == state.name);
             }
         };

front/salix/components/app/app.html

@@ -1,9 +1,3 @@
-<vn-layout
+<ui-view></ui-view>
-    ng-if="$ctrl.showLayout">
-</vn-layout>
-<ui-view
-    name="login"
-    ng-if="!$ctrl.showLayout">
-</ui-view>
 <vn-snackbar vn-id="snackbar"></vn-snackbar>
 <vn-debug-info></vn-debug-info>

front/salix/components/app/app.js

@@ -19,12 +19,6 @@ export default class App extends Component {
         this.vnApp.logger = this;
     }
 
-    get showLayout() {
-        const state = this.$state.current.name || this.$location.$$path.substring(1).replace('/', '.');
-        const outLayout = ['login', 'recoverPassword', 'resetPassword', 'reset-password'];
-        return state && !outLayout.some(ol => ol == state);
-    }
-
     $onDestroy() {
         this.deregisterCallback();
         this.vnApp.logger = null;

front/salix/components/index.js

@@ -5,10 +5,10 @@ import './descriptor-popover';
 import './home/home';
 import './layout';
 import './left-menu/left-menu';
-import './login/index';
+import './login';
-import './login/login';
+import './outLayout';
-import './login/recover-password';
+import './recover-password';
-import './login/reset-password';
+import './reset-password';
 import './module-card';
 import './module-main';
 import './side-menu/side-menu';

front/salix/components/login/index.html

@@ -1,6 +1,27 @@
-<div class="box">
+<vn-textfield
-	<img src="./logo.svg"/>
+    label="User"
-	<form name="form">
+    ng-model="$ctrl.user"
-        <ui-view></ui-view>
+    vn-id="userField"
-    </form>
+    vn-focus>
+</vn-textfield>
+<vn-textfield
+    label="Password"
+    ng-model="$ctrl.password"
+    type="password">
+</vn-textfield>
+<vn-check
+    label="Do not close session"
+    ng-model="$ctrl.remember"
+    name="remember">
+</vn-check>
+<div class="footer">
+    <vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit>
+    <div class="spinner-wrapper">
+        <vn-spinner enable="$ctrl.loading"></vn-spinner>
+    </div>
+    <div class="vn-pt-lg">
+        <a ui-sref="recover-password" translate>
+            I do not remember my password
+        </a>
+    </div>
 </div>

front/salix/components/login/index.js

@@ -1,16 +1,43 @@
 import ngModule from '../../module';
-import Component from 'core/lib/component';
 import './style.scss';
 
-export default class OutLayout extends Component {
+/**
-    constructor($element, $scope) {
+ * A simple login form.
-        super($element, $scope);
+ */
+export default class Controller {
+    constructor($, $element, vnAuth) {
+        Object.assign(this, {
+            $,
+            $element,
+            vnAuth,
+            user: localStorage.getItem('lastUser'),
+            remember: true
+        });
+    }
+
+    submit() {
+        this.loading = true;
+        this.vnAuth.login(this.user, this.password, this.remember)
+            .then(() => {
+                localStorage.setItem('lastUser', this.user);
+                this.loading = false;
+            })
+            .catch(err => {
+                this.loading = false;
+                this.password = '';
+                this.focusUser();
+                throw err;
+            });
+    }
+
+    focusUser() {
+        this.$.userField.select();
+        this.$.userField.focus();
     }
 }
+Controller.$inject = ['$scope', '$element', 'vnAuth'];
 
-OutLayout.$inject = ['$element', '$scope'];
+ngModule.vnComponent('vnLogin', {
-
-ngModule.vnComponent('vnOutLayout', {
     template: require('./index.html'),
-    controller: OutLayout
+    controller: Controller
 });

front/salix/components/login/locale/es.yml

@@ -1,16 +1,5 @@
 User: Usuario
 Password: Contraseña
-Email: Correo electrónico
 Do not close session: No cerrar sesión
 Enter: Entrar
 I do not remember my password: No recuerdo mi contraseña
-Recover password: Recuperar contraseña
-We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
-Notification sent!: ¡Notificación enviada!
-Reset password: Restrablecer contraseña
-New password: Nueva contraseña
-Repeat password: Repetir contraseña
-Password requirements: >
-    La contraseña debe tener al menos {{ length }} caracteres de longitud,
-    {{nAlpha}} caracteres alfabéticos, {{nUpper}} letras mayúsculas, {{nDigits}}
-    dígitos y {{nPunct}} símbolos (Ej: $%&.)

front/salix/components/login/login.html

@@ -1,32 +0,0 @@
-<div class="box">
-	<img src="./logo.svg"/>
-	<form name="form" ng-submit="$ctrl.submit()">
-        <vn-textfield
-            label="User"
-            ng-model="$ctrl.user"
-            vn-id="userField"
-            vn-focus>
-        </vn-textfield>
-        <vn-textfield
-            label="Password"
-            ng-model="$ctrl.password"
-            type="password">
-        </vn-textfield>
-        <vn-check
-            label="Do not close session"
-            ng-model="$ctrl.remember"
-            name="remember">
-        </vn-check>
-        <div class="footer">
-            <vn-submit label="Enter" ng-click="$ctrl.submit()"></vn-submit>
-            <div class="spinner-wrapper">
-                <vn-spinner enable="$ctrl.loading"></vn-spinner>
-            </div>
-            <!--<div class="vn-pt-lg">
-                <a ui-sref="recoverPassword" translate>
-                    I do not remember my password
-                </a>
-            </div>-->
-        </div>
-    </form>
-</div>

front/salix/components/login/login.js

@@ -1,43 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-
-/**
- * A simple login form.
- */
-export default class Controller {
-    constructor($, $element, vnAuth) {
-        Object.assign(this, {
-            $,
-            $element,
-            vnAuth,
-            user: localStorage.getItem('lastUser'),
-            remember: true
-        });
-    }
-
-    submit() {
-        this.loading = true;
-        this.vnAuth.login(this.user, this.password, this.remember)
-            .then(() => {
-                localStorage.setItem('lastUser', this.user);
-                this.loading = false;
-            })
-            .catch(err => {
-                this.loading = false;
-                this.password = '';
-                this.focusUser();
-                throw err;
-            });
-    }
-
-    focusUser() {
-        this.$.userField.select();
-        this.$.userField.focus();
-    }
-}
-Controller.$inject = ['$scope', '$element', 'vnAuth'];
-
-ngModule.vnComponent('vnLogin', {
-    template: require('./login.html'),
-    controller: Controller
-});

front/salix/components/login/style.scss

@@ -1,8 +1,6 @@
 @import "variables";
 
-vn-login,
+vn-login{
-vn-reset-password,
-vn-recover-password{
     .footer {
         margin-top: 32px;
         text-align: center;
@@ -24,69 +22,3 @@ vn-recover-password{
         }
     }
 }
-
-vn-login{
-	position: absolute;
-	height: 100%;
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	color: $color-font;
-	font-size: 1.1rem;
-	font-weight: normal;
-	background-color: $color-bg-dark;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	overflow: auto;
-
-	& > .box {
-		box-sizing: border-box;
-		position: absolute;
-		max-width: 304px;
-		min-width: 240px;
-		padding: 48px;
-		background-color: $color-bg-panel;
-		box-shadow: 0 0 16px 0 rgba(0, 0, 0, .6);
-		border-radius: 8px;
-
-		& > img {
-			width: 100%;
-			padding-bottom: 16px;
-		}
-		& > form {
-			& > .vn-textfield {
-				width: 100%;
-			}
-			& > .vn-check {
-				display: block;
-				.md-label {
-					white-space: inherit;
-				}
-			}
-		}
-
-        h5{
-            color: $color-primary;
-        }
-
-        .text-secondary{
-            text-align: center;
-            padding-bottom: 16px;
-        }
-
-	}
-
-	@media screen and (max-width: 600px) {
-		background-color: $color-bg-panel;
-
-		& > .box {
-			padding: 16px;
-			box-shadow: none;
-		}
-	}
-
-    a{
-        color: $color-primary;
-    }
-}

front/salix/components/outLayout/index.html

@@ -0,0 +1,6 @@
+<div class="box">
+	<img src="./logo.svg"/>
+	<form name="form">
+        <ui-view></ui-view>
+    </form>
+</div>

front/salix/components/outLayout/index.js

@@ -0,0 +1,16 @@
+import ngModule from '../../module';
+import Component from 'core/lib/component';
+import './style.scss';
+
+export default class OutLayout extends Component {
+    constructor($element, $scope) {
+        super($element, $scope);
+    }
+}
+
+OutLayout.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnOutLayout', {
+    template: require('./index.html'),
+    controller: OutLayout
+});

front/salix/components/outLayout/style.scss

@@ -0,0 +1,67 @@
+@import "variables";
+
+vn-out-layout{
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	margin: 0;
+	padding: 0;
+	color: $color-font;
+	font-size: 1.1rem;
+	font-weight: normal;
+	background-color: $color-bg-dark;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: auto;
+
+	& > .box {
+		box-sizing: border-box;
+		position: absolute;
+		max-width: 304px;
+		min-width: 240px;
+		padding: 48px;
+		background-color: $color-bg-panel;
+		box-shadow: 0 0 16px 0 rgba(0, 0, 0, .6);
+		border-radius: 8px;
+
+		& > img {
+			width: 100%;
+			padding-bottom: 16px;
+		}
+		& > form {
+			& > .vn-textfield {
+				width: 100%;
+			}
+			& > .vn-check {
+				display: block;
+				.md-label {
+					white-space: inherit;
+				}
+			}
+		}
+
+        h5{
+            color: $color-primary;
+        }
+
+        .text-secondary{
+            text-align: center;
+            padding-bottom: 16px;
+        }
+
+	}
+
+	@media screen and (max-width: 600px) {
+		background-color: $color-bg-panel;
+
+		& > .box {
+			padding: 16px;
+			box-shadow: none;
+		}
+	}
+
+    a{
+        color: $color-primary;
+    }
+}

front/salix/components/recover-password/index.js

@@ -32,6 +32,6 @@ export default class Controller {
 Controller.$inject = ['$scope', '$element', '$http', 'vnApp', '$translate', '$state'];
 
 ngModule.vnComponent('vnRecoverPassword', {
-    template: require('./recover-password.html'),
+    template: require('./index.html'),
     controller: Controller
 });

front/salix/components/recover-password/locale/es.yml

@@ -0,0 +1,3 @@
+Recover password: Recuperar contraseña
+We will sent you an email to recover your password: Te enviaremos un correo para restablecer tu contraseña
+Notification sent!: ¡Notificación enviada!

front/salix/components/recover-password/style.scss

@@ -0,0 +1,24 @@
+@import "variables";
+
+vn-recover-password{
+    .footer {
+        margin-top: 32px;
+        text-align: center;
+        position: relative;
+        & > .vn-submit {
+            display: block;
+
+            & > input {
+                display: block;
+                width: 100%;
+            }
+        }
+        & > .spinner-wrapper {
+            position: absolute;
+            width: 0;
+            top: 3px;
+            right: -8px;
+            overflow: visible;
+        }
+    }
+}

front/salix/components/reset-password/index.js

@@ -43,6 +43,6 @@ export default class Controller {
 Controller.$inject = ['$scope', '$element', '$http', 'vnApp', '$translate', '$state', '$location'];
 
 ngModule.vnComponent('vnResetPassword', {
-    template: require('./reset-password.html'),
+    template: require('./index.html'),
     controller: Controller
 });

front/salix/components/reset-password/locale/en.yml

@@ -1,7 +1,3 @@
-User: User
-Password: Password
-Do not close session: Do not close session
-Enter: Enter
 Password requirements: >
     The password must have at least {{ length }} length characters,
     {{nAlpha}} alphabetic characters, {{nUpper}} capital letters, {{nDigits}}

front/salix/components/reset-password/locale/es.yml

@@ -0,0 +1,8 @@
+Reset password: Restrablecer contraseña
+New password: Nueva contraseña
+Repeat password: Repetir contraseñaç
+Password changed!: ¡Contraseña cambiada!
+Password requirements: >
+    La contraseña debe tener al menos {{ length }} caracteres de longitud,
+    {{nAlpha}} caracteres alfabéticos, {{nUpper}} letras mayúsculas, {{nDigits}}
+    dígitos y {{nPunct}} símbolos (Ej: $%&.)

front/salix/components/reset-password/style.scss

@@ -0,0 +1,24 @@
+@import "variables";
+
+vn-reset-password{
+    .footer {
+        margin-top: 32px;
+        text-align: center;
+        position: relative;
+        & > .vn-submit {
+            display: block;
+
+            & > input {
+                display: block;
+                width: 100%;
+            }
+        }
+        & > .spinner-wrapper {
+            position: absolute;
+            width: 0;
+            top: 3px;
+            right: -8px;
+            overflow: visible;
+        }
+    }
+}

front/salix/routes.js

@@ -3,27 +3,38 @@ import getMainRoute from 'core/lib/get-main-route';
 
 config.$inject = ['$stateProvider', '$urlRouterProvider'];
 function config($stateProvider, $urlRouterProvider) {
-    $urlRouterProvider.otherwise('/');
+    $urlRouterProvider
+        .otherwise('/');
 
     $stateProvider
+        .state('layout', {
+            abstract: true,
+            template: '<vn-layout></vn-layout>',
+        })
+        .state('outLayout', {
+            abstract: true,
+            template: '<vn-out-layout></vn-out-layout>',
+        })
         .state('login', {
+            parent: 'outLayout',
             url: '/login?continue',
             description: 'Login',
-            views: {
+            template: '<vn-login></vn-login>'
-                'login': {template: '<vn-login></vn-login>'},
-            }
         })
-        .state('recoverPassword', {
+        .state('recover-password', {
+            parent: 'outLayout',
             url: '/recover-password',
-            description: 'Recover-password',
+            description: 'Recover password',
-            template: '<vn-recover-password>asd</vn-recover-password>'
+            template: '<vn-recover-password></vn-recover-password>'
         })
-        .state('resetPassword', {
+        .state('reset-password', {
+            parent: 'outLayout',
             url: '/reset-password',
-            description: 'Reset-password',
+            description: 'Reset password',
             template: '<vn-reset-password></vn-reset-password>'
         })
         .state('home', {
+            parent: 'layout',
             url: '/',
             description: 'Home',
             template: '<vn-home></vn-home>'
@@ -54,6 +65,10 @@ function config($stateProvider, $urlRouterProvider) {
             };
             if (route.abstract)
                 configRoute.abstract = true;
+
+            if (!route.state.includes('.'))
+                configRoute.parent = 'layout';
+
             if (route.routeParams)
                 configRoute.params = route.routeParams;
 

modules/entry/front/buy/index/index.js

@@ -73,6 +73,12 @@ export default class Controller extends Section {
             this.vnApp.showSuccess(this.$t('Data saved!'));
         });
     }
+
+    itemSearchFunc($search) {
+        return /^\d+$/.test($search)
+            ? {id: $search}
+            : {name: {like: '%' + $search + '%'}};
+    }
 }
 
 ngModule.vnComponent('vnEntryBuyIndex', {

modules/ticket/back/model-config.json

@@ -32,9 +32,6 @@
     "Sale": {
         "dataSource": "vn"
     },
-    "SaleChecked": {
-        "dataSource": "vn"
-    },
     "SaleCloned": {
         "dataSource": "vn"
     },

modules/ticket/back/models/sale-checked.json

@@ -1,24 +0,0 @@
-{
-    "name": "SaleChecked",
-    "base": "VnModel",
-    "options": {
-      "mysql": {
-        "table": "saleChecked"
-      }
-    },
-    "properties": {
-      "isChecked": {
-        "type": "number"
-      },
-      "saleFk": {
-        "id": true
-      }
-  },
-  "relations": {
-    "sale": {
-      "type": "belongsTo",
-      "model": "Sale",
-      "foreignKey": "saleFk"
-    }
-  }
-}

modules/ticket/back/models/sale.json

@@ -56,11 +56,6 @@
             "foreignKey": "ticketFk",
             "required": true
         },
-        "isChecked": {
-            "type": "hasOne",
-            "model": "SaleChecked",
-            "foreignKey": "saleFk"
-        },
         "components": {
             "type": "hasMany",
             "model": "SaleComponent",
@@ -80,6 +75,6 @@
             "type": "hasOne",
             "model": "ItemShelvingSale",
             "foreignKey": "saleFk"
-        }   
+        }
     }
 }

modules/ticket/front/index.js

@@ -20,7 +20,6 @@ import './package/index';
 import './sale';
 import './tracking/index';
 import './tracking/edit';
-import './sale-checked';
 import './services';
 import './component';
 import './sale-tracking';

modules/ticket/front/routes.json

@@ -23,7 +23,6 @@
             {"state": "ticket.card.expedition", "icon": "icon-package"},
             {"state": "ticket.card.service", "icon": "icon-services"},
             {"state": "ticket.card.package", "icon": "icon-bucket"},
-            {"state": "ticket.card.saleChecked", "icon": "assignment"},
             {"state": "ticket.card.components", "icon": "icon-components"},
             {"state": "ticket.card.saleTracking", "icon": "assignment"},
             {"state": "ticket.card.dms.index", "icon": "cloud_download"},
@@ -159,15 +158,6 @@
             },
             "acl": ["production", "administrative", "salesPerson"]
         },
-        {
-            "url" : "/sale-checked",
-            "state": "ticket.card.saleChecked",
-            "component": "vn-ticket-sale-checked",
-            "description": "Sale checked",
-            "params": {
-                "ticket": "$ctrl.ticket"
-            }
-        },
         {
             "url" : "/components",
             "state": "ticket.card.components",

modules/ticket/front/sale-checked/index.html

@@ -1,60 +0,0 @@
-<vn-crud-model
-    vn-id="model"
-    url="sales"
-    filter="::$ctrl.filter"
-    link="{ticketFk: $ctrl.$params.id}"
-    limit="20"
-    data="sales"
-    order="concept ASC"
-    auto-load="true">
-</vn-crud-model>
-<vn-data-viewer model="model">
-    <vn-card class="vn-w-lg">
-    <vn-table model="model">
-        <vn-thead>
-            <vn-tr>
-                <vn-th field="isChecked" center>Is checked</vn-th>
-                <vn-th field="itemFk" number>Item</vn-th>
-                <vn-th field="concept">Description</vn-th>
-                <vn-th field="quantity" number>Quantity</vn-th>
-            </vn-tr>
-        </vn-thead>
-        <vn-tbody>
-            <vn-tr ng-repeat="sale in sales">
-                <vn-td center shrink>
-                    <vn-check 
-                        vn-one ng-model="sale.isChecked.isChecked" 
-                        disabled="true">
-                    </vn-check>
-                </vn-td>
-                <vn-td number>
-                    <span
-                        ng-click="$ctrl.showItemDescriptor($event, sale)"
-                        class="link">
-                        {{::sale.itemFk | zeroFill:6}}
-                    </span>
-                </vn-td>
-                <vn-td vn-fetched-tags>
-                    <div>
-                        <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
-                        <vn-one ng-if="::sale.item.subName">
-                            <h3 title="{{::sale.item.subName}}">{{::sale.item.subName}}</h3>
-                        </vn-one>
-                    </div>
-                    <vn-fetched-tags
-                        max-length="6"
-                        item="::sale.item"
-                        tabindex="-1">
-                    </vn-fetched-tags>
-                </vn-td>
-                <vn-td number>{{::sale.quantity}}</vn-td>
-            </vn-tr>
-        </vn-tbody>
-    </vn-table>
-    </vn-card>
-</vn-data-viewer>
-<vn-item-descriptor-popover
-    vn-id="item-descriptor"
-    warehouse-fk="$ctrl.ticket.warehouseFk"
-    ticket-fk="$ctrl.ticket.id">
-</vn-item-descriptor-popover>

modules/ticket/front/sale-checked/index.js

@@ -1,42 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-class Controller extends Section {
-    constructor($element, $) {
-        super($element, $);
-        this.filter = {
-            include: [
-                {
-                    relation: 'item'
-                }, {
-                    relation: 'isChecked',
-                    scope: {
-                        fields: ['isChecked']
-                    }
-                }
-            ]
-        };
-    }
-    showItemDescriptor(event, sale) {
-        this.quicklinks = {
-            btnThree: {
-                icon: 'icon-transaction',
-                state: `item.card.diary({
-                    id: ${sale.itemFk}, 
-                    warehouseFk: ${this.ticket.warehouseFk},
-                    lineFk: ${sale.id}
-                })`,
-                tooltip: 'Item diary'
-            }
-        };
-        this.$.itemDescriptor.show(event.target, sale.itemFk);
-    }
-}
-
-ngModule.vnComponent('vnTicketSaleChecked', {
-    template: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        ticket: '<'
-    }
-});