CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Artículo](Datos Básicos) Añadido campo Unidades/Caja
 
 ### Changed
+- [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
 
 ### Fixed
 - [General] Al utilizar el traductor de Google se descuadraban los iconos

db/changes/230201/00-ACL_ItemShelvingSale.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES ('ItemShelvingSale','*','*','ALLOW','employee');

db/dump/fixtures.sql

@@ -1143,10 +1143,10 @@ INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`,
 
 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
     VALUES
-        ('1', '1', '1', '', '1106'),
+        ('1', '1', '1', util.VN_CURDATE(), '1106'),
-        ('2', '2', '5', '', '1106'),
+        ('2', '2', '5', util.VN_CURDATE(), '1106'),
-        ('1', '7', '1', '', '1106'),
+        ('1', '7', '1', util.VN_CURDATE(), '1106'),
-        ('2', '8', '5', '', '1106');
+        ('2', '8', '5', util.VN_CURDATE(), '1106');
 
 INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
     VALUES

front/core/components/table/style.scss

@@ -153,6 +153,18 @@ vn-table {
                     background-color: $color-font-bg-dark;
                     color: $color-font-bg;
                 }
+                &.dark-notice {
+                    background-color: $color-notice;
+                    color: $color-font-bg;
+                }
+                &.yellow {
+                    background-color: $color-yellow;
+                    color: $color-font-bg;
+                }
+                &.pink {
+                    background-color: $color-pink;
+                    color: $color-font-bg;
+                }
             }
             vn-icon-menu {
                 display: inline-block;

front/core/styles/variables.scss

@@ -101,6 +101,8 @@ $color-marginal: #222;
 $color-success: #a3d131;
 $color-notice: #32b1ce;
 $color-alert: #fa3939;
+$color-pink: #ff99cc;
+$color-yellow: #ffff00;
 $color-button: $color-secondary;
 
 $color-spacer: rgba(255, 255, 255, .3);

modules/item/back/methods/item-shelving-sale/filter.js

@@ -0,0 +1,49 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+    Self.remoteMethod('filter', {
+        description: 'Returns all item shelving sale matching with the filter',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'filter',
+            type: 'object',
+            description: 'Filter defining where and paginated data'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(filter, options) => {
+        const conn = Self.dataSource.connector;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const stmt = new ParameterizedSQL(`
+            SELECT iss.created,
+                iss.saleFk,
+                iss.quantity,
+                iss.userFk,
+                ish.shelvingFk,
+                p.code,
+                u.name
+            FROM itemShelvingSale iss
+                LEFT JOIN itemShelving ish ON iss.itemShelvingFk = ish.id
+                LEFT JOIN shelving s ON ish.shelvingFk = s.code
+                LEFT JOIN parking p ON s.parkingFk = p.id
+                LEFT JOIN account.user u ON u.id = iss.userFk`
+        );
+
+        stmt.merge(conn.makeSuffix(filter));
+
+        return conn.executeStmt(stmt);
+    };
+};

modules/item/back/models/item-shelving-sale.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/item-shelving-sale/filter')(Self);
+};

modules/item/back/models/item-shelving.json

@@ -11,9 +11,6 @@
 			"type": "number",
 			"id": true,
 			"description": "Identifier"
-		},
-		"shelve": {
-			"type": "string"
 		},
 		"shelvingFk": {
 			"type": "string"
@@ -21,12 +18,6 @@
 		"itemFk": {
 			"type": "number"
         },
-        "deep": {
-			"type": "number"
-        },
-        "quantity": {
-			"type": "number"
-		},
 		"created": {
 			"type": "date"
 		}
@@ -41,6 +32,11 @@
 			"type": "belongsTo",
 			"model": "Account",
 			"foreignKey": "userFk"
+		},
+        "shelving": {
+			"type": "belongsTo",
+			"model": "Shelving",
+			"foreignKey": "shelvingFk"
 		}
 	}
 }

modules/ticket/back/methods/sale/salePreparingList.js

@@ -0,0 +1,33 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('salePreparingList', {
+        description: 'Returns a list with the lines of a ticket and its different states of preparation',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The ticket id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:id/salePreparingList`,
+            verb: 'GET'
+        }
+    });
+
+    Self.salePreparingList = async(ctx, id, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        query = `CALL vn.salePreparingList(?)`;
+        const [sales] = await Self.rawSql(query, [id], myOptions);
+
+        return sales;
+    };
+};

modules/ticket/back/models/sale.js

