e2e/helpers/selectors.js

@@ -625,6 +625,7 @@ export default {
         selectAllSalesCheckbox: 'vn-ticket-sale vn-thead vn-check',
         secondSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(2) vn-check[ng-model="sale.checked"]',
         thirdSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(3) vn-check[ng-model="sale.checked"]',
+        fourthSaleCheckbox: 'vn-ticket-sale vn-tr:nth-child(4) vn-check[ng-model="sale.checked"]',
         deleteSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="delete"]',
         transferSaleButton: 'vn-ticket-sale vn-tool-bar > vn-button[icon="call_split"]',
         moveToTicketInput: 'form vn-input-number[ng-model="$ctrl.transfer.ticketId"] input',

e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js

@@ -251,7 +251,6 @@ describe('Ticket Edit sale path', () => {
         await page.waitToClick(selectors.ticketSales.moreMenu);
         await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
         await page.waitToClick(selectors.globalItems.acceptButton);
-        await page.waitToClick(selectors.globalItems.acceptButton);
         await page.waitForState('claim.card.basicData');
     });
 

loopback/locale/en.json

@@ -172,5 +172,6 @@
 	"Comment added to client": "Comment added to client",
 	"This ticket is already a refund": "This ticket is already a refund",
 	"A claim with that sale already exists": "A claim with that sale already exists",
-	"ASSIGN_ZONE_FIRST": "Assign zone first"
+	"Can't transfer claimed sales": "Can't transfer claimed sales",
+	"Invalid quantity": "Invalid quantity"
 }

modules/client/front/dms/edit/index.html

@@ -2,6 +2,11 @@
     vn-id="watcher"
     data="$ctrl.dms">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form
     name="form"
     ng-submit="$ctrl.onSubmit()"
@@ -29,7 +34,7 @@
                 <vn-autocomplete vn-one required="true"
                     label="Warehouse"
                     ng-model="$ctrl.dms.warehouseId"
-                    url="Warehouses"
+                    data="warehouses"
                     show-field="name"
                     value-field="id">
                 </vn-autocomplete>

modules/entry/front/basic-data/index.html

@@ -5,6 +5,11 @@
     form="form"
     save="patch">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form name="form" ng-submit="watcher.submit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -152,14 +157,14 @@
             <vn-autocomplete
                 label="Warehouse Out"
                 ng-model="$ctrl.travelFilterParams.warehouseOutFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>
             <vn-autocomplete
                 label="Warehouse In"
                 ng-model="$ctrl.travelFilterParams.warehouseInFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>

modules/item/front/descriptor/index.html

@@ -1,3 +1,8 @@
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <vn-descriptor-content
     module="item"
     description="$ctrl.item.name"
@@ -108,7 +113,9 @@
         <vn-autocomplete
             label="Warehouse"
             ng-model="$ctrl.warehouseFk"
-            url="Warehouses">
+            data="warehouses"
+            show-field="name"
+            value="id">
         </vn-autocomplete>
     </tpl-body>
     <tpl-buttons>

modules/item/front/request-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -35,7 +40,9 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses">
+                data="warehouses"
+                show-field="name"
+                value-field="id">
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal class="vn-px-lg">

modules/monitor/front/index/search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -83,7 +88,7 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses">
+                data="warehouses">
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one

modules/route/front/agency-term-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Agencies" 
+        data="agencies">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -17,7 +22,7 @@
                 ng-model="filter.agencyModeFk">
             </vn-autocomplete>
             <vn-autocomplete vn-one
-                url="Agencies"
+                data="agencies"
                 label="Agency Agreement"
                 show-field="name"
                 value-field="id"

modules/route/front/search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -79,7 +84,7 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>

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

@@ -101,6 +101,9 @@ module.exports = Self => {
                 }
             }
 
+            const query = `CALL vn.ticket_recalc(?)`;
+            await Self.rawSql(query, [refundTicket.id], myOptions);
+
             if (tx) await tx.commit();
 
             return refundTicket;

