diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html index f64009e994..db4f0261b8 100644 --- a/modules/claim/front/detail/index.html +++ b/modules/claim/front/detail/index.html @@ -107,9 +107,6 @@ - - No results - diff --git a/modules/client/front/credit-insurance/insurance/index/index.html b/modules/client/front/credit-insurance/insurance/index/index.html index 6d74d01ea2..b9a20bbb27 100644 --- a/modules/client/front/credit-insurance/insurance/index/index.html +++ b/modules/client/front/credit-insurance/insurance/index/index.html @@ -23,9 +23,6 @@ {{::insurance.created | date: 'dd/MM/yyyy'}} - - No results - diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html index 3e3866b8fc..16b678d2d5 100644 --- a/modules/client/front/greuge/index/index.html +++ b/modules/client/front/greuge/index/index.html @@ -37,9 +37,6 @@ {{::greuge.greugeType.name}} - - No results - diff --git a/modules/client/front/risk/index/index.html b/modules/client/front/risk/index/index.html index 43718bf358..97bb26666f 100644 --- a/modules/client/front/risk/index/index.html +++ b/modules/client/front/risk/index/index.html @@ -86,9 +86,6 @@ - - No results - diff --git a/modules/client/front/sample/index/index.html b/modules/client/front/sample/index/index.html index bc44265f36..50c25e3bbb 100644 --- a/modules/client/front/sample/index/index.html +++ b/modules/client/front/sample/index/index.html @@ -28,9 +28,6 @@ {{::sample.company.code}} - - No results - diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html index 94da3f9a59..cf7e8fbc23 100644 --- a/modules/client/front/web-payment/index.html +++ b/modules/client/front/web-payment/index.html @@ -47,9 +47,6 @@ - - No results - diff --git a/modules/item/front/history/index.html b/modules/item/front/history/index.html index f78ba9b967..4fbcb0cb7c 100644 --- a/modules/item/front/history/index.html +++ b/modules/item/front/history/index.html @@ -26,9 +26,6 @@ {{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}} - - No results - diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html index 6bf0720d22..8480dd8421 100644 --- a/modules/item/front/index/index.html +++ b/modules/item/front/index/index.html @@ -85,9 +85,6 @@ - - No results - diff --git a/modules/order/back/methods/order-row/specs/addToOrder.spec.js b/modules/order/back/methods/order-row/specs/addToOrder.spec.js index 13dfe26fb4..e96798c958 100644 --- a/modules/order/back/methods/order-row/specs/addToOrder.spec.js +++ b/modules/order/back/methods/order-row/specs/addToOrder.spec.js @@ -15,7 +15,7 @@ describe('order addToOrder()', () => { orderFk: 20, items: [{ itemFk: 1, - quantity: 1, + quantity: 10, warehouseFk: 1 }] }; diff --git a/modules/order/back/methods/order/updateBasicData.js b/modules/order/back/methods/order/updateBasicData.js index 821f5c836f..6a8148a21a 100644 --- a/modules/order/back/methods/order/updateBasicData.js +++ b/modules/order/back/methods/order/updateBasicData.js @@ -37,9 +37,9 @@ module.exports = Self => { let validUpdateParams = [ 'clientFk', - 'address_id', + 'addressFk', 'landed', - 'agency_id', + 'agencyModeFk', 'note', ]; diff --git a/modules/order/back/models/order.json b/modules/order/back/models/order.json index 00cff995a6..0ae4dfd7bc 100644 --- a/modules/order/back/models/order.json +++ b/modules/order/back/models/order.json @@ -26,6 +26,20 @@ "columnName": "customer_id" } }, + "addressFk": { + "type": "Number", + "required": true, + "mysql": { + "columnName": "address_id" + } + }, + "agencyModeFk": { + "type": "Number", + "required": true, + "mysql": { + "columnName": "agency_id" + } + }, "companyFk": { "type": "Number", "required": true, @@ -75,7 +89,6 @@ }, "address": { "type": "belongsTo", - "required": true, "model": "Address", "foreignKey": "address_id" }, diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html index bcfd8eb0f4..50e8c99019 100644 --- a/modules/order/front/basic-data/index.html +++ b/modules/order/front/basic-data/index.html @@ -34,7 +34,7 @@ search-function="{or: [{id: $search}, {nickname: {like: '%'+$search+'%'}}]}" show-field="nickname" value-field="id" - field="$ctrl.order.address_id"> + field="$ctrl.order.addressFk"> {{::nickname}} @@ -52,7 +52,7 @@ search-function="{or: [{id: $search}, {name: {like: '%'+$search+'%'}}]}" show-field="name" value-field="id" - field="$ctrl.order.agency_id"> + field="$ctrl.order.agencyModeFk"> {{::id}}: {{::name}} diff --git a/modules/order/front/basic-data/index.js b/modules/order/front/basic-data/index.js index 6b77aa50bf..e82d6a591d 100644 --- a/modules/order/front/basic-data/index.js +++ b/modules/order/front/basic-data/index.js @@ -9,12 +9,12 @@ class Controller { $scope.addressModel.where = {clientFk: newValue.id}; $scope.addressModel.refresh(); if (isDirty) - this.order.address_id = newValue.defaultAddressFk; + this.order.addressFk = newValue.defaultAddressFk; isDirty = true; } else { $scope.addressModel.clear(); if (isDirty) - this.order.address_id = null; + this.order.addressFk = null; } }); } diff --git a/modules/order/front/basic-data/index.spec.js b/modules/order/front/basic-data/index.spec.js index 1b45165307..54809f6d43 100644 --- a/modules/order/front/basic-data/index.spec.js +++ b/modules/order/front/basic-data/index.spec.js @@ -16,7 +16,7 @@ describe('Order', () => { .respond([{id: 2, nickname: 'address 2'}]); $httpBackend.whenGET(/^\/api\/Clients/) .respond([{id: 1, defaultAddressFk: 1}]); - $scope.order = {clientFk: 1, address_id: 1}; + $scope.order = {clientFk: 1, addressFk: 1}; let $element = $compile('')($scope); $httpBackend.flush(); @@ -28,7 +28,7 @@ describe('Order', () => { controller.selection = {id: 2, defaultAddressFk: 2}; $scope.$digest(); - expect(controller.order.address_id).toEqual(2); + expect(controller.order.addressFk).toEqual(2); }); }); }); diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index e3680cd4bb..3040801d6a 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -60,9 +60,6 @@ - - No results - Enter a new search diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html index c06642836a..acc6fd8920 100644 --- a/modules/order/front/volume/index.html +++ b/modules/order/front/volume/index.html @@ -43,9 +43,6 @@ {{::row.volume | number:3}} - - No results - diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html index 4ba6caf7c2..89256c95e5 100644 --- a/modules/ticket/front/sale-checked/index.html +++ b/modules/ticket/front/sale-checked/index.html @@ -37,9 +37,6 @@ {{::sale.quantity}} - - No results - diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html index 182cf07933..792d2d6373 100644 --- a/modules/ticket/front/sale-tracking/index.html +++ b/modules/ticket/front/sale-tracking/index.html @@ -48,9 +48,6 @@ {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} - - No results - diff --git a/modules/ticket/front/tracking/index/index.html b/modules/ticket/front/tracking/index/index.html index c5a8c993bf..711b7a35a6 100644 --- a/modules/ticket/front/tracking/index/index.html +++ b/modules/ticket/front/tracking/index/index.html @@ -26,9 +26,6 @@ {{::tracking.created | date:'dd/MM/yyyy HH:mm'}} - - No results - diff --git a/modules/ticket/front/weekly/index.html b/modules/ticket/front/weekly/index.html index eb111e8ab4..3ae3bf7e0e 100644 --- a/modules/ticket/front/weekly/index.html +++ b/modules/ticket/front/weekly/index.html @@ -56,9 +56,6 @@ - - No results - diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html index 2c744c705e..a4c2a6f254 100644 --- a/modules/worker/front/index/index.html +++ b/modules/worker/front/index/index.html @@ -48,10 +48,6 @@ - - No results - Enter a new search diff --git a/package-lock.json b/package-lock.json index 5b72e253f8..40c6bc490a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3762,7 +3762,7 @@ "dot-prop": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "integrity": "sha1-HxngwuGqDjJ5fEl5nyg3rGr2nFc=", "dev": true, "requires": { "is-obj": "^1.0.0" @@ -3935,7 +3935,7 @@ }, "jsonfile": { "version": "2.4.0", - "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { @@ -7863,7 +7863,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "^1.0.0", @@ -9671,7 +9671,7 @@ "dependencies": { "commander": { "version": "1.0.4", - "resolved": "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz", "integrity": "sha1-Xt6xruI8T7VBprcNaSq+8ZZpotM=", "dev": true, "requires": { @@ -11638,7 +11638,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -11650,7 +11650,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, @@ -12901,7 +12901,7 @@ }, "string-width": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -14368,7 +14368,7 @@ "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=", "dev": true, "requires": { "nopt": "~1.0.10" @@ -15966,7 +15966,7 @@ "write-file-atomic": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=", "dev": true, "requires": { "graceful-fs": "^4.1.11",