entry buy index

front/core/components/chip/style.scss

@@ -21,6 +21,9 @@ vn-chip {
         }
     }
 
+    &.white {
+        background-color: $color-bg-panel;
+    }
     &.colored {
         background-color: $color-main;
         color: $color-font-bg;

modules/entry/back/methods/entry/addBuy.js

@@ -0,0 +1,136 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('addBuy', {
+        description: 'Inserts or updates buy for the current entry',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The entry id',
+            http: {source: 'path'}
+        },
+        {
+            arg: 'itemFk',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'quantity',
+            type: 'number',
+            required: true
+        },
+        {
+            arg: 'packageFk',
+            type: 'string',
+            required: true
+        }],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/:id/addBuy`,
+            verb: 'POST'
+        }
+    });
+
+    Self.addBuy = async(ctx, options) => {
+        const conn = Self.dataSource.connector;
+        let tx;
+        let myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const models = Self.app.models;
+
+            const newBuy = await models.Buy.create({
+                itemFk: ctx.args.itemFk,
+                entryFk: ctx.args.id,
+                packageFk: ctx.args.packageFk,
+                quantity: ctx.args.quantity
+            }, myOptions);
+
+            let filter = {
+                fields: [
+                    'id',
+                    'itemFk',
+                    'stickers',
+                    'packing',
+                    'grouping',
+                    'quantity',
+                    'packageFk',
+                    'weight',
+                    'buyingValue',
+                    'price2',
+                    'price3'
+                ],
+                include: {
+                    relation: 'item',
+                    scope: {
+                        fields: [
+                            'id',
+                            'typeFk',
+                            'name',
+                            'size',
+                            'minPrice',
+                            'tag5',
+                            'value5',
+                            'tag6',
+                            'value6',
+                            'tag7',
+                            'value7',
+                            'tag8',
+                            'value8',
+                            'tag9',
+                            'value9',
+                            'tag10',
+                            'value10',
+                            'groupingMode'
+                        ],
+                        include: {
+                            relation: 'itemType',
+                            scope: {
+                                fields: ['code', 'description']
+                            }
+                        }
+                    }
+                }
+            };
+
+            let stmts = [];
+            let stmt;
+
+            stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc');
+            stmt = new ParameterizedSQL(
+                `CREATE TEMPORARY TABLE tmp.buyRecalc
+                    (INDEX (id))
+                    ENGINE = MEMORY
+                        SELECT ? AS id`, [newBuy.id]);
+
+            stmts.push(stmt);
+            stmts.push('CALL buy_recalcPrices()');
+
+            const sql = ParameterizedSQL.join(stmts, ';');
+            await conn.executeStmt(sql, myOptions);
+
+            const buy = await models.Buy.findById(newBuy.id, filter, myOptions);
+
+            if (tx) await tx.commit();
+
+            return buy;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/deleteBuys.js

@@ -0,0 +1,50 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('deleteBuys', {
+        description: 'Deletes the selected buys',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'buys',
+            type: ['object'],
+            required: true,
+            description: 'The buys to delete'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/deleteBuys`,
+            verb: 'POST'
+        }
+    });
+
+    Self.deleteBuys = async(ctx, options) => {
+        const models = Self.app.models;
+        let tx;
+        let myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            let promises = [];
+            for (let buy of ctx.args.buys) {
+                const buysToDelete = models.Buy.destroyById(buy.id, myOptions);
+                promises.push(buysToDelete);
+            }
+
+            const deleted = await Promise.all(promises);
+
+            if (tx) await tx.commit();
+            return deleted;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};

modules/entry/back/methods/entry/specs/addBuy.spec.js