modules/ticket/front/advance-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-date-picker
@@ -49,7 +54,9 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses"
+                data="warehouses"
+                show-field="name"
+                value-field="id"
                 required="true">
             </vn-autocomplete>
         </vn-horizontal>

modules/ticket/front/basic-data/step-one/index.html

@@ -4,6 +4,11 @@
     order="name"
     auto-load="true">
 </vn-crud-model>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form name="form">
     <vn-card class="vn-w-md vn-pa-lg">
         <vn-horizontal>
@@ -25,7 +30,7 @@
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 required="true"
-                url="Warehouses"
+                data="warehouses"
                 label="Warehouse"
                 show-field="name"
                 value-field="id"

modules/ticket/front/dms/edit/index.html

@@ -2,6 +2,11 @@
     vn-id="watcher"
     data="$ctrl.dms">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form
     name="form"
     ng-submit="$ctrl.onSubmit()"
@@ -29,7 +34,7 @@
                 <vn-autocomplete vn-one required="true"
                     label="Warehouse"
                     ng-model="$ctrl.dms.warehouseId"
-                    url="Warehouses"
+                    data="warehouses"
                     show-field="name"
                     value-field="id">
                 </vn-autocomplete>

modules/ticket/front/future-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-date-picker
@@ -83,7 +88,9 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses"
+                data="warehouses"
+                show-field="name"
+                value-field="id"
                 required="true">
             </vn-autocomplete>
         </vn-horizontal>

modules/ticket/front/sale/index.html

@@ -61,20 +61,20 @@
                     </vn-th>
                     <vn-th shrink></vn-th>
                     <vn-th shrink></vn-th>
-                    <vn-th shrink>Visible</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('visible')" field="visible" shrink>Visible</vn-th>
-                    <vn-th shrink>Available</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('available')" field="available" shrink>Available</vn-th>
-                    <vn-th>Id</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('itemFk')" field="itemFk">Id</vn-th>
-                    <vn-th shrink>Quantity</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('quantity')" field="quantity" shrink>Quantity</vn-th>
-                    <vn-th expand>Item</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('concept')" field="concept" expand>Item</vn-th>
-                    <vn-th number>Price</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('price')" field="price" number>Price</vn-th>
-                    <vn-th number>Disc</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('discount')" field="discount" number>Disc</vn-th>
-                    <vn-th number>Amount</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('amount')" field="amount" number>Amount</vn-th>
-                    <vn-th shrink>Packaging</vn-th>
+                    <vn-th ng-click="$ctrl.sortBy('itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
                     <vn-th shrink></vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
-                <vn-tr ng-repeat="sale in $ctrl.sales">
+                <vn-tr ng-repeat="sale in $ctrl.sales | orderBy: $ctrl.propertyName:$ctrl.reverse">
                     <vn-td shrink>
                         <vn-check tabindex="-1"
                             ng-model="sale.checked">
@@ -481,7 +481,7 @@
     on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)">
 </vn-confirm>
 
-<vn-confirm 
+<vn-confirm
     vn-id="claimConfirm"
     question="Do you want to continue?"
     message="Claim out of time"
@@ -491,7 +491,7 @@
 <vn-confirm
     vn-id="claimSure"
     message="Do you want to create a claim?"
-    on-accept="$ctrl.createClaim()">
+    on-accept="$ctrl.onCreateClaimAccepted()">
 </vn-confirm>
 
 <vn-menu vn-id="moreOptions">
@@ -513,9 +513,9 @@
     </vn-item>
     <vn-item translate
         name="claim"
-        ng-click="claimSure.show()"
+        ng-click="$ctrl.createClaim()"
         ng-if="$ctrl.isClaimable">
-        Add claim 
+        Add claim
     </vn-item>
     <vn-item translate
         name="reserve"

