requested changes

db/changes/10491-august/00-defaultPayDem_sameAs_production.sql

@@ -1,2 +1,2 @@
-INSERT INTO vn.payDem (id,payDem)
+INSERT INTO `vn`.`payDem` (id,payDem)
 	VALUES (7,'0');

db/changes/10491-august/00-payMethodFk_Allow_Null.sql

@@ -1 +1 @@
-ALTER TABLE vn.supplier MODIFY COLUMN payMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`supplier` MODIFY COLUMN payMethodFk tinyint(3) unsigned NULL;

db/changes/10491-august/00-supplierActivityFk_Allow_Null.sql

@@ -1 +1 @@
-ALTER TABLE vn.supplier MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+ALTER TABLE `vn`.`supplier` MODIFY COLUMN supplierActivityFk varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;

modules/supplier/back/methods/supplier/newSupplier.js

@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethod('newSupplier', {
-        description: 'returns the created item',
+        description: 'Creates a new supplier and returns it',
         accessType: 'WRITE',
         accepts: [{
             arg: 'params',
@@ -33,12 +33,11 @@ module.exports = Self => {
 
         try {
             const supplier = await models.Supplier.create(params, myOptions);
+            console.log('supplier: ', supplier);
 
             if (tx) await tx.commit();
 
-            return {
-                supplier
-            };
+            return supplier;
         } catch (e) {
             if (tx) await tx.rollback();
             return params;

modules/supplier/back/methods/supplier/specs/newSupplier.spec.js

@@ -26,31 +26,7 @@ describe('Supplier newSupplier()', () => {
 
         expect(createdSupplier.id).toEqual(result.id);
         expect(createdSupplier.name).toEqual(result.name);
-        expect(createdSupplier.account).toBeNull();
-        expect(createdSupplier.nif).toBeNull();
-        expect(createdSupplier.phone).toBeNull();
-        expect(createdSupplier.retAccount).toBeNull();
-        expect(createdSupplier.commission).toBeFalse();
-        expect(createdSupplier.created).toBeDefined();
-        expect(createdSupplier.postcodeFk).toBeNull();
-        expect(createdSupplier.isActive).toBeTrue();
-        expect(createdSupplier.isOfficial).toBeTrue();
-        expect(createdSupplier.isSerious).toBeTrue();
-        expect(createdSupplier.note).toBeNull();
-        expect(createdSupplier.street).toBeNull();
-        expect(createdSupplier.city).toBeNull();
-        expect(createdSupplier.provinceFk).toBeNull();
-        expect(createdSupplier.postCode).toBeNull();
-        expect(createdSupplier.payMethodFk).toBeNull();
         expect(createdSupplier.payDemFk).toEqual(7);
-        expect(createdSupplier.payDay).toBeNull();
         expect(createdSupplier.nickname).toEqual(result.name);
-        expect(createdSupplier.workerFk).toBeNull();
-        expect(createdSupplier.sageTaxTypeFk).toBeNull();
-        expect(createdSupplier.sageTransactionTypeFk).toBeNull();
-        expect(createdSupplier.sageWithholdingFk).toBeNull();
-        expect(createdSupplier.isPayMethodChecked).toBeFalse();
-        expect(createdSupplier.supplierActivityFk).toBeNull();
-        expect(createdSupplier.healthRegister).toBeNull();
     });
 });

modules/supplier/front/create/index.html

@@ -5,13 +5,6 @@
     insert-mode="true"
     form="form">
 </vn-watcher>
-<vn-crud-model
-    auto-load="true"
-    url="Origins"
-    data="originsData"
-    order="name"
-    vn-id="origin-model">
-</vn-crud-model>
 <form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>

modules/supplier/front/create/index.js

@@ -9,13 +9,7 @@ class Controller extends Section {
     onSubmit() {
         this.$.watcher.submit().then(
             json => {
-                this.$state.go('item.card.basicData', {id: json.data.id});
-
-                redirect(this.$.$ctrl);
-
-                function redirect(ctrl) {
-                    window.location.href = `/#!/supplier/${ctrl.supplier.supplier.id}/fiscal-data`;
-                }
+                this.$state.go(`supplier.card.fiscalData`, {id: json.data.id});
             }
         );
     }

modules/supplier/front/routes.json

@@ -56,6 +56,7 @@
             "url": "/create",
             "state": "supplier.create",
             "component": "vn-supplier-create",
+            "acl": ["administrative"],
             "description": "New supplier"
         }, 
         {