Merge branch 'dev' of github.com:Quantum-P3/datasurvey into feature/US-49
This commit is contained in:
commit
e8e0e30327
|
|
@ -7,8 +7,10 @@
|
|||
"": {
|
||||
"name": "data-survey",
|
||||
"version": "0.0.1-SNAPSHOT",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@angular/cdk": "^12.1.4",
|
||||
"@angular/common": "12.0.5",
|
||||
"@angular/compiler": "12.0.5",
|
||||
"@angular/core": "12.0.5",
|
||||
|
|
@ -17,9 +19,10 @@
|
|||
"@angular/platform-browser": "12.0.5",
|
||||
"@angular/platform-browser-dynamic": "12.0.5",
|
||||
"@angular/router": "12.0.5",
|
||||
"@fortawesome/angular-fontawesome": "0.9.0",
|
||||
"@fortawesome/fontawesome-svg-core": "1.2.35",
|
||||
"@fortawesome/free-solid-svg-icons": "5.15.3",
|
||||
"@fortawesome/angular-fontawesome": "^0.9.0",
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.35",
|
||||
"@fortawesome/free-brands-svg-icons": "^5.15.3",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.15.3",
|
||||
"@ng-bootstrap/ng-bootstrap": "9.1.3",
|
||||
"@ngx-translate/core": "13.0.0",
|
||||
"@ngx-translate/http-loader": "6.0.0",
|
||||
|
|
@ -29,8 +32,11 @@
|
|||
"chartist": "^0.11.4",
|
||||
"dayjs": "1.10.5",
|
||||
"jquery": "^3.6.0",
|
||||
"jw-angular-social-buttons": "^1.0.0",
|
||||
"ng-chartist": "^5.0.0",
|
||||
"ngx-infinite-scroll": "10.0.1",
|
||||
"ngx-paypal": "^8.0.0",
|
||||
"ngx-sharebuttons": "^8.0.5",
|
||||
"ngx-webstorage": "8.0.0",
|
||||
"rxjs": "6.6.7",
|
||||
"sockjs-client": "1.5.0",
|
||||
|
|
@ -505,6 +511,28 @@
|
|||
"typescript": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@angular/cdk": {
|
||||
"version": "12.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.1.tgz",
|
||||
"integrity": "sha512-UOzuDXcfaJlBd+o7EJb6CZ3my1AmU7XHriC/hFT6bFianhVK/I/0gcOwxyMx8VAplEip8msLczX0IlZSJ1GCCg==",
|
||||
"dependencies": {
|
||||
"tslib": "^2.2.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"parse5": "^5.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/common": "^12.0.0 || ^13.0.0-0",
|
||||
"@angular/core": "^12.0.0 || ^13.0.0-0",
|
||||
"rxjs": "^6.5.3 || ^7.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@angular/cdk/node_modules/parse5": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
|
||||
"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/@angular/cli": {
|
||||
"version": "12.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.0.4.tgz",
|
||||
|
|
@ -2746,9 +2774,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@fortawesome/fontawesome-common-types": {
|
||||
"version": "0.2.35",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
|
||||
"integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw==",
|
||||
"version": "0.2.36",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
|
||||
"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==",
|
||||
"hasInstallScript": true,
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
|
|
@ -2766,6 +2794,18 @@
|
|||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/@fortawesome/free-brands-svg-icons": {
|
||||
"version": "5.15.4",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz",
|
||||
"integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.36"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/@fortawesome/free-solid-svg-icons": {
|
||||
"version": "5.15.3",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
|
||||
|
|
@ -15779,6 +15819,11 @@
|
|||
"integrity": "sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/jw-angular-social-buttons": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/jw-angular-social-buttons/-/jw-angular-social-buttons-1.0.0.tgz",
|
||||
"integrity": "sha512-E1xxsZBj0+DzJC7iPrwqq08UnfMbYuUHibMt5ijSqrR2LyBKmrZIlRM+8I+4e3m0bNNt1nwBbXcKlY6DsvOCOQ=="
|
||||
},
|
||||
"node_modules/karma-source-map-support": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
|
||||
|
|
@ -17220,6 +17265,32 @@
|
|||
"opencollective-postinstall": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/ngx-paypal": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ngx-paypal/-/ngx-paypal-8.0.0.tgz",
|
||||
"integrity": "sha512-cmXpEb8Gfwwk/Yn43w0OsURpRXiXghgZ5MbVKBYsPdkAqVacoQtYiWLcNmmU/DYGoPN5lRVqZb+Svg6qbbOvTw==",
|
||||
"dependencies": {
|
||||
"tslib": "^2.2.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/common": "^12.0.0",
|
||||
"@angular/core": "^12.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ngx-sharebuttons": {
|
||||
"version": "8.0.5",
|
||||
"resolved": "https://registry.npmjs.org/ngx-sharebuttons/-/ngx-sharebuttons-8.0.5.tgz",
|
||||
"integrity": "sha512-LAaZQk1i/yuYkX+SK72OkJBMNmGJ7SS/yoGEIyuUd7r9F9SwLpWfUAjccmtuM0qDzd48h+1CCnPGIB6WYlKY4g==",
|
||||
"dependencies": {
|
||||
"tslib": "^2.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@angular/cdk": ">=8.0.0",
|
||||
"@angular/common": ">=8.0.0",
|
||||
"@angular/core": ">=8.0.0",
|
||||
"rxjs": ">=6.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/ngx-webstorage": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ngx-webstorage/-/ngx-webstorage-8.0.0.tgz",
|
||||
|
|
@ -27667,6 +27738,23 @@
|
|||
"@typescript-eslint/experimental-utils": "4.23.0"
|
||||
}
|
||||
},
|
||||
"@angular/cdk": {
|
||||
"version": "12.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.1.tgz",
|
||||
"integrity": "sha512-UOzuDXcfaJlBd+o7EJb6CZ3my1AmU7XHriC/hFT6bFianhVK/I/0gcOwxyMx8VAplEip8msLczX0IlZSJ1GCCg==",
|
||||
"requires": {
|
||||
"parse5": "^5.0.0",
|
||||
"tslib": "^2.2.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"parse5": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
|
||||
"integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"@angular/cli": {
|
||||
"version": "12.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-12.0.4.tgz",
|
||||
|
|
@ -29219,9 +29307,9 @@
|
|||
}
|
||||
},
|
||||
"@fortawesome/fontawesome-common-types": {
|
||||
"version": "0.2.35",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz",
|
||||
"integrity": "sha512-IHUfxSEDS9dDGqYwIW7wTN6tn/O8E0n5PcAHz9cAaBoZw6UpG20IG/YM3NNLaGPwPqgjBAFjIURzqoQs3rrtuw=="
|
||||
"version": "0.2.36",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
|
||||
"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
|
||||
},
|
||||
"@fortawesome/fontawesome-svg-core": {
|
||||
"version": "1.2.35",
|
||||
|
|
@ -29231,6 +29319,14 @@
|
|||
"@fortawesome/fontawesome-common-types": "^0.2.35"
|
||||
}
|
||||
},
|
||||
"@fortawesome/free-brands-svg-icons": {
|
||||
"version": "5.15.4",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz",
|
||||
"integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==",
|
||||
"requires": {
|
||||
"@fortawesome/fontawesome-common-types": "^0.2.36"
|
||||
}
|
||||
},
|
||||
"@fortawesome/free-solid-svg-icons": {
|
||||
"version": "5.15.3",
|
||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz",
|
||||
|
|
@ -39361,6 +39457,11 @@
|
|||
"integrity": "sha512-K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w==",
|
||||
"dev": true
|
||||
},
|
||||
"jw-angular-social-buttons": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/jw-angular-social-buttons/-/jw-angular-social-buttons-1.0.0.tgz",
|
||||
"integrity": "sha512-E1xxsZBj0+DzJC7iPrwqq08UnfMbYuUHibMt5ijSqrR2LyBKmrZIlRM+8I+4e3m0bNNt1nwBbXcKlY6DsvOCOQ=="
|
||||
},
|
||||
"karma-source-map-support": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
|
||||
|
|
@ -40475,6 +40576,22 @@
|
|||
"opencollective-postinstall": "^2.0.2"
|
||||
}
|
||||
},
|
||||
"ngx-paypal": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ngx-paypal/-/ngx-paypal-8.0.0.tgz",
|
||||
"integrity": "sha512-cmXpEb8Gfwwk/Yn43w0OsURpRXiXghgZ5MbVKBYsPdkAqVacoQtYiWLcNmmU/DYGoPN5lRVqZb+Svg6qbbOvTw==",
|
||||
"requires": {
|
||||
"tslib": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"ngx-sharebuttons": {
|
||||
"version": "8.0.5",
|
||||
"resolved": "https://registry.npmjs.org/ngx-sharebuttons/-/ngx-sharebuttons-8.0.5.tgz",
|
||||
"integrity": "sha512-LAaZQk1i/yuYkX+SK72OkJBMNmGJ7SS/yoGEIyuUd7r9F9SwLpWfUAjccmtuM0qDzd48h+1CCnPGIB6WYlKY4g==",
|
||||
"requires": {
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"ngx-webstorage": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ngx-webstorage/-/ngx-webstorage-8.0.0.tgz",
|
||||
|
|
|
|||
14
package.json
14
package.json
|
|
@ -58,7 +58,8 @@
|
|||
"preci:e2e:server:start": "npm run docker:db:await --if-present && npm run docker:others:await --if-present",
|
||||
"ci:e2e:server:start": "java -jar target/e2e.$npm_package_config_packaging --spring.profiles.active=$npm_package_config_default_environment -Dlogging.level.ROOT=OFF -Dlogging.level.org.zalando=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.org.datasurvey=OFF -Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF --logging.level.org.springframework.web=ERROR",
|
||||
"ci:frontend:build": "npm run webapp:build:$npm_package_config_default_environment",
|
||||
"ci:frontend:test": "npm run ci:frontend:build && npm test"
|
||||
"ci:frontend:test": "npm run ci:frontend:build && npm test",
|
||||
"postinstall": "ngcc"
|
||||
},
|
||||
"config": {
|
||||
"backend_port": 8080,
|
||||
|
|
@ -66,6 +67,7 @@
|
|||
"packaging": "jar"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/cdk": "^12.1.4",
|
||||
"@angular/common": "12.0.5",
|
||||
"@angular/compiler": "12.0.5",
|
||||
"@angular/core": "12.0.5",
|
||||
|
|
@ -74,9 +76,10 @@
|
|||
"@angular/platform-browser": "12.0.5",
|
||||
"@angular/platform-browser-dynamic": "12.0.5",
|
||||
"@angular/router": "12.0.5",
|
||||
"@fortawesome/angular-fontawesome": "0.9.0",
|
||||
"@fortawesome/fontawesome-svg-core": "1.2.35",
|
||||
"@fortawesome/free-solid-svg-icons": "5.15.3",
|
||||
"@fortawesome/angular-fontawesome": "^0.9.0",
|
||||
"@fortawesome/fontawesome-svg-core": "^1.2.35",
|
||||
"@fortawesome/free-brands-svg-icons": "^5.15.3",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.15.3",
|
||||
"@ng-bootstrap/ng-bootstrap": "9.1.3",
|
||||
"@ngx-translate/core": "13.0.0",
|
||||
"@ngx-translate/http-loader": "6.0.0",
|
||||
|
|
@ -86,8 +89,11 @@
|
|||
"chartist": "^0.11.4",
|
||||
"dayjs": "1.10.5",
|
||||
"jquery": "^3.6.0",
|
||||
"jw-angular-social-buttons": "^1.0.0",
|
||||
"ng-chartist": "^5.0.0",
|
||||
"ngx-infinite-scroll": "10.0.1",
|
||||
"ngx-paypal": "^8.0.0",
|
||||
"ngx-sharebuttons": "^8.0.5",
|
||||
"ngx-webstorage": "8.0.0",
|
||||
"rxjs": "6.6.7",
|
||||
"sockjs-client": "1.5.0",
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -318,6 +318,12 @@
|
|||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-messaging</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.webjars</groupId>
|
||||
<artifactId>bootstrap</artifactId>
|
||||
<version>4.0.0-2</version>
|
||||
</dependency>
|
||||
<!-- jhipster-needle-maven-add-dependency -->
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import java.nio.charset.StandardCharsets;
|
|||
import java.util.Locale;
|
||||
import javax.mail.MessagingException;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
import org.datasurvey.domain.Factura;
|
||||
import org.datasurvey.domain.User;
|
||||
import org.datasurvey.domain.UsuarioEncuesta;
|
||||
import org.datasurvey.domain.UsuarioExtra;
|
||||
|
|
@ -33,6 +34,8 @@ public class MailService {
|
|||
|
||||
private static final String CONTRASENNA = "contrasenna";
|
||||
|
||||
private static final String FACTURA = "factura";
|
||||
|
||||
private static final String BASE_URL = "baseUrl";
|
||||
|
||||
private final JHipsterProperties jHipsterProperties;
|
||||
|
|
@ -128,6 +131,22 @@ public class MailService {
|
|||
sendEmail(user.getEmail(), subject, content, false, true);
|
||||
}
|
||||
|
||||
@Async
|
||||
public void sendEmailFromTemplateFactura(User user, Factura factura, String templateName, String titleKey) {
|
||||
if (user.getEmail() == null) {
|
||||
log.debug("Email doesn't exist for user '{}'", user.getLogin());
|
||||
return;
|
||||
}
|
||||
Locale locale = Locale.forLanguageTag(user.getLangKey());
|
||||
Context context = new Context(locale);
|
||||
context.setVariable(USER, user);
|
||||
context.setVariable(FACTURA, factura);
|
||||
context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
|
||||
String content = templateEngine.process(templateName, context);
|
||||
String subject = messageSource.getMessage(titleKey, null, locale);
|
||||
sendEmail(user.getEmail(), subject, content, false, true);
|
||||
}
|
||||
|
||||
@Async
|
||||
public void sendActivationEmail(User user) {
|
||||
log.debug("Sending activation email to '{}'", user.getEmail());
|
||||
|
|
@ -203,4 +222,10 @@ public class MailService {
|
|||
"email.deleteColaborator.title"
|
||||
);
|
||||
}
|
||||
|
||||
@Async
|
||||
public void sendReceiptUser(UsuarioExtra user, Factura factura) {
|
||||
log.debug("Sending paypal receipt mail to '{}'", user.getUser().getEmail());
|
||||
sendEmailFromTemplateFactura(user.getUser(), factura, "mail/facturaPayPalEmail", "email.receipt.title");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,12 @@ import java.util.Optional;
|
|||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import org.datasurvey.domain.Factura;
|
||||
import org.datasurvey.domain.UsuarioExtra;
|
||||
import org.datasurvey.repository.FacturaRepository;
|
||||
import org.datasurvey.service.FacturaQueryService;
|
||||
import org.datasurvey.service.FacturaService;
|
||||
import org.datasurvey.service.MailService;
|
||||
import org.datasurvey.service.UsuarioExtraService;
|
||||
import org.datasurvey.service.criteria.FacturaCriteria;
|
||||
import org.datasurvey.web.rest.errors.BadRequestAlertException;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -41,10 +44,22 @@ public class FacturaResource {
|
|||
|
||||
private final FacturaQueryService facturaQueryService;
|
||||
|
||||
public FacturaResource(FacturaService facturaService, FacturaRepository facturaRepository, FacturaQueryService facturaQueryService) {
|
||||
private final UsuarioExtraService userExtraService;
|
||||
|
||||
private final MailService mailService;
|
||||
|
||||
public FacturaResource(
|
||||
FacturaService facturaService,
|
||||
FacturaRepository facturaRepository,
|
||||
FacturaQueryService facturaQueryService,
|
||||
UsuarioExtraService userExtraService,
|
||||
MailService mailService
|
||||
) {
|
||||
this.facturaService = facturaService;
|
||||
this.facturaRepository = facturaRepository;
|
||||
this.facturaQueryService = facturaQueryService;
|
||||
this.userExtraService = userExtraService;
|
||||
this.mailService = mailService;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -60,11 +75,22 @@ public class FacturaResource {
|
|||
if (factura.getId() != null) {
|
||||
throw new BadRequestAlertException("A new factura cannot already have an ID", ENTITY_NAME, "idexists");
|
||||
}
|
||||
|
||||
Optional<UsuarioExtra> usuarioExtra = userExtraService.findOne(Long.parseLong(factura.getNombreUsuario()));
|
||||
|
||||
factura.setNombreUsuario(usuarioExtra.get().getNombre());
|
||||
|
||||
Factura result = facturaService.save(factura);
|
||||
|
||||
mailService.sendReceiptUser(usuarioExtra.get(), factura);
|
||||
|
||||
return ResponseEntity
|
||||
.created(new URI("/api/facturas/" + result.getId()))
|
||||
.headers(HeaderUtil.createEntityCreationAlert(applicationName, true, ENTITY_NAME, result.getId().toString()))
|
||||
.body(result);
|
||||
//retrieve yser
|
||||
|
||||
//Enviar el correo
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -64,3 +64,11 @@ email.deleteColaborator.title=Se le ha expulsado de una encuesta como colaborado
|
|||
email.deleteColaborator.greeting=¡Se le ha expulsado, {0}!
|
||||
email.deleteColaborator.text1=Fue expulsado de la encuesta {0}(#{1})"
|
||||
email.deleteColaborator.text2=Saludos,
|
||||
|
||||
|
||||
email.receipt.title=Comprobante de pago
|
||||
email.receipt.user={0}
|
||||
email.receipt.fecha={0}
|
||||
email.receipt.plantilla={0}
|
||||
email.receipt.precio=${0}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,262 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org" th:lang="${#locale.language}" lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<!-- Forcing initial-scale shouldn't be necessary -->
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<!-- Use the latest (edge) version of IE rendering engine -->
|
||||
<meta name="x-apple-disable-message-reformatting" />
|
||||
<!-- Disable auto-scale in iOS 10 Mail entirely -->
|
||||
<title th:text="#{email.receipt.title}">JHipster activation</title>
|
||||
<link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
|
||||
<link href="https://fonts.googleapis.com/css?family=NotoSansSP:300,400,700" rel="stylesheet" />
|
||||
<link rel="manifest" href="manifest.webapp" />
|
||||
<link
|
||||
href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css"
|
||||
rel="stylesheet"
|
||||
integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk"
|
||||
crossorigin="anonymous"
|
||||
/>
|
||||
|
||||
<style>
|
||||
body {
|
||||
margin-top: 20px;
|
||||
color: #484b51;
|
||||
}
|
||||
|
||||
.brc-default-l1 {
|
||||
border-color: #dce9f0 !important;
|
||||
}
|
||||
|
||||
.ml-n1,
|
||||
.mx-n1 {
|
||||
margin-left: -0.25rem !important;
|
||||
}
|
||||
.mr-n1,
|
||||
.mx-n1 {
|
||||
margin-right: -0.25rem !important;
|
||||
}
|
||||
.mb-4,
|
||||
.my-4 {
|
||||
margin-bottom: 1.5rem !important;
|
||||
}
|
||||
|
||||
hr {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border: 0;
|
||||
border-top: 1px solid rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.text-grey-m2 {
|
||||
color: #888a8d !important;
|
||||
}
|
||||
|
||||
.font-bolder,
|
||||
.text-600 {
|
||||
font-weight: 600 !important;
|
||||
}
|
||||
|
||||
.text-110 {
|
||||
font-size: 110% !important;
|
||||
}
|
||||
.text-blue {
|
||||
color: #478fcc !important;
|
||||
}
|
||||
.pb-25,
|
||||
.py-25 {
|
||||
padding-bottom: 0.75rem !important;
|
||||
}
|
||||
|
||||
.pt-25,
|
||||
.py-25 {
|
||||
padding-top: 0.75rem !important;
|
||||
}
|
||||
.bgc-default-tp1 {
|
||||
background-color: rgba(121, 169, 197, 0.92) !important;
|
||||
}
|
||||
|
||||
.page-header .page-tools {
|
||||
-ms-flex-item-align: end;
|
||||
align-self: flex-end;
|
||||
}
|
||||
|
||||
.text-blue-m2 {
|
||||
color: #68a3d5 !important;
|
||||
}
|
||||
.text-150 {
|
||||
font-size: 150% !important;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f1f1f1">
|
||||
<center style="width: 100%; background-color: #f1f1f1">
|
||||
<div
|
||||
style="
|
||||
display: none;
|
||||
font-size: 1px;
|
||||
max-height: 0px;
|
||||
max-width: 0px;
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
mso-hide: all;
|
||||
font-family: sans-serif;
|
||||
"
|
||||
>
|
||||
‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌
|
||||
</div>
|
||||
<div style="max-width: 600px; margin: 0 auto" class="email-container">
|
||||
<!-- BEGIN BODY -->
|
||||
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%" style="margin: auto">
|
||||
<tr>
|
||||
<td valign="top" class="bg_white" style="padding: 1em 2.5em 0 2.5em">
|
||||
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td class="logo" style="text-align: center">
|
||||
<h1>
|
||||
<a href="#"
|
||||
><img
|
||||
src="https://res.cloudinary.com/marielascloud/image/upload/v1626333881/DataSurveyLogo2_smr2ok.png"
|
||||
alt=""
|
||||
width="300"
|
||||
/></a>
|
||||
</h1>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- end tr -->
|
||||
|
||||
<!-- end tr -->
|
||||
|
||||
<div class="page-content container">
|
||||
<div class="container px-0">
|
||||
<div class="row mt-4">
|
||||
<div class="col-12 col-lg-10 offset-lg-1">
|
||||
<!-- .row -->
|
||||
|
||||
<hr class="row brc-default-l1 mx-n1 mb-4" />
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div>
|
||||
<span class="text-sm text-grey-m2 align-middle">Usuario:</span>
|
||||
<span
|
||||
class="text-600 text-110 text-blue align-middle"
|
||||
th:text="#{email.receipt.user(${factura.getNombreUsuario()})}"
|
||||
></span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
|
||||
<div class="text-95 col-sm-6 align-self-start d-sm-flex justify-content-end">
|
||||
<hr class="d-sm-none" />
|
||||
<div class="text-grey-m2">
|
||||
<div class="my-2">
|
||||
<i class="fa fa-circle text-blue-m2 text-xs mr-1"></i>
|
||||
<span class="text-600 text-90" th:text="#{email.receipt.fecha(${factura.getFecha()}, 'dd-MM-yyyy HH:mm' )}"
|
||||
>Fecha:</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
</div>
|
||||
|
||||
<div class="mt-4">
|
||||
<div class="row text-600 text-white bgc-default-tp1 py-25">
|
||||
<div class="col-9 col-sm-5">Plantilla</div>
|
||||
<div class="d-none d-sm-block col-4 col-sm-2">Cantidad</div>
|
||||
<div class="d-none d-sm-block col-sm-2">Precio</div>
|
||||
</div>
|
||||
|
||||
<div class="text-95 text-secondary-d3">
|
||||
<div class="row mb-2 mb-sm-0 py-25">
|
||||
<div class="col-9 col-sm-5" th:text="#{email.receipt.plantilla(${factura.getNombrePlantilla()})}"></div>
|
||||
<div class="d-none d-sm-block col-2">1</div>
|
||||
<div class="d-none d-sm-block col-2 text-95" th:text="#{email.receipt.precio(${factura.getCosto()})}"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mt-3">
|
||||
<div class="col-12 col-sm-5 text-grey text-90 order-first order-sm-last">
|
||||
<div class="row my-2 align-items-center bgc-primary-l3 p-2">
|
||||
<div class="col-7 text-right">Monto total</div>
|
||||
<div class="col-5">
|
||||
<span class="text-150 text-success-d3 opacity-2" th:text="#{email.receipt.precio(${factura.getCosto()})}"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- end tr -->
|
||||
<!-- 1 Column Text + Button : END -->
|
||||
</table>
|
||||
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%" style="margin: auto">
|
||||
<tr>
|
||||
<td valign="middle" class="bg_light footer email-section">
|
||||
<table>
|
||||
<tr>
|
||||
<td valign="top" width="33.333%" style="padding-top: 20px">
|
||||
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
|
||||
<tr>
|
||||
<td style="text-align: left; padding-right: 10px">
|
||||
<h3 class="heading">Acerca de</h3>
|
||||
<p>DataSurvey es su compañero más cercano para poder recolectar información valiosa para usted</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
<td valign="top" width="33.333%" style="padding-top: 20px">
|
||||
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
|
||||
<tr>
|
||||
<td style="text-align: left; padding-left: 5px; padding-right: 5px">
|
||||
<h3 class="heading">Información de contacto</h3>
|
||||
<ul>
|
||||
<li><span href="mailto:datasurveyapp@gmail.com" class="text">datasurveyapp@gmail.com</span></li>
|
||||
</ul>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- end: tr -->
|
||||
<tr>
|
||||
<td class="bg_light" style="text-align: center">
|
||||
<p><a href="https://datasurvey.org" style="color: rgba(0, 0, 0, 0.8)">DataSurvey.org</a></p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<script
|
||||
src="https://code.jquery.com/jquery-3.5.1.min.js"
|
||||
integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
|
||||
<script
|
||||
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.4.1/cjs/popper.min.js"
|
||||
integrity="sha256-T3bYsIPyOLpEfeZOX4M7J59ZoDMzuYFUsPiSN3Xcc2M="
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
|
||||
<script
|
||||
src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"
|
||||
integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI"
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -91,7 +91,7 @@ export class RegisterComponent implements AfterViewInit {
|
|||
login,
|
||||
email,
|
||||
password,
|
||||
langKey: this.translateService.currentLang,
|
||||
langKey: this.translateService.currentLang!,
|
||||
name,
|
||||
firstName,
|
||||
profileIcon: this.profileIcon,
|
||||
|
|
|
|||
|
|
@ -34,6 +34,11 @@ import { ErrorComponent } from './layouts/error/error.component';
|
|||
import { SidebarComponent } from './layouts/sidebar/sidebar.component';
|
||||
import { PaginaPrincipalComponent } from './pagina-principal/pagina-principal.component';
|
||||
import { ChartistModule } from 'ng-chartist';
|
||||
import { ListarPlantillaTiendaModule } from './entities/tienda/listar-tienda-plantilla/listar-plantilla-tienda.module';
|
||||
import { PaypalDialogComponent } from './entities/tienda/paypal-dialog/paypal-dialog.component';
|
||||
import { NgxPayPalModule } from 'ngx-paypal';
|
||||
import { ShareButtonsModule } from 'ngx-sharebuttons/buttons';
|
||||
import { ShareIconsModule } from 'ngx-sharebuttons/icons';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -42,6 +47,7 @@ import { ChartistModule } from 'ng-chartist';
|
|||
SharedModule,
|
||||
HomeModule,
|
||||
PaginaPrincipalModule,
|
||||
ListarPlantillaTiendaModule,
|
||||
// jhipster-needle-angular-add-module JHipster will add new module here
|
||||
EntityRoutingModule,
|
||||
AppRoutingModule,
|
||||
|
|
@ -62,6 +68,9 @@ import { ChartistModule } from 'ng-chartist';
|
|||
},
|
||||
}),
|
||||
ChartistModule, // add ChartistModule to your imports
|
||||
ShareButtonsModule,
|
||||
ShareIconsModule,
|
||||
NgxPayPalModule,
|
||||
],
|
||||
providers: [
|
||||
Title,
|
||||
|
|
@ -81,7 +90,15 @@ import { ChartistModule } from 'ng-chartist';
|
|||
} as SocialAuthServiceConfig,
|
||||
},
|
||||
],
|
||||
declarations: [MainComponent, NavbarComponent, ErrorComponent, PageRibbonComponent, FooterComponent, SidebarComponent],
|
||||
declarations: [
|
||||
MainComponent,
|
||||
NavbarComponent,
|
||||
ErrorComponent,
|
||||
PageRibbonComponent,
|
||||
FooterComponent,
|
||||
SidebarComponent,
|
||||
PaypalDialogComponent,
|
||||
],
|
||||
bootstrap: [MainComponent],
|
||||
})
|
||||
export class AppModule {
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button class="ds-btn ds-btn--primary" (click)="finish()">Terminar</button>
|
||||
<button class="ds-btn ds-btn--primary" (click)="finish()">Finalizar</button>
|
||||
</div>
|
||||
<div
|
||||
class="modal fade ds-modal"
|
||||
|
|
|
|||
|
|
@ -1 +1,39 @@
|
|||
<p>encuesta-compartir-dialog works!</p>
|
||||
<form class="ds-form" name="deleteForm">
|
||||
<div class="modal-header">
|
||||
<h2 class="ds-title" data-cy="encuestaDeleteDialogHeading">Compartir encuesta</h2>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<p class="ds-subtitle" id="jhi-delete-encuesta-heading">Puede copiar el enlace o compartirlo en redes sociales</p>
|
||||
|
||||
<hr />
|
||||
<input class="compartir" readonly type="url" id="inputCompartir" [value]="baseURL" /> <br /><br />
|
||||
<share-buttons
|
||||
[theme]="'material-dark'"
|
||||
[include]="['facebook', 'twitter', 'email']"
|
||||
[show]="5"
|
||||
[showText]="true"
|
||||
[size]="1"
|
||||
[url]="baseURL"
|
||||
[title]="'Encuesta DataSurvey'"
|
||||
[image]="'../../../content/img_datasurvey/datasurvey-logo-text-white-PNG.png'"
|
||||
[autoSetMeta]="false"
|
||||
></share-buttons>
|
||||
|
||||
<!-- <share-buttons [theme]="'modern-dark'"
|
||||
[include]="['facebook','twitter']"
|
||||
[show]="5"
|
||||
[showText]="true"
|
||||
[size]="2"
|
||||
[url]="baseURL"
|
||||
[title]="'Encuesta DataSurvey'"
|
||||
[autoSetMeta]="false"
|
||||
></share-buttons>-->
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
|
||||
<fa-icon icon="arrow-left"></fa-icon> <span jhiTranslate="entity.action.cancel">Cancel</span>
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap');
|
||||
|
||||
@import '~ngx-sharebuttons/themes/default/default-theme';
|
||||
|
||||
.compartir {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { EncuestaCompartirDialogComponent } from './encuesta-compartir-dialog.component';
|
||||
|
||||
describe('EncuestaCompartirDialogComponent', () => {
|
||||
let component: EncuestaCompartirDialogComponent;
|
||||
let fixture: ComponentFixture<EncuestaCompartirDialogComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
declarations: [EncuestaCompartirDialogComponent],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(EncuestaCompartirDialogComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { IEncuesta } from '../encuesta.model';
|
||||
|
||||
@Component({
|
||||
selector: 'jhi-encuesta-compartir-dialog',
|
||||
|
|
@ -6,7 +8,21 @@ import { Component, OnInit } from '@angular/core';
|
|||
styleUrls: ['./encuesta-compartir-dialog.component.scss'],
|
||||
})
|
||||
export class EncuestaCompartirDialogComponent implements OnInit {
|
||||
constructor() {}
|
||||
encuesta?: IEncuesta;
|
||||
baseURL: string = '';
|
||||
imagen: string = '';
|
||||
mensaje: string = 'Encuesta en DatasSurvey';
|
||||
name = 'ngx sharebuttons';
|
||||
|
||||
ngOnInit(): void {}
|
||||
constructor(protected activeModal: NgbActiveModal) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.baseURL = location.origin + '/' + this.encuesta?.id + '/complete';
|
||||
}
|
||||
|
||||
compartir(): void {}
|
||||
|
||||
cancel(): void {
|
||||
this.activeModal.dismiss();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<form *ngIf="encuesta" name="deleteForm" (ngSubmit)="confirmPublish(encuesta!)">
|
||||
<div class="modal-header">
|
||||
<!-- <h4 class="modal-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.publish.title">Confirm delete operation</h4>-->
|
||||
<h4 class="modal-title" data-cy="encuestaDeleteDialogHeading">Publique su encuesta</h4>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
|
|
@ -48,13 +48,7 @@
|
|||
<fa-icon icon="arrow-left"></fa-icon> <span jhiTranslate="entity.action.cancel">Cancel</span>
|
||||
</button>
|
||||
|
||||
<button
|
||||
[disabled]="fechaForm.invalid"
|
||||
id="jhi-confirm-delete-encuesta"
|
||||
data-cy="entityConfirmDeleteButton"
|
||||
type="submit"
|
||||
class="ds-btn ds-btn--primary"
|
||||
>
|
||||
<button id="jhi-confirm-delete-encuesta" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--primary">
|
||||
<span jhiTranslate="entity.action.publish">Delete</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,13 +10,14 @@ import { EncuestaPublishDialogComponent } from './encuesta-publish-dialog/encues
|
|||
import { EncuestaDeleteQuestionDialogComponent } from './encuesta-delete-question-dialog/encuesta-delete-question-dialog.component';
|
||||
import { EncuestaDeleteOptionDialogComponent } from './encuesta-delete-option-dialog/encuesta-delete-option-dialog.component';
|
||||
import { EncuestaCompartirDialogComponent } from './encuesta-compartir-dialog/encuesta-compartir-dialog.component';
|
||||
import { ShareButtonsModule } from 'ngx-sharebuttons/buttons';
|
||||
import { EncuestaCompleteComponent } from './complete/complete.component';
|
||||
import { EncuestaPasswordDialogComponent } from './encuesta-password-dialog/encuesta-password-dialog.component';
|
||||
import { EncuestaFinalizarDialogComponent } from './encuesta-finalizar-dialog/encuesta-finalizar-dialog.component';
|
||||
import { EncuestaDeleteColaboratorDialogComponent } from './encuesta-delete-colaborator-dialog/encuesta-delete-colaborator-dialog.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [SharedModule, EncuestaRoutingModule, FontAwesomeModule],
|
||||
imports: [SharedModule, EncuestaRoutingModule, FontAwesomeModule, ShareButtonsModule],
|
||||
declarations: [
|
||||
EncuestaComponent,
|
||||
EncuestaDetailComponent,
|
||||
|
|
|
|||
|
|
@ -120,9 +120,11 @@
|
|||
<fa-icon class="contextmenu__icon" [icon]="faUpload"></fa-icon>Publicar
|
||||
</button>
|
||||
</li>
|
||||
<!-- <li>
|
||||
<button type="button" id="contextmenu-share"><fa-icon class="contextmenu__icon" [icon]="faShareAlt"></fa-icon>Compartir</button>
|
||||
</li> -->
|
||||
<li>
|
||||
<button type="button" id="contextmenu-share" (click)="compartir()">
|
||||
<fa-icon class="contextmenu__icon" [icon]="faShareAlt"></fa-icon>Compartir
|
||||
</button>
|
||||
</li>
|
||||
</div>
|
||||
<div class="ds-contextmenu__divider" id="contextmenu-delete--separator">
|
||||
<li>
|
||||
|
|
@ -175,9 +177,11 @@
|
|||
style="animation-delay: 3s"
|
||||
></div>
|
||||
</div>
|
||||
<div class="entity-share">
|
||||
<span><fa-icon [icon]="faShareAlt"></fa-icon></span>
|
||||
</div>
|
||||
<!-- <div class="entity-share" *ngIf="encuesta.estado == 'ACTIVE'">
|
||||
<button type="button" id="contextmenu-share" (click)="compartir()">
|
||||
<fa-icon class="contextmenu__icon" [icon]="faShareAlt"></fa-icon>
|
||||
</button>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<div class="entity-body">
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import {
|
|||
} from '@fortawesome/free-solid-svg-icons';
|
||||
|
||||
import * as $ from 'jquery';
|
||||
import { EncuestaCompartirDialogComponent } from '../encuesta-compartir-dialog/encuesta-compartir-dialog.component';
|
||||
|
||||
@Component({
|
||||
selector: 'jhi-encuesta',
|
||||
|
|
@ -491,12 +492,18 @@ export class EncuestaComponent implements OnInit, AfterViewInit {
|
|||
document.getElementById('contextmenu-edit')!.style.display = 'block';
|
||||
document.getElementById('contextmenu-publish')!.style.display = 'block';
|
||||
document.getElementById('contextmenu-duplicate')!.style.display = 'block';
|
||||
document.getElementById('contextmenu-share')!.style.display = 'none';
|
||||
} else {
|
||||
document.getElementById('contextmenu-edit')!.style.display = 'none';
|
||||
document.getElementById('contextmenu-publish')!.style.display = 'none';
|
||||
document.getElementById('contextmenu-duplicate')!.style.display = 'none';
|
||||
document.getElementById('contextmenu-share')!.style.display = 'block';
|
||||
}
|
||||
// document.getElementById('contextmenu-share')!.style.display = 'block';
|
||||
|
||||
if (this.selectedSurvey!.estado === 'FINISHED') {
|
||||
document.getElementById('contextmenu-share')!.style.display = 'none';
|
||||
}
|
||||
|
||||
document.getElementById('contextmenu-create--separator')!.style.display = 'none';
|
||||
}
|
||||
|
||||
|
|
@ -548,4 +555,16 @@ export class EncuestaComponent implements OnInit, AfterViewInit {
|
|||
categoria: this.selectedSurvey!.categoria,
|
||||
});
|
||||
}
|
||||
|
||||
compartir(): void {
|
||||
const modalRef = this.modalService.open(EncuestaCompartirDialogComponent, { size: 'lg', backdrop: 'static' });
|
||||
modalRef.componentInstance.encuesta = this.selectedSurvey;
|
||||
// unsubscribe not needed because closed completes on modal close
|
||||
modalRef.closed.subscribe(reason => {
|
||||
if (reason === 'published') {
|
||||
this.successPublished = true;
|
||||
this.loadAll();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ export class FacturaService {
|
|||
constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}
|
||||
|
||||
create(factura: IFactura): Observable<EntityResponseType> {
|
||||
debugger;
|
||||
const copy = this.convertDateFromClient(factura);
|
||||
return this.http
|
||||
.post<IFactura>(this.resourceUrl, copy, { observe: 'response' })
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { SharedModule } from 'app/shared/shared.module';
|
||||
import { TIENDA_PLANTILLA_ROUTE } from './listar-tienda-plantilla.route';
|
||||
import { ListarTiendaPlantillaComponent } from './listar-tienda-plantilla.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [SharedModule, RouterModule.forChild([TIENDA_PLANTILLA_ROUTE])],
|
||||
declarations: [ListarTiendaPlantillaComponent],
|
||||
})
|
||||
export class ListarPlantillaTiendaModule {}
|
||||
|
|
@ -0,0 +1,115 @@
|
|||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="page-header-ui page-header-ui-dark bg-img-cover overlay">
|
||||
<div class="container px-0 text-black">
|
||||
<h1 class="page-header-ui-title">¡Compre y utilice las plantillas!</h1>
|
||||
|
||||
<h2>Puede comprar sus plantillas mediante <b> PayPal </b> <fa-icon [icon]="faCreditCard"></fa-icon></h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bg-light py-10 container-encuestas">
|
||||
<div class="container px-0">
|
||||
<!--filtrado-->
|
||||
|
||||
<div class="input-group">
|
||||
<div class="ds-filter">
|
||||
<div class="input-group-addon"><i class="glyphicon glyphicon-search"></i></div>
|
||||
<input class="form-control" type="text" name="searchString" placeholder="Buscar por nombre..." [(ngModel)]="searchString" />
|
||||
</div>
|
||||
<!--<div class="ds-filter">
|
||||
<select name="searchCategoria" class="form-control" [(ngModel)]="searchCategoria" style="width: 200px">
|
||||
<option value="" selected="selected" disabled="disabled">Filtrar por categoría</option>
|
||||
<option value="">Todas las categorías</option>
|
||||
<option *ngFor="let categoria of categorias" [value]="categoria.nombre">{{ categoria.nombre }}</option>
|
||||
</select>
|
||||
</div>-->
|
||||
|
||||
<!--<div class="ds-filter">
|
||||
|
||||
<div class="form-check pl-0 mb-3">
|
||||
<input type="radio" class="form-check-input" id="under25" name="materialExampleRadios" [value]="0">
|
||||
<label for="under25" [(ngModel)]="searchPrecio">GRATIS</label>
|
||||
</div>
|
||||
<div class="form-check pl-0 mb-3">
|
||||
<input type="radio" class="form-check-input" id="2550" name="materialExampleRadios" [value]="">
|
||||
<label for="2550" [(ngModel)]="searchPrecio"> $5 - $10</label>
|
||||
</div>
|
||||
<div class="form-check pl-0 mb-3">
|
||||
<input type="radio" class="form-check-input" id="50100" name="materialExampleRadios">
|
||||
<label for="50100" [(ngModel)]="searchPrecio">$10 - $20</label>
|
||||
</div>
|
||||
<div class="form-check pl-0 mb-3">
|
||||
<input type="radio" class="form-check-input" id="100200" name="materialExampleRadios">
|
||||
<label for="100200" [(ngModel)]="searchPrecio">$20 - $30</label>
|
||||
</div>
|
||||
<div class="form-check pl-0 mb-3">
|
||||
<input type="radio" class="form-check-input" id="200above" name="materialExampleRadios">
|
||||
<label [(ngModel)]="searchPrecio">Más de $30 </label>
|
||||
</div>
|
||||
</div>-->
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
<div class="container" *ngIf="plantillas && plantillas.length == 0">
|
||||
<h1 class="ds-title">Plantillas</h1>
|
||||
|
||||
<hr />
|
||||
<div class="social-box">
|
||||
<h1>
|
||||
<fa-icon [icon]="faFileAlt"></fa-icon>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--Inicio de los cards-->
|
||||
|
||||
<div class="row gx-5" *ngIf="plantillas && plantillas.length > 0">
|
||||
<div
|
||||
class="col-xl-4 col-lg-4 col-md-6 mb-5"
|
||||
*ngFor="
|
||||
let plantilla of plantillas
|
||||
| filter: 'nombre':searchString
|
||||
| filter: 'categoria.nombre':searchCategoria
|
||||
| filter: 'precio':searchPrecio;
|
||||
trackBy: trackId
|
||||
"
|
||||
>
|
||||
<div class="card-encuesta lift h-100" [attr.data-id]="plantilla.id">
|
||||
<!--(dblclick)="openSurvey($event)"
|
||||
(click)="selectSurvey($event)"
|
||||
|
||||
-->
|
||||
<div class="card-body p-3">
|
||||
<div class="card-title mb-0">{{ plantilla.nombre }}</div>
|
||||
<div class="entity-body--row m-2">
|
||||
<span class="tag mt-2" *ngIf="plantilla.precio">Precio: {{ plantilla.precio | currency }}</span>
|
||||
<span class="tag mt-2" *ngIf="plantilla.precio == 0 || plantilla.precio == null">Precio: GRATIS</span>
|
||||
</div>
|
||||
|
||||
<div class="entity-body--row m-2" *ngIf="plantilla.categoria != null">
|
||||
<span class="mt-2">{{ plantilla.categoria.nombre | lowercase }}</span>
|
||||
</div>
|
||||
<div class="entity-body--row m-2" *ngIf="plantilla.descripcion != null">
|
||||
<span class="mt-2">{{ plantilla.descripcion | lowercase }}</span>
|
||||
</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
<div class="entity-body">
|
||||
<div class="entity-body--row m-2">
|
||||
<button class="ds-btn btn-outline-success btn-card" (click)="triggerPaypalDialog(plantilla)">
|
||||
<fa-icon [icon]="faCreditCard"></fa-icon> Comprar con PayPal
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--Inicio de cards-->
|
||||
</div>
|
||||
|
|
@ -0,0 +1,449 @@
|
|||
/* ==========================================================================
|
||||
Main page styles
|
||||
========================================================================== */
|
||||
|
||||
.hipster {
|
||||
display: inline-block;
|
||||
width: 347px;
|
||||
height: 497px;
|
||||
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.bg-img-cover {
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-color: #192e4d;
|
||||
}
|
||||
/*SPLIT CSS*/
|
||||
.split {
|
||||
height: 90%;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
z-index: 1;
|
||||
top: 0;
|
||||
overflow-x: hidden;
|
||||
padding-top: 20px;
|
||||
}
|
||||
.left {
|
||||
left: 0;
|
||||
background-color: #192e4d;
|
||||
}
|
||||
|
||||
.right {
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.centered {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.bg-img-style {
|
||||
padding-top: 2px;
|
||||
margin-left: 50%;
|
||||
margin-top: 0;
|
||||
width: 400px;
|
||||
height: 300px;
|
||||
}
|
||||
|
||||
.overlay {
|
||||
position: relative;
|
||||
}
|
||||
.overlay:before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #000;
|
||||
opacity: 0.1;
|
||||
}
|
||||
|
||||
.overlay-10:before {
|
||||
opacity: 0.1;
|
||||
}
|
||||
|
||||
.overlay-20:before {
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
.overlay-30:before {
|
||||
opacity: 0.3;
|
||||
}
|
||||
|
||||
.overlay-40:before {
|
||||
opacity: 0.4;
|
||||
}
|
||||
|
||||
.overlay-50:before {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.overlay-60:before {
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.overlay-70:before {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.overlay-80:before {
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.overlay-90:before {
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.fixed-top,
|
||||
.page-header-ui.navbar-fixed .navbar {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
z-index: 1030;
|
||||
}
|
||||
|
||||
.text-white-75,
|
||||
.page-header-ui-dark .page-header-ui-text a {
|
||||
color: rgba(255, 255, 255, 0.75) !important;
|
||||
}
|
||||
.page-header-ui {
|
||||
position: relative;
|
||||
padding-top: 4%;
|
||||
padding-bottom: 4%;
|
||||
}
|
||||
.page-header-ui .page-header-ui-content .page-header-ui-title {
|
||||
font-size: 2.5rem;
|
||||
color: #000000;
|
||||
}
|
||||
.page-header-ui .page-header-ui-content .page-header-ui-text {
|
||||
font-size: 1.15rem;
|
||||
}
|
||||
.page-header-ui .page-header-ui-content .page-header-ui-text.small {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.page-header-ui-dark {
|
||||
color: #fffcf5 !important;
|
||||
background-color: #212832;
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
.svg-border-rounded svg {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: 1rem;
|
||||
width: 100%;
|
||||
}
|
||||
@media (min-width: 576px) {
|
||||
.svg-border-rounded svg {
|
||||
height: 1.5rem;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.svg-border-rounded svg {
|
||||
height: 2rem;
|
||||
}
|
||||
}
|
||||
@media (min-width: 992px) {
|
||||
.svg-border-rounded svg {
|
||||
height: 2.5rem;
|
||||
}
|
||||
}
|
||||
@media (min-width: 1200px) {
|
||||
.svg-border-rounded svg {
|
||||
height: 3rem;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Cards
|
||||
**/
|
||||
.lift {
|
||||
box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15);
|
||||
transition: transform 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
|
||||
}
|
||||
.lift:hover {
|
||||
transform: translateY(-0.3333333333rem);
|
||||
box-shadow: 0 0.5rem 2rem 0 rgba(33, 40, 50, 0.25);
|
||||
}
|
||||
.lift:active {
|
||||
transform: none;
|
||||
box-shadow: 0 0.15rem 1.75rem 0 rgba(33, 40, 50, 0.15);
|
||||
}
|
||||
|
||||
.lift-sm {
|
||||
box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2);
|
||||
}
|
||||
.lift-sm:hover {
|
||||
transform: translateY(-0.1666666667rem);
|
||||
box-shadow: 0 0.25rem 1rem 0 rgba(33, 40, 50, 0.25);
|
||||
}
|
||||
.lift-sm:active {
|
||||
transform: none;
|
||||
box-shadow: 0 0.125rem 0.25rem 0 rgba(33, 40, 50, 0.2);
|
||||
}
|
||||
|
||||
/*.card.lift {
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.card-flag {
|
||||
position: absolute;
|
||||
font-size: 0.7rem;
|
||||
padding: 0.3rem 0.5rem;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.card-flag-dark {
|
||||
background-color: rgba(33, 40, 50, 0.7);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.card-flag-light {
|
||||
background-color: rgba(255, 255, 255, 0.7);
|
||||
color: #69707a;
|
||||
}
|
||||
|
||||
.card-flag-lg {
|
||||
font-size: 0.9rem;
|
||||
padding: 0.5rem 0.65rem;
|
||||
}
|
||||
|
||||
.card-flag-top-right {
|
||||
border-top-left-radius: 0.25rem;
|
||||
border-bottom-left-radius: 0.25rem;
|
||||
top: 0.5rem;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.card-flag-top-left {
|
||||
border-top-right-radius: 0.25rem;
|
||||
border-bottom-right-radius: 0.25rem;
|
||||
top: 0.5rem;
|
||||
left: 0;
|
||||
}*/
|
||||
|
||||
.border-cyan {
|
||||
border-color: #00cfd5 !important;
|
||||
}
|
||||
|
||||
.py-10 {
|
||||
padding-top: 6rem !important;
|
||||
padding-bottom: 6rem !important;
|
||||
}
|
||||
|
||||
/* wait autoprefixer update to allow simple generation of high pixel density media query */
|
||||
@media only screen and (-webkit-min-device-pixel-ratio: 2),
|
||||
only screen and (-moz-min-device-pixel-ratio: 2),
|
||||
only screen and (-o-min-device-pixel-ratio: 2/1),
|
||||
only screen and (min-resolution: 192dpi),
|
||||
only screen and (min-resolution: 2dppx) {
|
||||
.hipster {
|
||||
background-size: contain;
|
||||
}
|
||||
}
|
||||
|
||||
.icon-stack {
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 100%;
|
||||
height: 2.5rem;
|
||||
width: 2.5rem;
|
||||
font-size: 1rem;
|
||||
background-color: #f2f6fc;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.icon-stack svg {
|
||||
height: 1rem;
|
||||
width: 1rem;
|
||||
}
|
||||
|
||||
.icon-stack-sm {
|
||||
height: 2rem;
|
||||
width: 2rem;
|
||||
}
|
||||
|
||||
.icon-stack-lg {
|
||||
height: 4rem;
|
||||
width: 4rem;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
.icon-stack-lg svg {
|
||||
height: 1.5rem;
|
||||
width: 1.5rem;
|
||||
}
|
||||
|
||||
.icon-stack-xl {
|
||||
height: 5rem;
|
||||
width: 5rem;
|
||||
font-size: 1.75rem;
|
||||
}
|
||||
.icon-stack-xl svg {
|
||||
height: 1.75rem;
|
||||
width: 1.75rem;
|
||||
}
|
||||
|
||||
.container-encuestas {
|
||||
max-height: 1536px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.bg-gradient-primary-to-secondary {
|
||||
background-color: #1c44b2 !important;
|
||||
background-image: linear-gradient(135deg, #1c44b2 0%, #00b88d 100%) !important;
|
||||
}
|
||||
|
||||
/*.card .entity-icon--star {
|
||||
color: #ffcc47;
|
||||
margin-right: 0.2rem;
|
||||
}
|
||||
|
||||
.card .card-title {
|
||||
font-size: 2em;
|
||||
}
|
||||
|
||||
.card .tag {
|
||||
font-size: 0.8rem;
|
||||
color: #f8f8f8;
|
||||
margin-top: 0.5rem;
|
||||
padding: 0.2rem 1.5rem;
|
||||
background-color: #2962ff94;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
.card .subtitle {
|
||||
color: rgba(0, 0, 0, 0.54);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.card .btn-card {
|
||||
padding: 11px 10px !important;
|
||||
}*/
|
||||
|
||||
.accordion-button {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
padding: 1rem 1.25rem;
|
||||
font-size: 1rem;
|
||||
color: #69707a;
|
||||
text-align: left;
|
||||
background-color: #fff;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
overflow-anchor: none;
|
||||
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out,
|
||||
border-radius 0.15s ease;
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.accordion-button {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
.accordion-button:not(.collapsed) {
|
||||
color: #0057da;
|
||||
background-color: #e6effe;
|
||||
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.125);
|
||||
}
|
||||
.accordion-button:not(.collapsed)::after {
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230057da'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
|
||||
transform: rotate(-180deg);
|
||||
}
|
||||
.accordion-button::after {
|
||||
flex-shrink: 0;
|
||||
width: 1.25rem;
|
||||
height: 1.25rem;
|
||||
margin-left: auto;
|
||||
content: '';
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%2369707a'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
|
||||
background-repeat: no-repeat;
|
||||
background-size: 1.25rem;
|
||||
transition: transform 0.2s ease-in-out;
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.accordion-button::after {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
.accordion-button:hover {
|
||||
z-index: 2;
|
||||
}
|
||||
.accordion-button:focus {
|
||||
z-index: 3;
|
||||
border-color: transparent;
|
||||
outline: 0;
|
||||
box-shadow: 0 0 0 0.25rem #00b88d3a;
|
||||
}
|
||||
|
||||
.accordion-header {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.accordion-item {
|
||||
background-color: #fff;
|
||||
border: 1px solid rgba(0, 0, 0, 0.125);
|
||||
}
|
||||
.accordion-item:first-of-type {
|
||||
border-top-left-radius: 0.35rem;
|
||||
border-top-right-radius: 0.35rem;
|
||||
}
|
||||
.accordion-item:first-of-type .accordion-button {
|
||||
border-top-left-radius: calc(0.35rem - 1px);
|
||||
border-top-right-radius: calc(0.35rem - 1px);
|
||||
}
|
||||
.accordion-item:not(:first-of-type) {
|
||||
border-top: 0;
|
||||
}
|
||||
.accordion-item:last-of-type {
|
||||
border-bottom-right-radius: 0.35rem;
|
||||
border-bottom-left-radius: 0.35rem;
|
||||
}
|
||||
.accordion-item:last-of-type .accordion-button.collapsed {
|
||||
border-bottom-right-radius: calc(0.35rem - 1px);
|
||||
border-bottom-left-radius: calc(0.35rem - 1px);
|
||||
}
|
||||
.accordion-item:last-of-type .accordion-collapse {
|
||||
border-bottom-right-radius: 0.35rem;
|
||||
border-bottom-left-radius: 0.35rem;
|
||||
}
|
||||
|
||||
.accordion-body {
|
||||
padding: 1rem 1.25rem;
|
||||
}
|
||||
|
||||
.accordion-flush .accordion-collapse {
|
||||
border-width: 0;
|
||||
}
|
||||
.accordion-flush .accordion-item {
|
||||
border-right: 0;
|
||||
border-left: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.accordion-flush .accordion-item:first-child {
|
||||
border-top: 0;
|
||||
}
|
||||
.accordion-flush .accordion-item:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.accordion-flush .accordion-item .accordion-button {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.card-header {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.card-header .collapsed {
|
||||
background-color: #e6effe;
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { ListarTiendaPlantillaComponent } from './listar-tienda-plantilla.component';
|
||||
|
||||
describe('ListarTiendaPlantillaComponent', () => {
|
||||
let component: ListarTiendaPlantillaComponent;
|
||||
let fixture: ComponentFixture<ListarTiendaPlantillaComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
declarations: [ListarTiendaPlantillaComponent],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(ListarTiendaPlantillaComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { ICategoria } from '../../categoria/categoria.model';
|
||||
import { Account } from '../../../core/auth/account.model';
|
||||
import { UsuarioExtra } from '../../usuario-extra/usuario-extra.model';
|
||||
import { IEncuesta } from '../../encuesta/encuesta.model';
|
||||
import { Subject } from 'rxjs';
|
||||
import { EncuestaService } from '../../encuesta/service/encuesta.service';
|
||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { CategoriaService } from '../../categoria/service/categoria.service';
|
||||
import { UsuarioExtraService } from '../../usuario-extra/service/usuario-extra.service';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { FormBuilder } from '@angular/forms';
|
||||
import { AccountService } from '../../../core/auth/account.service';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { HttpResponse } from '@angular/common/http';
|
||||
import { faPollH, faCalendarAlt, faStar, faListAlt, faFileAlt, faCreditCard } from '@fortawesome/free-solid-svg-icons';
|
||||
import { IPlantilla } from '../../plantilla/plantilla.model';
|
||||
import { PlantillaService } from '../../plantilla/service/plantilla.service';
|
||||
import { EncuestaPublishDialogComponent } from '../../encuesta/encuesta-publish-dialog/encuesta-publish-dialog.component';
|
||||
import { PaypalDialogComponent } from '../paypal-dialog/paypal-dialog.component';
|
||||
|
||||
@Component({
|
||||
selector: 'jhi-listar-tienda-plantilla',
|
||||
templateUrl: './listar-tienda-plantilla.component.html',
|
||||
styleUrls: ['./listar-tienda-plantilla.component.scss'],
|
||||
})
|
||||
export class ListarTiendaPlantillaComponent implements OnInit {
|
||||
public searchString: string;
|
||||
public searchCategoria: string;
|
||||
public searchPrecio: string;
|
||||
categorias?: ICategoria[];
|
||||
account: Account | null = null;
|
||||
public searchEncuestaPublica: string;
|
||||
notAccount: boolean = true;
|
||||
usuarioExtra: UsuarioExtra | null = null;
|
||||
plantillas?: IPlantilla[];
|
||||
successPayment = false;
|
||||
|
||||
isLoading = false;
|
||||
private readonly destroy$ = new Subject<void>();
|
||||
|
||||
faStar = faStar;
|
||||
faCalendarAlt = faCalendarAlt;
|
||||
faPollH = faPollH;
|
||||
faListAlt = faListAlt;
|
||||
faFileAlt = faFileAlt;
|
||||
faCreditCard = faCreditCard;
|
||||
|
||||
constructor(
|
||||
protected plantillaService: PlantillaService,
|
||||
protected modalService: NgbModal,
|
||||
protected categoriaService: CategoriaService,
|
||||
protected usuarioExtraService: UsuarioExtraService,
|
||||
protected activatedRoute: ActivatedRoute,
|
||||
protected fb: FormBuilder,
|
||||
protected accountService: AccountService,
|
||||
protected router: Router
|
||||
) {
|
||||
this.searchEncuestaPublica = '';
|
||||
this.searchString = '';
|
||||
this.searchCategoria = '';
|
||||
this.searchPrecio = '';
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.searchEncuestaPublica = '';
|
||||
this.accountService
|
||||
.getAuthenticationState()
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe(account => {
|
||||
if (account !== null) {
|
||||
this.account = account;
|
||||
this.notAccount = false;
|
||||
} else {
|
||||
this.notAccount = true;
|
||||
}
|
||||
});
|
||||
this.loadAll();
|
||||
this.loadAllCategorias();
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.destroy$.next();
|
||||
this.destroy$.complete();
|
||||
}
|
||||
|
||||
loadAll(): void {
|
||||
this.isLoading = true;
|
||||
|
||||
this.plantillaService.query().subscribe(
|
||||
(res: HttpResponse<IPlantilla[]>) => {
|
||||
this.isLoading = false;
|
||||
const plantillasBody = res.body ?? [];
|
||||
this.plantillas = plantillasBody.filter(e => e.estado === 'ACTIVE');
|
||||
},
|
||||
() => {
|
||||
this.isLoading = false;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
loadAllCategorias(): void {
|
||||
this.isLoading = true;
|
||||
|
||||
this.categoriaService.query().subscribe(
|
||||
(res: HttpResponse<ICategoria[]>) => {
|
||||
this.isLoading = false;
|
||||
this.categorias = res.body ?? [];
|
||||
},
|
||||
() => {
|
||||
this.isLoading = false;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
trackId(index: number, item: IEncuesta): number {
|
||||
return item.id!;
|
||||
}
|
||||
|
||||
triggerPaypalDialog(plantilla: IPlantilla): void {
|
||||
const modalRef = this.modalService.open(PaypalDialogComponent, { size: 'lg', backdrop: 'static' });
|
||||
modalRef.componentInstance.plantilla = plantilla;
|
||||
// unsubscribe not needed because closed completes on modal close
|
||||
modalRef.closed.subscribe(reason => {
|
||||
if (reason === 'published') {
|
||||
this.successPayment = true;
|
||||
this.loadAll();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import { Route, RouterModule } from '@angular/router';
|
||||
import { ListarTiendaPlantillaComponent } from './listar-tienda-plantilla.component';
|
||||
|
||||
export const TIENDA_PLANTILLA_ROUTE: Route = {
|
||||
path: 'tienda-plantilla',
|
||||
component: ListarTiendaPlantillaComponent,
|
||||
data: {
|
||||
pageTitle: 'tiendaPlantilla.title',
|
||||
},
|
||||
};
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<form name="deleteForm">
|
||||
<div class="modal-header">
|
||||
<!-- <h4 class="modal-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.publish.title">Confirm delete operation</h4>-->
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<h1 class="ds-title">Plantilla: {{ plantilla!.nombre }}</h1>
|
||||
<h2 class="ds-title--small">Cantidad: 1</h2>
|
||||
<h2 class="ds-title--small">Total: ${{ plantilla!.precio }}</h2>
|
||||
|
||||
<hr />
|
||||
|
||||
<h2 class="entity-body--row m-2">La plantilla ha comprar no tiene costo alguno</h2>
|
||||
<button type="button" class="ds-btn btn-outline-success fc-center" data-dismiss="modal" (click)="freePurchase()">
|
||||
<fa-icon [icon]="faCheck"></fa-icon> <span>Finalizar compra</span>
|
||||
</button>
|
||||
|
||||
<ngx-paypal [config]="payPalConfig" *ngIf="plantilla!.precio != 0"></ngx-paypal>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
|
||||
<fa-icon icon="arrow-left"></fa-icon> <span jhiTranslate="entity.action.cancel">Cancel</span>
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { PaypalDialogComponent } from './paypal-dialog.component';
|
||||
|
||||
describe('PaypalDialogComponent', () => {
|
||||
let component: PaypalDialogComponent;
|
||||
let fixture: ComponentFixture<PaypalDialogComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
declarations: [PaypalDialogComponent],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(PaypalDialogComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,161 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { IPayPalConfig, ICreateOrderRequest } from 'ngx-paypal';
|
||||
import { ParametroAplicacionService } from '../../parametro-aplicacion/service/parametro-aplicacion.service';
|
||||
import { EncuestaService } from '../../encuesta/service/encuesta.service';
|
||||
import { FormBuilder } from '@angular/forms';
|
||||
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { IPlantilla } from '../../plantilla/plantilla.model';
|
||||
import { faCreditCard, faCheck } from '@fortawesome/free-solid-svg-icons';
|
||||
import { Account } from '../../../core/auth/account.model';
|
||||
import { UsuarioExtra } from '../../usuario-extra/usuario-extra.model';
|
||||
import { UsuarioExtraService } from '../../usuario-extra/service/usuario-extra.service';
|
||||
import { IFactura } from '../../factura/factura.model';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { AccountService } from '../../../core/auth/account.service';
|
||||
import { Subject } from 'rxjs';
|
||||
import * as dayjs from 'dayjs';
|
||||
import { FacturaService } from '../../factura/service/factura.service';
|
||||
|
||||
@Component({
|
||||
selector: 'jhi-paypal-dialog',
|
||||
templateUrl: './paypal-dialog.component.html',
|
||||
styleUrls: ['./paypal-dialog.component.scss'],
|
||||
})
|
||||
export class PaypalDialogComponent implements OnInit {
|
||||
public payPalConfig?: IPayPalConfig;
|
||||
showSuccess = false;
|
||||
plantilla?: IPlantilla;
|
||||
account: Account | null = null;
|
||||
usuarioExtra: UsuarioExtra | null = null;
|
||||
factura?: IFactura;
|
||||
notAccount: boolean = true;
|
||||
private readonly destroy$ = new Subject<void>();
|
||||
|
||||
faCreditCard = faCreditCard;
|
||||
faCheck = faCheck;
|
||||
|
||||
constructor(
|
||||
protected facturaService: FacturaService,
|
||||
protected usuarioExtraService: UsuarioExtraService,
|
||||
protected activeModal: NgbActiveModal,
|
||||
protected accountService: AccountService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.accountService
|
||||
.getAuthenticationState()
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe(account => {
|
||||
if (account !== null) {
|
||||
this.account = account;
|
||||
this.notAccount = false;
|
||||
} else {
|
||||
this.notAccount = true;
|
||||
}
|
||||
});
|
||||
|
||||
this.getUser();
|
||||
|
||||
this.initConfig();
|
||||
}
|
||||
|
||||
private initConfig(): void {
|
||||
this.payPalConfig = {
|
||||
currency: 'USD',
|
||||
clientId: 'AUIxW_mYvd_h3mMqTtHdrSNMJ9yPmJkpiOCkNq454vDxXCN6hgadgPHIX_9PTeQn1Qv8m-ozcQUQkUjZ',
|
||||
createOrderOnClient: data =>
|
||||
<ICreateOrderRequest>{
|
||||
intent: 'CAPTURE',
|
||||
purchase_units: [
|
||||
{
|
||||
amount: {
|
||||
currency_code: 'USD',
|
||||
value: String(this.plantilla?.precio),
|
||||
breakdown: {
|
||||
item_total: {
|
||||
currency_code: 'USD',
|
||||
value: String(this.plantilla?.precio),
|
||||
},
|
||||
},
|
||||
},
|
||||
items: [
|
||||
{
|
||||
name: this.plantilla?.nombre,
|
||||
quantity: '1',
|
||||
unit_amount: {
|
||||
currency_code: 'USD',
|
||||
value: String(this.plantilla?.precio),
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
advanced: {
|
||||
commit: 'true',
|
||||
},
|
||||
style: {
|
||||
label: 'paypal',
|
||||
layout: 'vertical',
|
||||
},
|
||||
onApprove: (data, actions) => {
|
||||
console.log('onApprove - transaction was approved, but not authorized', data, actions);
|
||||
actions.order.get().then((details: any) => {
|
||||
//calls baxkend
|
||||
console.log('onApprove - you can get full order details inside onApprove: ', details);
|
||||
});
|
||||
},
|
||||
onClientAuthorization: data => {
|
||||
debugger;
|
||||
console.log('onClientAuthorization - you should probably inform your server about completed transaction at this point', data);
|
||||
this.updateUser();
|
||||
this.sendReceipt();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
cancel(): void {
|
||||
this.activeModal.dismiss();
|
||||
}
|
||||
|
||||
getUser(): void {
|
||||
debugger;
|
||||
// Get jhi_user and usuario_extra information
|
||||
if (this.account !== null) {
|
||||
this.usuarioExtraService.find(this.account.id).subscribe(usuarioExtra => {
|
||||
this.usuarioExtra = usuarioExtra.body;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
updateUser(): void {
|
||||
this.usuarioExtra?.plantillas?.push(this.plantilla!);
|
||||
|
||||
this.usuarioExtraService.update(this.usuarioExtra!).subscribe(() => {
|
||||
this.showSuccess = true;
|
||||
});
|
||||
}
|
||||
sendReceipt(): void {
|
||||
const now = dayjs();
|
||||
|
||||
debugger;
|
||||
this.factura = {
|
||||
nombreUsuario: String(this.usuarioExtra?.id!),
|
||||
nombrePlantilla: this.plantilla?.nombre!,
|
||||
costo: this.plantilla?.precio,
|
||||
fecha: now,
|
||||
};
|
||||
|
||||
this.facturaService.create(this.factura).subscribe(() => {
|
||||
this.showSuccess = true;
|
||||
this.cancel();
|
||||
});
|
||||
|
||||
//send
|
||||
}
|
||||
|
||||
freePurchase(): void {
|
||||
this.getUser();
|
||||
this.sendReceipt();
|
||||
}
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ export class UsuarioExtraUpdateComponent {
|
|||
login,
|
||||
email,
|
||||
password,
|
||||
langKey: this.translateService.currentLang,
|
||||
langKey: this.translateService.currentLang!,
|
||||
name,
|
||||
firstName,
|
||||
profileIcon: this.profileIcon,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="container-fluid navbar navbar-marketing navbar-expand-lg bg-white navbar-light">
|
||||
<div class="container px-5 py-4">
|
||||
<a class="text-dark" routerLink="login"
|
||||
><img src="http://datasurvey.org/content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt=""
|
||||
><img src="src/main/webapp/content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt=""
|
||||
/></a>
|
||||
|
||||
<div class="col-6" style="text-align: end">
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div *ngIf="isNotMobileMenu()">
|
||||
<form class="navbar-form navbar-left navbar-search-form" role="search">
|
||||
<div class="input-group">
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ export const USER_ROUTES: RouteInfo[] = [
|
|||
type: 'link',
|
||||
icontype: 'nc-icon nc-paper',
|
||||
},
|
||||
{ path: '/tienda-plantilla', title: 'Tienda', type: 'link', icontype: 'nc-icon nc-shop' },
|
||||
// {
|
||||
// path: '/tienda',
|
||||
// title: 'Tienda',
|
||||
|
|
@ -92,6 +93,6 @@ export const USER_ROUTES: RouteInfo[] = [
|
|||
path: '/colaboraciones',
|
||||
title: 'Colaboraciones',
|
||||
type: 'link',
|
||||
icontype: 'nc-icon nc-world-2',
|
||||
icontype: 'nc-icon nc-single-02',
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="container px-5 py-4">
|
||||
<h1 class="ds-title" [hidden]="notAccount">Inicio</h1>
|
||||
<a class="text-dark" href=" " [hidden]="!notAccount">
|
||||
<img src="http://datasurvey.org/content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt="" />
|
||||
<img src="src/main/webapp/content/img_datasurvey/datasurvey-logo-text-black.svg" width="300" alt="" />
|
||||
</a>
|
||||
|
||||
<a href=" ">
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
>
|
||||
</div>
|
||||
<div class="entity-body--row m-2">
|
||||
<p>Calificacion</p>
|
||||
<p>Calificación</p>
|
||||
<fa-icon *ngFor="let i of [].constructor(encuesta.calificacion)" class="entity-icon--star" [icon]="faStar"></fa-icon>
|
||||
<fa-icon
|
||||
*ngFor="let i of [].constructor(5 - encuesta.calificacion!)"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { SharedModule } from 'app/shared/shared.module';
|
||||
|
||||
import { PAGINA_PRINCIPAL_ROUTE } from './pagina-princial.route';
|
||||
import { PaginaPrincipalComponent } from './pagina-principal.component';
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import { Pipe, PipeTransform, Injectable } from '@angular/core';
|
|||
@Injectable()
|
||||
export class FilterPipe implements PipeTransform {
|
||||
transform(items: any[], field: string, value: string): any[] {
|
||||
debugger;
|
||||
if (!items) {
|
||||
return [];
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
|
|
@ -2,6 +2,8 @@
|
|||
@import '~bootstrap/scss/functions';
|
||||
@import '~bootstrap/scss/variables';
|
||||
|
||||
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap');
|
||||
|
||||
/* ==============================================================
|
||||
Bootstrap tweaks
|
||||
===============================================================*/
|
||||
|
|
|
|||
|
|
@ -102,4 +102,8 @@
|
|||
@import 'paper-dashboard/datasurvey-home';
|
||||
@import 'paper-dashboard/datasurvey-filter';
|
||||
@import 'paper-dashboard/datasurvey-survey';
|
||||
@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap');
|
||||
@import '~ngx-sharebuttons/themes/material/material-dark-theme';
|
||||
@import '~ngx-sharebuttons/themes/modern/modern-light-theme';
|
||||
@import '~ngx-sharebuttons/themes/circles/circles-dark-theme';
|
||||
@import 'paper-dashboard/datasurvey-switch';
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@
|
|||
"status": "Confirmar cambio de estado"
|
||||
},
|
||||
"validation": {
|
||||
"required": "Este campo es obligatorio.",
|
||||
"required": "Este campo es obligatorio",
|
||||
"minlength": "Este campo requiere al menos {{min}} caracteres.",
|
||||
"maxlength": "Este campo no puede superar más de {{max}} caracteres.",
|
||||
"min": "Este campo debe ser mayor que {{min}}.",
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
"number": "Este campo debe ser un número.",
|
||||
"integerNumber": "Este campo debe ser un número entero.",
|
||||
"datetimelocal": "Este campo debe ser una fecha y hora.",
|
||||
"minoigual": "Este campo debe ser mayor o igual que 0."
|
||||
"minoigual": "Este campo debe ser mayor o igual que 0"
|
||||
},
|
||||
"publish": {
|
||||
"title": "Publicar encuesta",
|
||||
|
|
|
|||
Loading…
Reference in New Issue