@@ -1,5 +1,6 @@
 module.exports = Self => {
     require('../methods/sale/getClaimableFromTicket')(Self);
+    require('../methods/sale/salePreparingList')(Self);
     require('../methods/sale/reserve')(Self);
     require('../methods/sale/deleteSales')(Self);
     require('../methods/sale/updatePrice')(Self);

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

@@ -1,10 +1,11 @@
 <vn-crud-model
     vn-id="model"
-    url="SaleTrackings/listSaleTracking"
+    url="sales"
+    filter="::$ctrl.filter"
     link="{ticketFk: $ctrl.$params.id}"
     limit="20"
-    data="sales"
+    data="$ctrl.sales"
-    order="itemFk DESC"
+    order="concept ASC"
     auto-load="true">
 </vn-crud-model>
 <vn-data-viewer model="model">
@@ -12,31 +13,27 @@
     <vn-table model="model">
         <vn-thead>
             <vn-tr>
-                <vn-th shrink></vn-th>
+                <vn-th field="isChecked" center>Is checked</vn-th>
                 <vn-th field="itemFk" number>Item</vn-th>
-                <vn-th expand>Description</vn-th>
+                <vn-th field="concept">Description</vn-th>
                 <vn-th field="quantity" number>Quantity</vn-th>
-                <vn-th field="originalQuantity" number>Original</vn-th>
+                <vn-th></vn-th>
-                <vn-th field="workerFk">Worker</vn-th>
-                <vn-th field="state" shrink>State</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <vn-tr ng-repeat="sale in sales">
+            <vn-tr ng-repeat="sale in $ctrl.sales">
-                <vn-td shrink>
+                <vn-td center>
-                    <vn-icon 
+                    <span class="chip {{$ctrl.chipHasSaleGroupDetail(sale.preparingList.hasSaleGroupDetail)}} vn-mx-xs chip2" vn-tooltip="has saleGroupDetail"></span>
-                        class="bright"
+                    <span class="chip {{$ctrl.chipIsPreviousSelected(sale.preparingList.isPreviousSelected)}} vn-ml-xs" vn-tooltip="is previousSelected"></span>
-                        icon="warning" 
+                    <span class="chip {{$ctrl.chipIsPrevious(sale.preparingList.isPrevious)}} vn-mr-xs" vn-tooltip="is previous"></span>
-                        ng-if="sale.quantity != sale.originalQuantity"
+                    <span class="chip {{$ctrl.chipIsPrepared(sale.preparingList.isPrepared)}} vn-mx-xs" vn-tooltip="is prepared"></span>
-                        vn-tooltip="The quantity do not match">
+                    <span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
-                    </vn-icon>
                 </vn-td>
                 <vn-td number>
                     <span
-                        ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
+                        ng-click="$ctrl.showItemDescriptor($event, sale)"
                         class="link">
-                        {{sale.itemFk | zeroFill:6}}
+                        {{::sale.itemFk | zeroFill:6}}
                     </span>
                 </vn-td>
                 <vn-td vn-fetched-tags>
@@ -52,6 +49,54 @@
                         tabindex="-1">
                     </vn-fetched-tags>
                 </vn-td>
+                <vn-td number>{{::sale.quantity}}</vn-td>
+                <vn-td actions>
+                    <vn-icon-button
+                        vn-click-stop="$ctrl.showSaleTracking(sale)"
+                        vn-tooltip="Sale tracking"
+                        icon="history">
+                    </vn-icon-button>
+                    <vn-icon-button
+                        vn-click-stop="$ctrl.showItemShelvingSale(sale)"
+                        vn-tooltip="ItemShelvings sale"
+                        icon="icon-inventory">
+                    </vn-icon-button>
+                </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>
+
+<vn-popup vn-id="saleTracking">
+    <vn-crud-model
+        vn-id="modelSaleTracking"
+        url="SaleTrackings/listSaleTracking"
+        link="{saleFk: $ctrl.saleId}"
+        limit="20"
+        data="saleTrackings"
+        order="itemFk DESC"
+        auto-load="true">
+    </vn-crud-model>
+    <vn-data-viewer model="modelSaleTracking">
+        <vn-card class="vn-w-lg">
+        <vn-table model="modelSaleTracking">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="quantity" number>Quantity</vn-th>
+                    <vn-th field="originalQuantity" number>Original</vn-th>
+                    <vn-th field="workerFk">Worker</vn-th>
+                    <vn-th field="state" shrink>State</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="sale in saleTrackings">
                     <vn-td number>{{::sale.quantity}}</vn-td>
                     <vn-td number>{{::sale.originalQuantity}}</vn-td>
                     <vn-td expand>
@@ -67,11 +112,56 @@
             </vn-tbody>
         </vn-table>
         </vn-card>
-</vn-data-viewer>
+    </vn-data-viewer>
-<vn-item-descriptor-popover
+    <vn-item-descriptor-popover
         vn-id="item-descriptor"
         warehouse-fk="$ctrl.ticket.warehouseFk">
-</vn-item-descriptor-popover>
+    </vn-item-descriptor-popover>
-<vn-worker-descriptor-popover 
+    <vn-worker-descriptor-popover
         vn-id="worker-descriptor">
-</vn-worker-descriptor-popover>
+    </vn-worker-descriptor-popover>
+</vn-popup>
+
+<vn-popup vn-id="itemShelvingSale">
+    <vn-crud-model
+        vn-id="modelSaleTracking"
+        url="ItemShelvingSales/filter"
+        link="{saleFk: $ctrl.saleId}"
+        limit="20"
+        data="$ctrl.itemShelvingSales"
+        auto-load="true">
+    </vn-crud-model>
+    <vn-data-viewer model="modelSaleTracking">
+        <vn-card class="vn-w-lg">
+        <vn-table model="modelSaleTracking">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="quantity" number>Quantity</vn-th>
+                    <vn-th field="workerFk">Worker</vn-th>
+                    <vn-th field="shelving" shrink>Shelving</vn-th>
+                    <vn-th field="parking" shrink>Parking</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="itemShelvingSale in $ctrl.itemShelvingSales">
+                    <vn-td number>{{::itemShelvingSale.quantity}}</vn-td>
+                    <vn-td expand>
+                        <span
+                            class="link"
+                            ng-click="workerDescriptor.show($event, itemShelvingSale.userFk)">
+                            {{::itemShelvingSale.name | dashIfEmpty}}
+                        </span>
+                    </vn-td>
+                    <vn-td shrink>{{::itemShelvingSale.shelvingFk}}</vn-td>
+                    <vn-td shrink>{{::itemShelvingSale.code}}</vn-td>
+                    <vn-td expand>{{::itemShelvingSale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+        </vn-card>
+    </vn-data-viewer>
+    <vn-worker-descriptor-popover
+        vn-id="worker-descriptor">
+    </vn-worker-descriptor-popover>
+</vn-popup>

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

@@ -1,12 +1,100 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
+import './style.scss';
 
-class Controller extends Section {}
+class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.filter = {
+            include: [
+                {
+                    relation: 'item'
+                }, {
+                    relation: 'saleTracking',
+                    scope: {
+                        fields: ['isChecked']
+                    }
+                }
+            ]
+        };
+    }
+
+    get sales() {
+        return this._sales;
+    }
+
+    set sales(value) {
+        this._sales = value;
+        if (value) {
+            const query = `Sales/${this.$params.id}/salePreparingList`;
+            this.$http.get(query)
+                .then(res => {
+                    this.salePreparingList = res.data;
+                    for (const salePreparing of this.salePreparingList) {
+                        for (const sale of this.sales) {
+                            if (salePreparing.saleFk == sale.id)
+                                sale.preparingList = salePreparing;
+                        }
+                    }
+                });
+        }
+    }
+
+    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);
+    }
+
+    chipHasSaleGroupDetail(hasSaleGroupDetail) {
+        if (hasSaleGroupDetail) return 'pink';
+        else return 'message';
+    }
+
+    chipIsPreviousSelected(isPreviousSelected) {
+        if (isPreviousSelected) return 'notice';
+        else return 'message';
+    }
+
+    chipIsPrevious(isPrevious) {
+        if (isPrevious) return 'dark-notice';
+        else return 'message';
+    }
+
+    chipIsPrepared(isPrepared) {
+        if (isPrepared) return 'warning';
+        else return 'message';
+    }
+
+    chipIsControled(isControled) {
+        if (isControled) return 'yellow';
+        else return 'message';
+    }
+
+    showSaleTracking(sale) {
+        this.saleId = sale.id;
+        this.$.saleTracking.show();
+    }
+
+    showItemShelvingSale(sale) {
+        this.saleId = sale.id;
+        this.$.itemShelvingSale.show();
+    }
+}
 
 ngModule.vnComponent('vnTicketSaleTracking', {
     template: require('./index.html'),
     controller: Controller,
     bindings: {
-        ticket: '<',
+        ticket: '<'
-    },
+    }
 });

modules/ticket/front/sale-tracking/locale/es.yml

@@ -0,0 +1,6 @@
+ItemShelvings sale: Carros línea
+has saleGroupDetail: tiene detalle grupo lineas
+is previousSelected: es previa seleccionada
+is previous: es previa
+is prepared: esta preparado
+is controled: esta controlado

modules/ticket/front/sale-tracking/style.scss

@@ -0,0 +1,7 @@
+@import "variables";
+
+.chip {
+    display: inline-block;
+    min-width: 15px;
+    min-height: 25px;
+}