@@ -0,0 +1,42 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('entry addBuy()', () => {
+    const activeCtx = {
+        accessToken: {userId: 18},
+    };
+
+    const ctx = {
+        req: activeCtx
+    };
+
+    const entryId = 2;
+    it('should create a new buy for the given entry', async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+        const itemId = 4;
+        const quantity = 10;
+
+        ctx.args = {
+            id: entryId,
+            itemFk: itemId,
+            quantity: quantity,
+            packageFk: 3
+        };
+
+        const tx = await app.models.Entry.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const newBuy = await app.models.Entry.addBuy(ctx, options);
+
+            expect(newBuy.itemFk).toEqual(itemId);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/entry/back/methods/entry/specs/deleteBuys.spec.js

@@ -0,0 +1,23 @@
+const app = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('sale deleteBuys()', () => {
+    const activeCtx = {
+        accessToken: {userId: 18},
+    };
+
+    const ctx = {
+        req: activeCtx
+    };
+
+    it('should delete the buy', async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+        ctx.args = {buys: [{id: 1}]};
+
+        let result = await app.models.Buy.deleteBuys(ctx);
+
+        expect(result).toEqual([{count: 1}]);
+    });
+});

modules/entry/back/models/buy.js

@@ -1,4 +1,5 @@
 module.exports = Self => {
     require('../methods/entry/editLatestBuys')(Self);
     require('../methods/entry/latestBuysFilter')(Self);
+    require('../methods/entry/deleteBuys')(Self);
 };

modules/entry/back/models/buy.json

@@ -57,14 +57,12 @@
         "entry": {
             "type": "belongsTo",
             "model": "Entry",
-            "foreignKey": "entryFk",
+            "foreignKey": "entryFk"
-            "required": true
         },
         "item": {
             "type": "belongsTo",
             "model": "Item",
-            "foreignKey": "itemFk",
+            "foreignKey": "itemFk"
-            "required": true
         },
         "package": {
 			"type": "belongsTo",

modules/entry/back/models/entry.js

@@ -2,6 +2,7 @@ module.exports = Self => {
     require('../methods/entry/filter')(Self);
     require('../methods/entry/getEntry')(Self);
     require('../methods/entry/getBuys')(Self);
+    require('../methods/entry/addBuy')(Self);
     require('../methods/entry/importBuys')(Self);
     require('../methods/entry/importBuysPreview')(Self);
 };

modules/entry/front/buy/index/index.html

@@ -1,9 +1,189 @@
+<vn-crud-model
+    auto-load="true"
+    vn-id="model"
+    url="Entries/{{$ctrl.$params.id}}/getBuys"
+    data="$ctrl.buys">
+</vn-crud-model>
+<vn-watcher
+    vn-id="watcher"
+    data="$ctrl.buys">
+</vn-watcher>
+<div class="vn-w-xl">
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal class="header">
+            <vn-tool-bar class="vn-mb-md">
+                <vn-button 
+                    disabled="$ctrl.selectedBuys() == 0"
+                    ng-click="deleteBuys.show()"
+                    vn-tooltip="Delete buy(s)"
+                    icon="delete">
+                </vn-button>
+            </vn-tool-bar>
+            <vn-one class="taxes" ng-if="$ctrl.sales.length > 0">
+                <p><vn-label translate>Subtotal</vn-label> {{$ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+                <p><vn-label translate>VAT</vn-label> {{$ctrl.ticket.totalWithVat - $ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}</p>
+                <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.ticket.totalWithVat | currency: 'EUR':2}}</strong></p>
+            </vn-one>
+        </vn-horizontal>
+        <table class="vn-table">
+            <thead>
+                <tr>
+                    <th shrink>
+                        <vn-multi-check model="model" on-change="$ctrl.resetChanges()">
+                        </vn-multi-check>
+                    </th>
+                    <th translate center>Item</th>
+                    <th translate center>Quantity</th>
+                    <th translate center>Package</th>
+                    <th translate>Stickers</th>
+                    <th translate>Weight</th>
+                    <th translate>Packing</th>
+                    <th translate>Grouping</th>
+                    <th translate>Buying value</th>
+                    <th translate expand>Grouping price</th>
+                    <th translate expand>Packing price</th>
+                    <th translate>Import</th>
+                </tr>
+            </thead>
+            <tbody ng-repeat="buy in $ctrl.buys">
+                <tr>
+                    <td shrink>
+                        <vn-check tabindex="-1" ng-model="buy.checked">
+                        </vn-check>
+                    </td>
+                    <td shrink>
+                        <span 
+                            ng-if="buy.id"
+                            ng-click="itemDescriptor.show($event, buy.item.id)"
+                            class="link">
+                            {{::buy.item.id | zeroFill:6}}
+                        </span>
+                        <vn-autocomplete ng-if="!buy.id" class="dense"
+                            vn-focus
+                            url="Items"
+                            ng-model="buy.itemFk"
+                            show-field="name"
+                            value-field="id"
+                            search-function="$ctrl.itemSearchFunc($search)"
+                            on-change="$ctrl.saveBuy(buy)"
+                            order="id DESC"
+                            tabindex="1">
+                            <tpl-item>
+                                {{::id}} - {{::name}}
+                            </tpl-item>
+                        </vn-autocomplete>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.quantity"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td center title="{{::buy.packageFk | dashIfEmpty}}">
+                        <vn-autocomplete
+                            vn-one
+                            url="Packagings"
+                            show-field="id"
+                            value-field="id"
+                            where="{isBox: true}"
+                            ng-model="buy.packageFk"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-autocomplete>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.stickers"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.weight"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.packing"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.grouping"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.buyingValue"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.price2"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <vn-input-number class="dense"
+                            ng-model="buy.price3"
+                            on-change="$ctrl.saveBuy(buy)">
+                        </vn-input-number>
+                    </td>
+                    <td>
+                        <span 
+                            ng-if="buy.quantity != null && buy.buyingValue != null"
+                            title="{{buy.quantity * buy.buyingValue | currency: 'EUR':2}}">
+                            {{buy.quantity * buy.buyingValue | currency: 'EUR':2}}
+                        </span>
+                    </td>
+                </tr>
+                <tr class="dark-row">
+                    <td shrink>
+                    </td>
+                    <td shrink>
+                        <span translate-attr="{title: 'Item type'}">
+                            {{::buy.item.itemType.code}}
+                        </span>
+                    </td>
+                    <td number shrink>
+                        <span translate-attr="{title: 'Item size'}">
+                            {{::buy.item.size}}
+                        </span>
+                    </td>
+                    <td center>
+                        <span translate-attr="{title: 'Minimum price'}">
+                            {{::buy.item.minPrice | currency: 'EUR':2}}
+                        </span>
+                    </td>
+                    <td vn-fetched-tags colspan="9">
+                        <vn-one title="{{::buy.item.name}}">{{::buy.item.name}}</vn-one>
+                        <vn-fetched-tags
+                            max-length="6"
+                            item="::buy.item"
+                            tabindex="-1">
+                        </vn-fetched-tags>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <div>
+            <vn-icon-button
+                vn-one
+                vn-tooltip="Add buy"
+                vn-bind="+"
+                icon="add_circle"
+                ng-click="model.insert({})">
+            </vn-icon-button>
+        </div>
+    </vn-card>
+</div>
 <div fixed-bottom-right>
     <vn-vertical style="align-items: center;">
         <a ui-sref="entry.card.buy.import" 
-            vn-bind="+" 
+            vn-bind="+">
-            vn-acl="buyer" 
-            vn-acl-action="remove">
             <vn-button class="round md vn-mb-sm"
                 icon="publish"
                 vn-tooltip="Import buys"
@@ -12,3 +192,13 @@
         </a>
     </vn-vertical>
 </div>
+<vn-item-descriptor-popover
+    vn-id="itemDescriptor">
+</vn-item-descriptor-popover>
+
+<vn-confirm
+    vn-id="delete-buys"
+    question="You are going to delete buy(s) from this entry"
+    message="Continue anyway?"
+    on-accept="$ctrl.deleteBuys()">
+</vn-confirm>

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

@@ -1,9 +1,65 @@
 import ngModule from '../../module';
+import './style.scss';
 import Section from 'salix/components/section';
 
+export default class Controller extends Section {
+    saveBuy(buy) {
+        const missingData = !buy.itemFk || !buy.quantity || !buy.packageFk;
+        if (missingData) return;
+
+        if (buy.id) {
+            const query = `Buys/${buy.id}`;
+            this.$http.patch(query, buy).then(res => {
+                if (!res.data) return;
+
+                buy = Object.assign(buy, res.data);
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+            });
+        } else {
+            const query = `Entries/${this.entry.id}/addBuy`;
+            this.$http.post(query, buy).then(res => {
+                if (!res.data) return;
+
+                buy = Object.assign(buy, res.data);
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+            });
+        }
+    }
+
+    /**
+     * Returns checked instances
+     *
+     * @return {Array} Checked instances
+     */
+    selectedBuys() {
+        if (!this.buys) return;
+
+        return this.buys.filter(buy => {
+            return buy.checked;
+        });
+    }
+
+    deleteBuys() {
+        const buys = this.selectedBuys();
+        const actualInstances = buys.filter(buy => buy.id);
+
+        const params = {buys: actualInstances};
+
+        if (actualInstances.length) {
+            this.$http.post(`Buys/deleteBuys`, params).then(() => {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+            });
+        }
+        buys.forEach(buy => {
+            const index = this.buys.indexOf(buy);
+            this.buys.splice(index, 1);
+        });
+    }
+}
+
 ngModule.vnComponent('vnEntryBuyIndex', {
     template: require('./index.html'),
-    controller: Section,
+    controller: Controller,
     bindings: {
         entry: '<'
     }

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

@@ -0,0 +1,66 @@
+import './index.js';
+
+describe('Entry buy', () => {
+    let controller;
+    let $httpBackend;
+
+    beforeEach(ngModule('entry'));
+
+    beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpParamSerializer_, _$httpBackend_) => {
+        $httpBackend = _$httpBackend_;
+        let $element = $compile('<vn-entry-buy-index></vn-entry-buy-index')($rootScope);
+        controller = $componentController('vnEntryBuyIndex', {$element});
+        $httpBackend.whenGET('Entries//getBuys?filter=%7B%7D').respond([{id: 1}]);
+    }));
+
+    describe('saveBuy()', () => {
+        it(`should call the buys patch route if the received buy has an ID`, () => {
+            const buy = {id: 1, itemFk: 1, quantity: 1, packageFk: 1};
+
+            const query = `Buys/${buy.id}`;
+
+            $httpBackend.expectPATCH(query).respond(200);
+            controller.saveBuy(buy);
+            $httpBackend.flush();
+        });
+
+        it(`should call the entry addBuy post route if the received buy has no ID`, () => {
+            controller.entry = {id: 1};
+            const buy = {itemFk: 1, quantity: 1, packageFk: 1};
+
+            const query = `Entries/${controller.entry.id}/addBuy`;
+
+            $httpBackend.expectPOST(query).respond(200);
+            controller.saveBuy(buy);
+            $httpBackend.flush();
+        });
+    });
+
+    describe('deleteBuys()', () => {
+        it(`should perform no queries if all buys to delete were not actual instances`, () => {
+            controller.buys = [
+                {checked: true},
+                {checked: true},
+                {checked: false}];
+
+            controller.deleteBuys();
+
+            expect(controller.buys.length).toEqual(1);
+        });
+
+        it(`should perform a query to delete as there's an actual instance at least`, () => {
+            controller.buys = [
+                {checked: true, id: 1},
+                {checked: true},
+                {checked: false}];
+
+            const query = 'Buys/deleteBuys';
+
+            $httpBackend.expectPOST(query).respond(200);
+            controller.deleteBuys();
+            $httpBackend.flush();
+
+            expect(controller.buys.length).toEqual(1);
+        });
+    });
+});

modules/entry/front/buy/index/style.scss

@@ -0,0 +1,28 @@
+@import "variables";
+
+
+vn-entry-buy-index vn-card {
+    max-width: $width-xl;
+
+    .dark-row {
+        background-color: lighten($color-marginal, 10%);
+    }
+
+    tbody tr:nth-child(1) {
+        border-top: 1px solid $color-marginal;
+    }
+
+    tbody{
+        border-bottom: 1px solid $color-marginal;
+    }
+
+    tbody tr:nth-child(3) {
+        height: inherit
+    }
+
+    tr {
+        margin-bottom: 10px;
+    }
+}
+
+$color-font-link-medium: lighten($color-font-link, 20%)

modules/entry/front/latest-buys/index.html

@@ -83,12 +83,12 @@
                     </span>
                 </vn-td>
                 <vn-td number>
-                    <vn-chip translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}"> 
+                    <vn-chip class="white" translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}"> 
                         <span translate>{{::buy.packing | dashIfEmpty}}</span>
                     </vn-chip>
                 </vn-td>
                 <vn-td number>
-                    <vn-chip translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}"> 
+                    <vn-chip class="white" translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}"> 
                         <span translate>{{::buy.grouping | dashIfEmpty}}</span>
                     </vn-chip>
                 </vn-td>

modules/entry/front/routes.json

@@ -87,7 +87,8 @@
             "url": "/buy",
             "state": "entry.card.buy",
             "abstract": true,
-            "component": "ui-view"
+            "component": "ui-view",
+            "acl": ["buyer"]
         },
         {
             "url" : "/index",

modules/entry/front/summary/index.html

@@ -102,12 +102,12 @@
                         <td center title="{{::line.packageFk | dashIfEmpty}}">{{::line.packageFk | dashIfEmpty}}</td>
                         <td center title="{{::line.weight}}">{{::line.weight}}</td>
                         <td center>
-                            <vn-chip translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> 
+                            <vn-chip class="white" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> 
                                 <span translate>{{::line.packing | dashIfEmpty}}</span>
                             </vn-chip>
                         </td>
                         <td center>
-                            <vn-chip translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> 
+                            <vn-chip class="white" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> 
                                 <span translate>{{::line.grouping | dashIfEmpty}}</span>
                             </vn-chip>
                         </vn-td>