modules/ticket/front/sale/index.js

@@ -10,6 +10,11 @@ class Controller extends Section {
         this.getConfig();
     }
 
+    sortBy(propertyName) {
+        this.reverse = (this.propertyName === propertyName) ? !this.reverse : false;
+        this.propertyName = propertyName;
+    }
+
     get manaCode() {
         return this._manaCode;
     }
@@ -203,7 +208,7 @@ class Controller extends Section {
         if (pastDays >= this.ticketConfig[0].daysForWarningClaim)
             this.$.claimConfirm.show();
         else
-            this.onCreateClaimAccepted();
+            this.$.claimSure.show();
     }
 
     onCreateClaimAccepted() {

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

@@ -758,5 +758,15 @@ describe('Ticket', () => {
                 expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
             });
         });
+
+        describe('sortBy()', () => {
+            it('should set reverse and propertyName properties', () => {
+                const propertyName = 'id';
+                controller.sortBy(propertyName);
+
+                expect(controller.propertyName).toEqual(propertyName);
+                expect(controller.reverse).toEqual(false);
+            });
+        });
     });
 });

modules/ticket/front/search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
         <vn-horizontal class="vn-px-lg vn-pt-lg">
             <vn-textfield
@@ -102,7 +107,7 @@
                 vn-one
                 label="Warehouse"
                 ng-model="filter.warehouseFk"
-                url="Warehouses">
+                data="warehouses">
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one

modules/travel/front/extra-community-search-panel/index.html

@@ -1,4 +1,9 @@
 <div class="search-panel">
+    <vn-crud-model
+        auto-load="true" 
+        url="Warehouses" 
+        data="warehouses">
+    </vn-crud-model>
     <form ng-submit="$ctrl.onSearch()">
         <vn-horizontal>
             <vn-textfield
@@ -52,14 +57,14 @@
             <vn-autocomplete vn-one
                 label="Warehouse Out"
                 ng-model="filter.warehouseOutFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 label="Warehouse In"
                 ng-model="filter.warehouseInFk"
-                url="Warehouses"
+                data="warehouses"
                 show-field="name"
                 value-field="id">
             </vn-autocomplete>

modules/worker/front/dms/create/index.html

@@ -3,6 +3,11 @@
     vn-id="watcher"
     data="$ctrl.dms">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form
     name="form"
     ng-submit="$ctrl.onSubmit()"
@@ -30,7 +35,7 @@
                 <vn-autocomplete vn-one
                     label="Warehouse"
                     ng-model="$ctrl.dms.warehouseId"
-                    url="Warehouses"
+                    data="warehouses"
                     show-field="name"
                     value-field="id">
                 </vn-autocomplete>

modules/worker/front/dms/create/index.spec.js

@@ -17,6 +17,7 @@ describe('Client', () => {
             $element = $compile(`<vn-worker-dms-create></vn-worker-dms-create>`)($rootScope);
             controller = $element.controller('vnWorkerDmsCreate');
             controller._worker = {id: 1101, name: 'Bruce wayne'};
+            $httpBackend.whenRoute('GET', `Warehouses?filter=%7B%7D`).respond([{$oldData: {}}]);
         }));
 
         describe('worker() setter', () => {

modules/worker/front/dms/edit/index.html

@@ -2,6 +2,11 @@
     vn-id="watcher"
     data="$ctrl.dms">
 </vn-watcher>
+<vn-crud-model
+    auto-load="true" 
+    url="Warehouses" 
+    data="warehouses">
+</vn-crud-model>
 <form
     name="form"
     ng-submit="$ctrl.onSubmit()"
@@ -29,7 +34,7 @@
                 <vn-autocomplete vn-one required="true"
                     label="Warehouse"
                     ng-model="$ctrl.dms.warehouseId"
-                    url="Warehouses"
+                    data="warehouses"
                     show-field="name"
                     value-field="id">
                 </vn-autocomplete>