modules/client/back/methods/client/hasCustomerRole.js

@@ -29,7 +29,7 @@ module.exports = Self => {
             SELECT COUNT(*) > 0 isCustomer
                 FROM salix.Account A
                     JOIN salix.Role r ON r.id = A.roleFK
-                WHERE r.name = 'customer'
+                WHERE r.name IN ('customer', 'supplier')
                     AND A.id IN (?)`;
         const [result] = await Self.rawSql(query, [id], myOptions);
         const {isCustomer} = result;

modules/entry/back/methods/entry/filter.js

@@ -95,6 +95,16 @@ module.exports = Self => {
                 type: 'date',
                 description: `The to date filter`
             },
+            {
+                arg: 'fromShipped',
+                type: 'date',
+                description: `The from shipped date filter`
+            },
+            {
+                arg: 'toShipped',
+                type: 'date',
+                description: `The to shipped date filter`
+            },
             {
                 arg: 'days',
                 type: 'number',
@@ -133,8 +143,12 @@ module.exports = Self => {
                 return {'e.created': {gte: value}};
             case 'from':
                 return {'t.landed': {gte: value}};
+            case 'fromShipped':
+                return {'t.shipped': {gte: value}};
             case 'to':
                 return {'t.landed': {lte: value}};
+            case 'toShipped':
+                return {'t.shipped': {lte: value}};
             case 'id':
             case 'isBooked':
             case 'isConfirmed':

modules/ticket/front/advance/index.js

@@ -62,8 +62,11 @@ export default class Controller extends Section {
 
     setDefaultFilter() {
         let today = Date.vnNew();
+        today.setHours(0, 0, 0, 0);
         const tomorrow = new Date(today);
         tomorrow.setDate(tomorrow.getDate() + 1);
+        tomorrow.setHours(23, 59, 59, 999);
+
         this.$http.get(`UserConfigs/getUserConfig`)
             .then(res => {
                 this.filterParams = {
@@ -86,15 +89,6 @@ export default class Controller extends Section {
         return checkedLines;
     }
 
-    dateRange(value) {
-        const minHour = new Date(value);
-        minHour.setHours(0, 0, 0, 0);
-        const maxHour = new Date(value);
-        maxHour.setHours(23, 59, 59, 59);
-
-        return [minHour, maxHour];
-    }
-
     totalPriceColor(totalWithVat) {
         return this.isLessThan50(totalWithVat) ? 'warning' : '';
     }

modules/ticket/front/advance/index.spec.js

@@ -36,24 +36,6 @@ describe('Component vnTicketAdvance', () => {
         });
     });
 
-    describe('dateRange()', () => {
-        it('should return two dates with the hours at the start and end of the given date', () => {
-            const now = Date.vnNew();
-
-            const today = now.getDate();
-
-            const dateRange = controller.dateRange(now);
-            const start = dateRange[0].toString();
-            const end = dateRange[1].toString();
-
-            expect(start).toContain(today);
-            expect(start).toContain('00:00:00');
-
-            expect(end).toContain(today);
-            expect(end).toContain('23:59:59');
-        });
-    });
-
     describe('moveTicketsAdvance()', () => {
         it('should make an HTTP Post query', () => {
             jest.spyOn(controller.$.model, 'refresh');

print/templates/reports/buy-label/assets/css/style.css

@@ -33,9 +33,6 @@ span {
 .barcode {
     text-align: center;
 }
-#variant {
+.one-third {
     width: 314px;
 }
-#producer {
-    width: 471px;
-}

print/templates/reports/buy-label/buy-label.html

@@ -4,7 +4,7 @@
     <tbody>
         <tr>
             <td colspan="2">
-                <div id="variant" class="cell">
+                <div class="cell one-third">
                     <span class="lbl">{{$t('variety')}}</span>
                     {{buy.name}}
                 </div>
@@ -63,18 +63,24 @@
             </td>
         </tr>
         <tr>
-            <td colspan="3">
-                <div id="producer" class="cell">
+            <td colspan="2">
+                <div class="cell one-third">
                     <span class="lbl">{{$t('producer')}}</span>
                     {{buy.producer}}
                 </div>
             </td>
+            <td>
+                <div class="cell">
+                    <span class="lbl">{{$t('control')}}</span>
+                    {{`${weekNum} / ${dayNum}`}}
+                </div>
+            </td>
         </tr>
         <tr>
             <td colspan="2">
-                <div class="cell">
-                    <span class="lbl">{{$t('control')}}</span>
-                    {{`${weekNum} / ${dayNum}`}}
+                <div class="cell one-third">
+                    <span class="lbl">{{$t('reference')}}</span>
+                    {{buy.comment}}
                 </div>
              </td>
             <td>

print/templates/reports/buy-label/locale/en.yml

@@ -10,3 +10,4 @@ unitSale: Un. sale
 producer: Producer
 control: Control
 boxNum: Box no.
+reference: Reference

print/templates/reports/buy-label/locale/es.yml

@@ -10,3 +10,4 @@ saleUnit: Sale un.
 producer: Productor
 control: Control
 boxNum: Caja nº
+reference: Referencia

print/templates/reports/buy-label/sql/buys.sql

@@ -20,7 +20,8 @@ SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
 		i.stems,
 		b.id,
 		b.itemFk,
-		p.name producer
+		p.name producer,
+		i.comment
 	FROM buy b
 		JOIN item i ON i.id = b.itemFk
 		LEFT JOIN producer p ON p.id = i.producerFk