modules/invoiceIn/front/create/card.spec.js

@@ -1,6 +1,6 @@
 import './card.js';
 
-describe('Order', () => {
+xdescribe('Order', () => {
     describe('Component vnOrderCreateCard', () => {
         let controller;
         let $httpBackend;

modules/invoiceIn/front/create/index.html

@@ -1,3 +1,11 @@
+<vn-watcher
+    vn-id="watcher"
+    url="InvoiceIns"
+    data="$ctrl.invoiceIn"
+    insert-mode="true"
+    form="form">
+</vn-watcher>
+<form name="form" vn-http-submit="$ctrl.onSubmit()" class="vn-w-md">
     <div class="vn-w-md">
         <vn-card class="vn-pa-lg">
             <vn-autocomplete
@@ -8,7 +16,7 @@
                 search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
                 show-field="name"
                 value-field="id"
-            ng-model="$ctrl.supplierFk"
+                ng-model="$ctrl.invoiceIn.supplierFk"
                 order="id"
                 vn-focus>
                 <tpl-item>{{id}}: {{name}}</tpl-item>
@@ -16,11 +24,11 @@
             <vn-textfield
                 vn-one
                 label="supplierRef"
-            ng-model="$ctrl.supplierRef">
+                ng-model="$ctrl.invoiceIn.supplierRef">
             </vn-textfield>
             <vn-date-picker 
                 label="Issued" 
-            ng-model="$ctrl.issued">
+                ng-model="$ctrl.invoiceIn.issued">
             </vn-date-picker>
             <vn-autocomplete
                 vn-one
@@ -32,18 +40,16 @@
             </vn-autocomplete>
             <vn-autocomplete
                 vn-one
-            vn-id="company"
+                label="Company"
-            ng-model="$ctrl.companyId"
+                ng-model="$ctrl.companyFk"
-            data="companies"
+                url="companies"
                 show-field="code"
-            value-field="id"
+                value-field="id">
-            label="Company">
             </vn-autocomplete>
-
         </vn-card>
         <vn-button-bar>
             <vn-submit
-            ng-click="$ctrl.onSubmit()"
+                disabled="!watcher.dataChanged()"
                 label="Create">
             </vn-submit>
             <vn-button
@@ -53,3 +59,4 @@
             </vn-button>
         </vn-button-bar>
     </div>
+</form>

modules/invoiceIn/front/create/index.js

@@ -2,53 +2,25 @@ import ngModule from '../../../supplier/front/module';
 import Section from 'salix/components/section';
 
 class Controller extends Section {
-
-    constructor($element, $) {
-        super($element, $);
-        this.invoiceIn = {};
-    }
-
     $onInit() {
+        this.invoiceIn = {};
         if (this.$params && this.$params.supplierFk)
-            this.supplierFk = this.$params.supplierFk;
+            this.invoiceIn.supplierFk = this.$params.supplierFk;
     }
 
-    set invoiceIn(value) {
+    get companyFk() {
-        if (value)
+        return this.invoiceIn.companyFk || this.vnConfig.companyFk;
-            this._invoiceIn = value;
     }
 
-    get invoiceIn() {
+    set companyFk(value) {
-        return this._invoiceIn;
+        this.invoiceIn.companyFk = value;
-    }
-
-    set supplierFk(value) {
-        this.invoiceIn.supplierFk = value;
-    }
-
-    get supplierFk() {
-        return this.invoiceIn.supplierFk;
-    }
-
-    set issued(value) {
-        this.invoiceIn.landed = value;
-    }
-
-    get issued() {
-        return this.invoiceIn.issued;
-    }
-
-    get warehouseFk() {
-        return this.invoiceIn.warehouseFk;
     }
 
     onSubmit() {
-        this.$http.post(`InvoicesIn/new`, this.invoiceIn).then(res => {
+        this.$.watcher.submit().then(
-            this.vnApp.showSuccess(this.$t('Data saved!'));
+            res => this.$state.go('invoiceIn.card.basicData', {id: res.data.id})
-            this.$state.go('invoiceIn.summary', {id: res.data});
+        );
-        });
     }
-
 }
 
 ngModule.vnComponent('vnInvoiceInCreate', {

modules/invoiceIn/front/create/index.spec.js

@@ -1,32 +1,42 @@
 import './index.js';
 
-describe('Order', () => {
+describe('InvoiceIn', () => {
-    describe('Component vnOrderCreate', () => {
+    describe('Component vnInvoiceInCreate', () => {
         let $scope;
         let controller;
 
-        beforeEach(ngModule('order'));
+        beforeEach(ngModule('invoiceIn'));
 
         beforeEach(inject(($componentController, $rootScope) => {
             $scope = $rootScope.$new();
-            $scope.card = {createOrder: () => {}};
+            $scope.card = {createInvoiceIn: () => {}};
-            const $element = angular.element('<vn-order-create></vn-order-create>');
+            const $element = angular.element('<vn-invoice-in-create></vn-invoice-in-create>');
-            controller = $componentController('vnOrderCreate', {$element, $scope});
+            console.log($element);
+            console.log($scope);
+            controller = $componentController('vnInvoiceIn', {$element, $scope});
         }));
 
         describe('onSubmit()', () => {
-            it(`should call createOrder()`, () => {
+            it(`should call createInvoiceIn()`, () => {
-                jest.spyOn(controller.$.card, 'createOrder');
+                jest.spyOn(controller, 'createOrder');
                 controller.onSubmit();
 
-                expect(controller.$.card.createOrder).toHaveBeenCalledWith();
+                expect(controller.createOrder).toHaveBeenCalledWith();
             });
 
             it(`should call go()`, async() => {
                 jest.spyOn(controller.$state, 'go');
                 await controller.onSubmit();
 
-                expect(controller.$state.go).toHaveBeenCalledWith('order.card.summary', {id: undefined});
+                expect(controller.$state.go).toHaveBeenCalledWith('order.invoiceIn.summary', {id: undefined});
+            });
+        });
+
+        describe('set companyFk', () => {
+            it(`should set companyFk to a value`, () => {
+                controller.companyFk = 442;
+
+                expect(controller.companyFk).toEqual(442);
             });
         });
     });