diff --git a/client/client/src/credit-insurance/index/index.html b/client/client/src/credit-insurance/index/index.html
index b8c2480c5..23eaf6870 100644
--- a/client/client/src/credit-insurance/index/index.html
+++ b/client/client/src/credit-insurance/index/index.html
@@ -39,6 +39,11 @@
+
+
+ No results
+
+
+
+
+ No results
+
+
diff --git a/client/order/src/catalogue/index.html b/client/order/src/catalogue/index.html
index 178c39ae9..5dd1f681a 100644
--- a/client/order/src/catalogue/index.html
+++ b/client/order/src/catalogue/index.html
@@ -19,7 +19,9 @@
item="::item">
- No results
+
+ No results
+
diff --git a/client/order/src/catalogue/index.js b/client/order/src/catalogue/index.js
index 4b7804105..0a3d97485 100644
--- a/client/order/src/catalogue/index.js
+++ b/client/order/src/catalogue/index.js
@@ -1,5 +1,4 @@
import ngModule from '../module';
-import './style.scss';
class Controller {
constructor($scope, $stateParams) {
diff --git a/client/salix/src/styles/index.js b/client/salix/src/styles/index.js
index eaa0463b8..d80763912 100644
--- a/client/salix/src/styles/index.js
+++ b/client/salix/src/styles/index.js
@@ -10,3 +10,4 @@ import './misc.scss';
import './summary.scss';
import './colors.scss';
import './effects.scss';
+import './order-product.scss';
diff --git a/client/order/src/catalogue/style.scss b/client/salix/src/styles/order-product.scss
similarity index 99%
rename from client/order/src/catalogue/style.scss
rename to client/salix/src/styles/order-product.scss
index c94b07f97..c1560fa59 100644
--- a/client/order/src/catalogue/style.scss
+++ b/client/salix/src/styles/order-product.scss
@@ -1,7 +1,7 @@
@import "./colors";
-vn-order-catalogue {
+
@media screen and (max-width: 1920px){
vn-order-product {
width: 25%;
@@ -108,4 +108,3 @@ vn-order-catalogue {
}
}
}
-}
\ No newline at end of file
diff --git a/client/ticket/routes.json b/client/ticket/routes.json
index d0e402455..e583bcb7e 100644
--- a/client/ticket/routes.json
+++ b/client/ticket/routes.json
@@ -200,6 +200,18 @@
"menu": {
"icon": "assignment"
}
+ },
+ {
+ "url" : "/picture",
+ "state": "ticket.card.picture",
+ "component": "vn-ticket-picture",
+ "description": "Pictures",
+ "params": {
+ "ticket": "$ctrl.ticket"
+ },
+ "menu": {
+ "icon": "image"
+ }
}
]
}
\ No newline at end of file
diff --git a/client/ticket/src/locale/es.yml b/client/ticket/src/locale/es.yml
index 24df74418..b9d9bac38 100644
--- a/client/ticket/src/locale/es.yml
+++ b/client/ticket/src/locale/es.yml
@@ -52,6 +52,7 @@ Worker: Trabajador
VAT: IVA
Hour: Hora
The quantity do not match: Las cantidades no coinciden
+by: por
#sections
List: Listado
@@ -67,3 +68,4 @@ Tracking: Revisión
Sale checked: Control clientes
Components: Componentes
Sale tracking: Líneas preparadas
+Pictures: Imágenes
diff --git a/client/ticket/src/picture/index.html b/client/ticket/src/picture/index.html
new file mode 100644
index 000000000..1308988f2
--- /dev/null
+++ b/client/ticket/src/picture/index.html
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+ Pictures
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{::sale.item.name}}
+
+
+ {{::sale.item.subName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{::sale.quantity}}
+ by
+ {{::sale.price | currency: ' €': 2}}
+
+
+
+
+
+
+
+
+
+
+ No results
+
+
+
+
+
+
+
+
diff --git a/client/ticket/src/picture/index.js b/client/ticket/src/picture/index.js
new file mode 100644
index 000000000..a68e69d52
--- /dev/null
+++ b/client/ticket/src/picture/index.js
@@ -0,0 +1,34 @@
+import ngModule from '../module';
+
+class Controller {
+ constructor($scope, $stateParams, $http) {
+ this.$scope = $scope;
+ this.$stateParams = $stateParams;
+ this.$http = $http;
+ this.filter = {
+ include: {
+ relation: 'item',
+ scope: {
+ field: ['name', 'image']
+ }
+ }
+ };
+ }
+
+ showDescriptor(event, itemFk) {
+ this.$scope.descriptor.itemFk = itemFk;
+ this.$scope.descriptor.parent = event.target;
+ this.$scope.descriptor.show();
+ }
+
+ onDescriptorLoad() {
+ this.$scope.popover.relocate();
+ }
+}
+
+Controller.$inject = ['$scope', '$stateParams', '$http'];
+
+ngModule.component('vnTicketPicture', {
+ template: require('./index.html'),
+ controller: Controller
+});
diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js
index f8987c10c..357451f3f 100644
--- a/client/ticket/src/ticket.js
+++ b/client/ticket/src/ticket.js
@@ -21,3 +21,4 @@ import './fetched-tags';
import './sale-checked';
import './component';
import './sale-tracking';
+import './picture';