2770 - Added supplier addresses section
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
b41b0ca15a
commit
330b6bdf8a
|
@ -0,0 +1,18 @@
|
||||||
|
CREATE TABLE `vn`.`supplierAddress`
|
||||||
|
(
|
||||||
|
id INT NULL AUTO_INCREMENT,
|
||||||
|
supplierFk INT NULL,
|
||||||
|
nickname VARCHAR(40) NULL,
|
||||||
|
street VARCHAR(255) NULL,
|
||||||
|
provinceFk SMALLINT(6) UNSIGNED NULL,
|
||||||
|
postalCode VARCHAR(10) NULL,
|
||||||
|
city VARCHAR(50) NULL,
|
||||||
|
phone VARCHAR(15) NULL,
|
||||||
|
mobile VARCHAR(15) NULL,
|
||||||
|
CONSTRAINT supplierAddress_pk
|
||||||
|
PRIMARY KEY (id),
|
||||||
|
CONSTRAINT supplierAddress_province_fk
|
||||||
|
FOREIGN KEY (provinceFk) REFERENCES province (id)
|
||||||
|
ON UPDATE CASCADE
|
||||||
|
);
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<vn-portal slot="topbar">
|
<vn-portal slot="topbar">
|
||||||
<vn-searchbar
|
<vn-searchbar
|
||||||
placeholder="Search by address"
|
placeholder="Search by consignee"
|
||||||
info="You can search by address id or name"
|
info="You can search by consignee id or name"
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
auto-state="false">
|
auto-state="false">
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
ui-sref="client.card.address.edit({addressId: {{::address.id}}})"
|
ui-sref="client.card.address.edit({addressId: {{::address.id}}})"
|
||||||
class="vn-pa-sm border-solid border-radius"
|
class="vn-pa-sm border-solid border-radius"
|
||||||
ng-class="{'item-disabled': !address.isActive}"
|
ng-class="{'item-disabled': !address.isActive}"
|
||||||
translate-attr="{title: 'Edit address'}">
|
translate-attr="{title: 'Edit consignee'}">
|
||||||
<vn-none
|
<vn-none
|
||||||
class="vn-pr-sm"
|
class="vn-pr-sm"
|
||||||
ng-click="$ctrl.onStarClick($event)">
|
ng-click="$ctrl.onStarClick($event)">
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
<vn-float-button
|
<vn-float-button
|
||||||
vn-bind="+"
|
vn-bind="+"
|
||||||
fixed-bottom-right
|
fixed-bottom-right
|
||||||
vn-tooltip="New address"
|
vn-tooltip="New consignee"
|
||||||
ui-sref="client.card.address.create"
|
ui-sref="client.card.address.create"
|
||||||
icon="add"
|
icon="add"
|
||||||
label="Add">
|
label="Add">
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Index
|
# Index
|
||||||
Set as default: Establecer como predeterminado
|
Set as default: Establecer como predeterminado
|
||||||
Active first to set as default: Active primero para marcar como predeterminado
|
Active first to set as default: Active primero para marcar como predeterminado
|
||||||
Search by address: Buscar por consignatario
|
Search by consignee: Buscar por consignatario
|
||||||
You can search by address id or name: Puedes buscar por el id o nombre del consignatario
|
You can search by consignee id or name: Puedes buscar por el id o nombre del consignatario
|
||||||
# Edit
|
# Edit
|
||||||
Enabled: Activo
|
Enabled: Activo
|
||||||
Is equalizated: Recargo de equivalencia
|
Is equalizated: Recargo de equivalencia
|
||||||
|
|
|
@ -36,9 +36,9 @@ Clients: Clientes
|
||||||
New client: Nuevo cliente
|
New client: Nuevo cliente
|
||||||
Fiscal data: Datos fiscales
|
Fiscal data: Datos fiscales
|
||||||
Billing data: Forma de pago
|
Billing data: Forma de pago
|
||||||
Addresses: Consignatarios
|
Consignees: Consignatarios
|
||||||
New address: Nuevo consignatario
|
New consignee: Nuevo consignatario
|
||||||
Edit address: Editar consignatario
|
Edit consignee: Editar consignatario
|
||||||
Web access: Acceso web
|
Web access: Acceso web
|
||||||
Notes: Notas
|
Notes: Notas
|
||||||
New note: Nueva nota
|
New note: Nueva nota
|
||||||
|
|
|
@ -102,7 +102,7 @@
|
||||||
"url": "/index?q",
|
"url": "/index?q",
|
||||||
"state": "client.card.address.index",
|
"state": "client.card.address.index",
|
||||||
"component": "vn-client-address-index",
|
"component": "vn-client-address-index",
|
||||||
"description": "Addresses",
|
"description": "Consignees",
|
||||||
"params": {
|
"params": {
|
||||||
"client": "$ctrl.client"
|
"client": "$ctrl.client"
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,90 @@
|
||||||
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
|
||||||
|
module.exports = function(Self) {
|
||||||
|
Self.remoteMethodCtx('createAddress', {
|
||||||
|
description: 'Creates a supplier address',
|
||||||
|
accepts: [{
|
||||||
|
arg: 'id',
|
||||||
|
type: 'number',
|
||||||
|
description: 'The supplier id',
|
||||||
|
http: {source: 'path'}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'nickname',
|
||||||
|
type: 'string',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'city',
|
||||||
|
type: 'string',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'street',
|
||||||
|
type: 'string',
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'phone',
|
||||||
|
type: 'string'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'mobile',
|
||||||
|
type: 'string'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'postalCode',
|
||||||
|
type: 'string'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arg: 'provinceFk',
|
||||||
|
type: 'number'
|
||||||
|
}],
|
||||||
|
returns: {
|
||||||
|
root: true,
|
||||||
|
type: 'Object'
|
||||||
|
},
|
||||||
|
http: {
|
||||||
|
verb: 'post',
|
||||||
|
path: '/:id/createAddress'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Self.createAddress = async(ctx, clientFk) => {
|
||||||
|
const models = Self.app.models;
|
||||||
|
const args = ctx.args;
|
||||||
|
const tx = await models.Address.beginTransaction({});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const options = {transaction: tx};
|
||||||
|
const province = await models.Province.findById(args.provinceFk, {
|
||||||
|
include: {
|
||||||
|
relation: 'country'
|
||||||
|
}
|
||||||
|
}, options);
|
||||||
|
|
||||||
|
const isUeeMember = province.country().isUeeMember;
|
||||||
|
if (!isUeeMember && !args.incotermsFk)
|
||||||
|
throw new UserError(`Incoterms is required for a non UEE member`);
|
||||||
|
|
||||||
|
if (!isUeeMember && !args.customsAgentFk)
|
||||||
|
throw new UserError(`Customs agent is required for a non UEE member`);
|
||||||
|
|
||||||
|
delete args.ctx; // Remove unwanted properties
|
||||||
|
const newAddress = await models.Address.create(args, options);
|
||||||
|
const client = await Self.findById(clientFk, null, options);
|
||||||
|
|
||||||
|
if (args.isDefaultAddress) {
|
||||||
|
await client.updateAttributes({
|
||||||
|
defaultAddressFk: newAddress.id
|
||||||
|
}, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
await tx.commit();
|
||||||
|
return newAddress;
|
||||||
|
} catch (e) {
|
||||||
|
await tx.rollback();
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
|
@ -1,8 +1,14 @@
|
||||||
{
|
{
|
||||||
|
"PayDem": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"Supplier": {
|
"Supplier": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"PayDem": {
|
"SupplierAddress": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"SupplierAccount": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
"SupplierLog": {
|
"SupplierLog": {
|
||||||
|
@ -10,8 +16,5 @@
|
||||||
},
|
},
|
||||||
"SupplierContact": {
|
"SupplierContact": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
|
||||||
"SupplierAccount": {
|
|
||||||
"dataSource": "vn"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
module.exports = Self => {
|
||||||
|
Self.validateAsync('postalCode', hasValidPostcode, {
|
||||||
|
message: `The postcode doesn't exist. Please enter a correct one`
|
||||||
|
});
|
||||||
|
|
||||||
|
async function hasValidPostcode(err, done) {
|
||||||
|
if (!this.postalCode)
|
||||||
|
return done();
|
||||||
|
|
||||||
|
const models = Self.app.models;
|
||||||
|
const postcode = await models.Postcode.findById(this.postalCode);
|
||||||
|
|
||||||
|
if (!postcode) err();
|
||||||
|
done();
|
||||||
|
}
|
||||||
|
};
|
|
@ -0,0 +1,55 @@
|
||||||
|
{
|
||||||
|
"name": "SupplierAddress",
|
||||||
|
"description": "Supplier addresses",
|
||||||
|
"base": "Loggable",
|
||||||
|
"log": {
|
||||||
|
"model": "SupplierLog",
|
||||||
|
"relation": "supplier",
|
||||||
|
"showField": "name"
|
||||||
|
},
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "supplierAddress"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "Number",
|
||||||
|
"id": true,
|
||||||
|
"description": "Identifier"
|
||||||
|
},
|
||||||
|
"nickname": {
|
||||||
|
"type": "string",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"street": {
|
||||||
|
"type": "string",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"city": {
|
||||||
|
"type": "string",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"postalCode": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"phone": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"mobile": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"province": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "Province",
|
||||||
|
"foreignKey": "provinceFk"
|
||||||
|
},
|
||||||
|
"supplier": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "Supplier",
|
||||||
|
"foreignKey": "supplierFk"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -149,6 +149,11 @@
|
||||||
"type": "belongsTo",
|
"type": "belongsTo",
|
||||||
"model": "SageWithholding",
|
"model": "SageWithholding",
|
||||||
"foreignKey": "sageWithholdingFk"
|
"foreignKey": "sageWithholdingFk"
|
||||||
|
},
|
||||||
|
"addresses": {
|
||||||
|
"type": "hasMany",
|
||||||
|
"model": "SupplierAddress",
|
||||||
|
"foreignKey": "supplierFk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"acls": [
|
"acls": [
|
||||||
|
|
|
@ -0,0 +1,109 @@
|
||||||
|
<vn-watcher
|
||||||
|
vn-id="watcher"
|
||||||
|
url="SupplierAddresses"
|
||||||
|
id-field="id"
|
||||||
|
data="$ctrl.address"
|
||||||
|
params="$ctrl.address"
|
||||||
|
insert-mode="true"
|
||||||
|
form="form">
|
||||||
|
</vn-watcher>
|
||||||
|
<vn-crud-model
|
||||||
|
auto-load="true"
|
||||||
|
url="Provinces/location"
|
||||||
|
data="provincesLocation"
|
||||||
|
order="id">
|
||||||
|
</vn-crud-model>
|
||||||
|
<form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
|
||||||
|
<vn-card class="vn-pa-lg">
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Name"
|
||||||
|
ng-model="$ctrl.address.nickname"
|
||||||
|
rule
|
||||||
|
vn-focus>
|
||||||
|
</vn-textfield>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Street address"
|
||||||
|
ng-model="$ctrl.address.street"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-datalist vn-one
|
||||||
|
label="Postcode"
|
||||||
|
ng-model="$ctrl.address.postalCode"
|
||||||
|
selection="$ctrl.postcode"
|
||||||
|
url="Postcodes/location"
|
||||||
|
fields="['code','townFk']"
|
||||||
|
order="code, townFk"
|
||||||
|
value-field="code"
|
||||||
|
show-field="code"
|
||||||
|
rule>
|
||||||
|
<tpl-item>
|
||||||
|
{{code}} - {{town.name}} ({{town.province.name}},
|
||||||
|
{{town.province.country.country}})
|
||||||
|
</tpl-item>
|
||||||
|
<append>
|
||||||
|
<vn-icon-button
|
||||||
|
icon="add_circle"
|
||||||
|
vn-tooltip="New postcode"
|
||||||
|
ng-click="postcode.open()"
|
||||||
|
vn-acl="deliveryBoss"
|
||||||
|
vn-acl-action="remove">
|
||||||
|
</vn-icon-button>
|
||||||
|
</append>
|
||||||
|
</vn-datalist>
|
||||||
|
<vn-datalist vn-id="town" vn-one
|
||||||
|
label="City"
|
||||||
|
ng-model="$ctrl.address.city"
|
||||||
|
selection="$ctrl.town"
|
||||||
|
url="Towns/location"
|
||||||
|
fields="['id', 'name', 'provinceFk']"
|
||||||
|
show-field="name"
|
||||||
|
value-field="name">
|
||||||
|
<tpl-item>
|
||||||
|
{{name}}, {{province.name}}
|
||||||
|
({{province.country.country}})
|
||||||
|
</tpl-item>
|
||||||
|
</vn-datalist>
|
||||||
|
<vn-autocomplete vn-id="province" vn-one
|
||||||
|
label="Province"
|
||||||
|
ng-model="$ctrl.address.provinceFk"
|
||||||
|
data="provincesLocation"
|
||||||
|
fields="['id', 'name', 'countryFk']"
|
||||||
|
show-field="name"
|
||||||
|
value-field="id"
|
||||||
|
rule>
|
||||||
|
<tpl-item>{{name}} ({{country.country}})</tpl-item>
|
||||||
|
</vn-autocomplete>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Phone"
|
||||||
|
ng-model="$ctrl.address.phone"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Mobile"
|
||||||
|
ng-model="$ctrl.address.mobile"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
</vn-card>
|
||||||
|
<vn-button-bar>
|
||||||
|
<vn-submit label="Save"></vn-submit>
|
||||||
|
<vn-button
|
||||||
|
label="Cancel"
|
||||||
|
ui-sref="supplier.card.address.index">
|
||||||
|
</vn-button>
|
||||||
|
</vn-button-bar>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- New postcode dialog -->
|
||||||
|
<vn-geo-postcode vn-id="postcode"
|
||||||
|
on-response="$ctrl.onResponse($response)">
|
||||||
|
</vn-geo-postcode>
|
|
@ -0,0 +1,74 @@
|
||||||
|
import ngModule from '../../module';
|
||||||
|
import Section from 'salix/components/section';
|
||||||
|
|
||||||
|
export default class Controller extends Section {
|
||||||
|
constructor($element, $) {
|
||||||
|
super($element, $);
|
||||||
|
|
||||||
|
this.address = {
|
||||||
|
supplierFk: this.$params.id
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit() {
|
||||||
|
this.$.watcher.submit().then(res => {
|
||||||
|
this.$state.go('supplier.card.address.index');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
get town() {
|
||||||
|
return this._town;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Town auto complete
|
||||||
|
set town(selection) {
|
||||||
|
this._town = selection;
|
||||||
|
|
||||||
|
if (!selection) return;
|
||||||
|
|
||||||
|
const province = selection.province;
|
||||||
|
const postcodes = selection.postcodes;
|
||||||
|
|
||||||
|
if (!this.address.provinceFk)
|
||||||
|
this.address.provinceFk = province.id;
|
||||||
|
|
||||||
|
if (postcodes.length === 1)
|
||||||
|
this.address.postalCode = postcodes[0].code;
|
||||||
|
}
|
||||||
|
|
||||||
|
get postcode() {
|
||||||
|
return this._postcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Postcode auto complete
|
||||||
|
set postcode(selection) {
|
||||||
|
this._postcode = selection;
|
||||||
|
|
||||||
|
if (!selection) return;
|
||||||
|
|
||||||
|
const town = selection.town;
|
||||||
|
const province = town.province;
|
||||||
|
|
||||||
|
if (!this.address.city)
|
||||||
|
this.address.city = town.name;
|
||||||
|
|
||||||
|
if (!this.address.provinceFk)
|
||||||
|
this.address.provinceFk = province.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
onResponse(response) {
|
||||||
|
this.address.postalCode = response.code;
|
||||||
|
this.address.city = response.city;
|
||||||
|
this.address.provinceFk = response.provinceFk;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Controller.$inject = ['$element', '$scope'];
|
||||||
|
|
||||||
|
ngModule.vnComponent('vnSupplierAddressCreate', {
|
||||||
|
template: require('./index.html'),
|
||||||
|
controller: Controller,
|
||||||
|
bindings: {
|
||||||
|
supplier: '<'
|
||||||
|
}
|
||||||
|
});
|
|
@ -0,0 +1,102 @@
|
||||||
|
import './index';
|
||||||
|
import watcher from 'core/mocks/watcher';
|
||||||
|
|
||||||
|
describe('Supplier', () => {
|
||||||
|
describe('Component vnSupplierAddressCreate', () => {
|
||||||
|
let $scope;
|
||||||
|
let controller;
|
||||||
|
let $element;
|
||||||
|
let $state;
|
||||||
|
|
||||||
|
beforeEach(ngModule('supplier'));
|
||||||
|
|
||||||
|
beforeEach(inject(($componentController, $rootScope, _$state_) => {
|
||||||
|
$scope = $rootScope.$new();
|
||||||
|
$state = _$state_;
|
||||||
|
$state.params.id = '1234';
|
||||||
|
$element = angular.element('<vn-supplier-address-create></vn-supplier-address-create>');
|
||||||
|
controller = $componentController('vnSupplierAddressCreate', {$element, $scope});
|
||||||
|
controller.$.watcher = watcher;
|
||||||
|
controller.$.watcher.submit = () => {
|
||||||
|
return {
|
||||||
|
then: callback => {
|
||||||
|
callback({data: {id: 124}});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
controller.supplier = {id: 1};
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('onSubmit()', () => {
|
||||||
|
it('should perform a PATCH and then redirect to the main section', () => {
|
||||||
|
jest.spyOn(controller.$state, 'go');
|
||||||
|
controller.onSubmit();
|
||||||
|
|
||||||
|
expect(controller.$state.go).toHaveBeenCalledWith('supplier.card.address.index');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('town() setter', () => {
|
||||||
|
it(`should set provinceFk property`, () => {
|
||||||
|
controller.town = {
|
||||||
|
provinceFk: 1,
|
||||||
|
code: 46001,
|
||||||
|
province: {
|
||||||
|
id: 1,
|
||||||
|
name: 'New york',
|
||||||
|
country: {
|
||||||
|
id: 2,
|
||||||
|
name: 'USA'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
postcodes: []
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(controller.address.provinceFk).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`should set provinceFk property and fill the postalCode if there's just one`, () => {
|
||||||
|
controller.town = {
|
||||||
|
provinceFk: 1,
|
||||||
|
code: 46001,
|
||||||
|
province: {
|
||||||
|
id: 1,
|
||||||
|
name: 'New york',
|
||||||
|
country: {
|
||||||
|
id: 2,
|
||||||
|
name: 'USA'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
postcodes: [{code: '46001'}]
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(controller.address.provinceFk).toEqual(1);
|
||||||
|
expect(controller.address.postalCode).toEqual('46001');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('postcode() setter', () => {
|
||||||
|
it(`should set the town and province properties`, () => {
|
||||||
|
controller.postcode = {
|
||||||
|
townFk: 1,
|
||||||
|
code: 46001,
|
||||||
|
town: {
|
||||||
|
id: 1,
|
||||||
|
name: 'New York',
|
||||||
|
province: {
|
||||||
|
id: 1,
|
||||||
|
name: 'New york',
|
||||||
|
country: {
|
||||||
|
id: 2,
|
||||||
|
name: 'USA'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
expect(controller.address.city).toEqual('New York');
|
||||||
|
expect(controller.address.provinceFk).toEqual(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,104 @@
|
||||||
|
|
||||||
|
<mg-ajax
|
||||||
|
path="SupplierAddresses/{{edit.params.addressId}}"
|
||||||
|
actions="$ctrl.address = edit.model"
|
||||||
|
options="mgEdit">
|
||||||
|
</mg-ajax>
|
||||||
|
<vn-watcher
|
||||||
|
vn-id="watcher"
|
||||||
|
url="SupplierAddresses"
|
||||||
|
id-field="id"
|
||||||
|
data="$ctrl.address"
|
||||||
|
form="form">
|
||||||
|
</vn-watcher>
|
||||||
|
<form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
|
||||||
|
<vn-card class="vn-pa-lg">
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Name"
|
||||||
|
ng-model="$ctrl.address.nickname"
|
||||||
|
rule
|
||||||
|
vn-focus>
|
||||||
|
</vn-textfield>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Street"
|
||||||
|
ng-model="$ctrl.address.street"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-datalist vn-one
|
||||||
|
label="Postcode"
|
||||||
|
ng-model="$ctrl.address.postalCode"
|
||||||
|
selection="$ctrl.postcode"
|
||||||
|
url="Postcodes/location"
|
||||||
|
fields="['code','townFk']"
|
||||||
|
order="code, townFk"
|
||||||
|
value-field="code"
|
||||||
|
show-field="code"
|
||||||
|
rule>
|
||||||
|
<tpl-item>
|
||||||
|
{{code}} - {{town.name}} ({{town.province.name}},
|
||||||
|
{{town.province.country.country}})
|
||||||
|
</tpl-item>
|
||||||
|
<append>
|
||||||
|
<vn-icon-button
|
||||||
|
icon="add_circle"
|
||||||
|
vn-tooltip="New postcode"
|
||||||
|
ng-click="postcode.open()"
|
||||||
|
vn-acl="deliveryBoss"
|
||||||
|
vn-acl-action="remove">
|
||||||
|
</vn-icon-button>
|
||||||
|
</append>
|
||||||
|
</vn-datalist>
|
||||||
|
<vn-datalist vn-id="town" vn-one
|
||||||
|
label="City"
|
||||||
|
ng-model="$ctrl.address.city"
|
||||||
|
selection="$ctrl.town"
|
||||||
|
url="Towns/location"
|
||||||
|
fields="['id', 'name', 'provinceFk']"
|
||||||
|
show-field="name"
|
||||||
|
value-field="name">
|
||||||
|
<tpl-item>
|
||||||
|
{{name}}, {{province.name}}
|
||||||
|
({{province.country.country}})
|
||||||
|
</tpl-item>
|
||||||
|
</vn-datalist>
|
||||||
|
<vn-autocomplete vn-id="province" vn-one
|
||||||
|
label="Province"
|
||||||
|
ng-model="$ctrl.address.provinceFk"
|
||||||
|
url="Provinces/location"
|
||||||
|
fields="['id', 'name', 'countryFk']"
|
||||||
|
show-field="name"
|
||||||
|
value-field="id"
|
||||||
|
rule>
|
||||||
|
<tpl-item>{{name}} ({{country.country}})</tpl-item>
|
||||||
|
</vn-autocomplete>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Phone"
|
||||||
|
ng-model="$ctrl.address.phone"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
<vn-textfield
|
||||||
|
vn-one
|
||||||
|
label="Mobile"
|
||||||
|
ng-model="$ctrl.address.mobile"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
</vn-card>
|
||||||
|
<vn-button-bar>
|
||||||
|
<vn-submit label="Save"></vn-submit>
|
||||||
|
<vn-button label="Cancel" ui-sref="supplier.card.address.index"></vn-button>
|
||||||
|
</vn-button-bar>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- New postcode dialog -->
|
||||||
|
<vn-geo-postcode vn-id="postcode"
|
||||||
|
on-response="$ctrl.onResponse($response)">
|
||||||
|
</vn-geo-postcode>
|
|
@ -0,0 +1,62 @@
|
||||||
|
import ngModule from '../../module';
|
||||||
|
import Section from 'salix/components/section';
|
||||||
|
|
||||||
|
export default class Controller extends Section {
|
||||||
|
onSubmit() {
|
||||||
|
this.$.watcher.submit()
|
||||||
|
.then(() => this.$state.go('supplier.card.address.index'));
|
||||||
|
}
|
||||||
|
|
||||||
|
get town() {
|
||||||
|
return this._town;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Town auto complete
|
||||||
|
set town(selection) {
|
||||||
|
const oldValue = this._town;
|
||||||
|
this._town = selection;
|
||||||
|
|
||||||
|
if (!selection || !oldValue) return;
|
||||||
|
|
||||||
|
const province = selection.province;
|
||||||
|
const postcodes = selection.postcodes;
|
||||||
|
|
||||||
|
if (!this.address.provinceFk)
|
||||||
|
this.address.provinceFk = province.id;
|
||||||
|
|
||||||
|
if (!this.address.postalCode && postcodes.length === 1)
|
||||||
|
this.address.postalCode = postcodes[0].code;
|
||||||
|
}
|
||||||
|
|
||||||
|
get postcode() {
|
||||||
|
return this._postcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Postcode auto complete
|
||||||
|
set postcode(selection) {
|
||||||
|
const oldValue = this._postcode;
|
||||||
|
this._postcode = selection;
|
||||||
|
|
||||||
|
if (!selection || !oldValue) return;
|
||||||
|
|
||||||
|
const town = selection.town;
|
||||||
|
const province = town.province;
|
||||||
|
|
||||||
|
if (!this.address.city)
|
||||||
|
this.address.city = town.name;
|
||||||
|
|
||||||
|
if (!this.address.provinceFk)
|
||||||
|
this.address.provinceFk = province.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
onResponse(response) {
|
||||||
|
this.address.postalCode = response.code;
|
||||||
|
this.address.city = response.city;
|
||||||
|
this.address.provinceFk = response.provinceFk;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ngModule.vnComponent('vnSupplierAddressEdit', {
|
||||||
|
template: require('./index.html'),
|
||||||
|
controller: Controller
|
||||||
|
});
|
|
@ -0,0 +1,39 @@
|
||||||
|
import './index';
|
||||||
|
import watcher from 'core/mocks/watcher';
|
||||||
|
|
||||||
|
describe('Supplier', () => {
|
||||||
|
describe('Component vnSupplierAddressEdit', () => {
|
||||||
|
let $scope;
|
||||||
|
let controller;
|
||||||
|
let $element;
|
||||||
|
let $state;
|
||||||
|
|
||||||
|
beforeEach(ngModule('supplier'));
|
||||||
|
|
||||||
|
beforeEach(inject(($componentController, $rootScope, _$state_) => {
|
||||||
|
$scope = $rootScope.$new();
|
||||||
|
$state = _$state_;
|
||||||
|
$state.params.addressId = '1';
|
||||||
|
$element = angular.element('<vn-supplier-address-edit></vn-supplier-address-edit>');
|
||||||
|
controller = $componentController('vnSupplierAddressEdit', {$element, $scope});
|
||||||
|
controller.address = {id: 1};
|
||||||
|
controller.$.watcher = watcher;
|
||||||
|
controller.$.watcher.submit = () => {
|
||||||
|
return {
|
||||||
|
then: callback => {
|
||||||
|
callback({data: {id: 124}});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('onSubmit()', () => {
|
||||||
|
it('should perform a PATCH and then redirect to the main section', () => {
|
||||||
|
jest.spyOn(controller.$state, 'go');
|
||||||
|
controller.onSubmit();
|
||||||
|
|
||||||
|
expect(controller.$state.go).toHaveBeenCalledWith('supplier.card.address.index');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,79 @@
|
||||||
|
<vn-crud-model
|
||||||
|
vn-id="model"
|
||||||
|
url="Suppliers/{{$ctrl.$params.id}}/addresses"
|
||||||
|
filter="$ctrl.filter"
|
||||||
|
limit="10"
|
||||||
|
data="$ctrl.addresses"
|
||||||
|
auto-load="true">
|
||||||
|
</vn-crud-model>
|
||||||
|
<vn-portal slot="topbar">
|
||||||
|
<vn-searchbar
|
||||||
|
placeholder="Search by address"
|
||||||
|
info="You can search by address id or name"
|
||||||
|
model="model"
|
||||||
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
|
auto-state="false">
|
||||||
|
</vn-searchbar>
|
||||||
|
</vn-portal>
|
||||||
|
<vn-data-viewer
|
||||||
|
model="model"
|
||||||
|
class="vn-w-md">
|
||||||
|
<vn-card class="vn-pa-md">
|
||||||
|
<div
|
||||||
|
ng-repeat="address in $ctrl.addresses"
|
||||||
|
class="address">
|
||||||
|
<a
|
||||||
|
ui-sref="supplier.card.address.edit({addressId: {{::address.id}}})"
|
||||||
|
class="vn-pa-sm border-solid border-radius"
|
||||||
|
translate-attr="{title: 'Edit address'}">
|
||||||
|
<!-- <vn-none
|
||||||
|
class="vn-pr-sm"
|
||||||
|
ng-click="$ctrl.onStarClick($event)">
|
||||||
|
<vn-icon-button
|
||||||
|
ng-if="$ctrl.isDefaultAddress(address)"
|
||||||
|
icon="star"
|
||||||
|
translate-attr="{title: 'Default address'}">
|
||||||
|
</vn-icon-button>
|
||||||
|
<vn-icon-button
|
||||||
|
ng-if="!$ctrl.isDefaultAddress(address)"
|
||||||
|
icon="star_border"
|
||||||
|
ng-click="$ctrl.setDefault(address)"
|
||||||
|
translate-attr="{title: 'Set as default'}">
|
||||||
|
</vn-icon-button>
|
||||||
|
</vn-none> -->
|
||||||
|
<vn-one
|
||||||
|
style="overflow: hidden; min-width: 14em;">
|
||||||
|
<div class="ellipsize"><b>{{::address.nickname}} - #{{::address.id}}</b></div>
|
||||||
|
<div class="ellipsize" name="street">{{::address.street}}</div>
|
||||||
|
<div class="ellipsize">
|
||||||
|
<span ng-show="::address.postalCode">{{::address.postalCode}} -</span>
|
||||||
|
<span ng-show="::address.city">{{::address.city}},</span>
|
||||||
|
{{::address.province.name}}
|
||||||
|
</div>
|
||||||
|
<div class="ellipsize">
|
||||||
|
{{::address.phone}}<span ng-if="::address.mobile">, </span>
|
||||||
|
{{::address.mobile}}
|
||||||
|
</div>
|
||||||
|
</vn-one>
|
||||||
|
<vn-vertical
|
||||||
|
vn-one
|
||||||
|
ng-if="address.observations.length"
|
||||||
|
class="vn-hide-narrow vn-px-md border-solid-left"
|
||||||
|
style="height: 6em; overflow: auto;">
|
||||||
|
<vn-one ng-repeat="observation in address.observations track by $index" ng-class="{'vn-pt-sm': $index}">
|
||||||
|
<b>{{::observation.observationType.description}}:</b>
|
||||||
|
<span>{{::observation.description}}</span>
|
||||||
|
</vn-one>
|
||||||
|
</vn-vertical>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</vn-card>
|
||||||
|
</vn-data-viewer>
|
||||||
|
<vn-float-button
|
||||||
|
vn-bind="+"
|
||||||
|
fixed-bottom-right
|
||||||
|
vn-tooltip="New address"
|
||||||
|
ui-sref="supplier.card.address.create"
|
||||||
|
icon="add"
|
||||||
|
label="Add">
|
||||||
|
</vn-float-button>
|
|
@ -0,0 +1,46 @@
|
||||||
|
import ngModule from '../../module';
|
||||||
|
import Section from 'salix/components/section';
|
||||||
|
import './style.scss';
|
||||||
|
|
||||||
|
class Controller extends Section {
|
||||||
|
constructor($element, $) {
|
||||||
|
super($element, $);
|
||||||
|
this.filter = {
|
||||||
|
fields: [
|
||||||
|
'id',
|
||||||
|
'nickname',
|
||||||
|
'street',
|
||||||
|
'city',
|
||||||
|
'provinceFk',
|
||||||
|
'phone',
|
||||||
|
'mobile',
|
||||||
|
'postalCode'
|
||||||
|
],
|
||||||
|
order: ['nickname ASC'],
|
||||||
|
include: [{
|
||||||
|
relation: 'province',
|
||||||
|
scope: {
|
||||||
|
fields: ['id', 'name']
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
exprBuilder(param, value) {
|
||||||
|
switch (param) {
|
||||||
|
case 'search':
|
||||||
|
return /^\d+$/.test(value)
|
||||||
|
? {id: value}
|
||||||
|
: {nickname: {like: `%${value}%`}};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Controller.$inject = ['$element', '$scope'];
|
||||||
|
|
||||||
|
ngModule.vnComponent('vnSupplierAddressIndex', {
|
||||||
|
template: require('./index.html'),
|
||||||
|
controller: Controller,
|
||||||
|
bindings: {
|
||||||
|
supplier: '<'
|
||||||
|
}
|
||||||
|
});
|
|
@ -0,0 +1,34 @@
|
||||||
|
import './index';
|
||||||
|
|
||||||
|
describe('Supplier', () => {
|
||||||
|
describe('Component vnSupplierAddressIndex', () => {
|
||||||
|
let controller;
|
||||||
|
let $scope;
|
||||||
|
let $stateParams;
|
||||||
|
|
||||||
|
beforeEach(ngModule('supplier'));
|
||||||
|
|
||||||
|
beforeEach(inject(($componentController, $rootScope, _$stateParams_) => {
|
||||||
|
$stateParams = _$stateParams_;
|
||||||
|
$stateParams.id = 1;
|
||||||
|
$scope = $rootScope.$new();
|
||||||
|
const $element = angular.element('<vn-supplier-address-index></vn-supplier-address-index>');
|
||||||
|
controller = $componentController('vnSupplierAddressIndex', {$element, $scope});
|
||||||
|
controller.supplier = {id: 1};
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('exprBuilder()', () => {
|
||||||
|
it('should return a filter based on a search by id', () => {
|
||||||
|
const filter = controller.exprBuilder('search', '123');
|
||||||
|
|
||||||
|
expect(filter).toEqual({id: '123'});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return a filter based on a search by name', () => {
|
||||||
|
const filter = controller.exprBuilder('search', 'Arkham Chemicals');
|
||||||
|
|
||||||
|
expect(filter).toEqual({nickname: {like: '%Arkham Chemicals%'}});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -0,0 +1,21 @@
|
||||||
|
@import "variables";
|
||||||
|
@import "./effects";
|
||||||
|
|
||||||
|
vn-supplier-address-index {
|
||||||
|
.address {
|
||||||
|
padding-bottom: $spacing-md;
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
padding-bottom: 0;
|
||||||
|
}
|
||||||
|
& > a {
|
||||||
|
@extend %clickable;
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
color: inherit;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Index
|
||||||
|
Search by address: Buscar por dirección
|
||||||
|
You can search by address id or name: Puedes buscar por el id o nombre de la dirección
|
||||||
|
|
||||||
|
# Create
|
||||||
|
Street address: Dirección postal
|
||||||
|
Postcode: Código postal
|
||||||
|
Town/City: Ciudad
|
||||||
|
Province: Provincia
|
||||||
|
Phone: Teléfono
|
||||||
|
Mobile: Móvil
|
||||||
|
|
||||||
|
# Common
|
||||||
|
Fiscal name: Nombre fiscal
|
||||||
|
Street: Dirección fiscal
|
||||||
|
Addresses: Direcciones
|
||||||
|
New address: Nueva dirección
|
||||||
|
Edit address: Editar dirección
|
|
@ -15,3 +15,6 @@ import './log';
|
||||||
import './consumption';
|
import './consumption';
|
||||||
import './consumption-search-panel';
|
import './consumption-search-panel';
|
||||||
import './billing-data';
|
import './billing-data';
|
||||||
|
import './address/index';
|
||||||
|
import './address/create';
|
||||||
|
import './address/edit';
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
{"state": "supplier.card.basicData", "icon": "settings"},
|
{"state": "supplier.card.basicData", "icon": "settings"},
|
||||||
{"state": "supplier.card.fiscalData", "icon": "account_balance"},
|
{"state": "supplier.card.fiscalData", "icon": "account_balance"},
|
||||||
{"state": "supplier.card.billingData", "icon": "icon-payment"},
|
{"state": "supplier.card.billingData", "icon": "icon-payment"},
|
||||||
|
{"state": "supplier.card.address.index", "icon": "icon-delivery"},
|
||||||
{"state": "supplier.card.account", "icon": "contact_support"},
|
{"state": "supplier.card.account", "icon": "contact_support"},
|
||||||
{"state": "supplier.card.contact", "icon": "contact_phone"},
|
{"state": "supplier.card.contact", "icon": "contact_phone"},
|
||||||
{"state": "supplier.card.log", "icon": "history"},
|
{"state": "supplier.card.log", "icon": "history"},
|
||||||
|
@ -49,7 +50,8 @@
|
||||||
"params": {
|
"params": {
|
||||||
"supplier": "$ctrl.supplier"
|
"supplier": "$ctrl.supplier"
|
||||||
}
|
}
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
"url": "/basic-data",
|
"url": "/basic-data",
|
||||||
"state": "supplier.card.basicData",
|
"state": "supplier.card.basicData",
|
||||||
"component": "vn-supplier-basic-data",
|
"component": "vn-supplier-basic-data",
|
||||||
|
@ -58,7 +60,8 @@
|
||||||
"params": {
|
"params": {
|
||||||
"supplier": "$ctrl.supplier"
|
"supplier": "$ctrl.supplier"
|
||||||
}
|
}
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
"url": "/fiscal-data",
|
"url": "/fiscal-data",
|
||||||
"state": "supplier.card.fiscalData",
|
"state": "supplier.card.fiscalData",
|
||||||
"component": "vn-supplier-fiscal-data",
|
"component": "vn-supplier-fiscal-data",
|
||||||
|
@ -67,7 +70,8 @@
|
||||||
"supplier": "$ctrl.supplier"
|
"supplier": "$ctrl.supplier"
|
||||||
},
|
},
|
||||||
"acl": ["administrative"]
|
"acl": ["administrative"]
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
"url" : "/log",
|
"url" : "/log",
|
||||||
"state": "supplier.card.log",
|
"state": "supplier.card.log",
|
||||||
"component": "vn-supplier-log",
|
"component": "vn-supplier-log",
|
||||||
|
@ -100,7 +104,8 @@
|
||||||
"supplier": "$ctrl.supplier"
|
"supplier": "$ctrl.supplier"
|
||||||
},
|
},
|
||||||
"acl": ["administrative"]
|
"acl": ["administrative"]
|
||||||
},{
|
},
|
||||||
|
{
|
||||||
"url": "/account",
|
"url": "/account",
|
||||||
"state": "supplier.card.account",
|
"state": "supplier.card.account",
|
||||||
"component": "vn-supplier-account",
|
"component": "vn-supplier-account",
|
||||||
|
@ -109,6 +114,36 @@
|
||||||
"supplier": "$ctrl.supplier"
|
"supplier": "$ctrl.supplier"
|
||||||
},
|
},
|
||||||
"acl": ["administrative"]
|
"acl": ["administrative"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "/address",
|
||||||
|
"state": "supplier.card.address",
|
||||||
|
"component": "ui-view",
|
||||||
|
"abstract": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "/index?q",
|
||||||
|
"state": "supplier.card.address.index",
|
||||||
|
"component": "vn-supplier-address-index",
|
||||||
|
"description": "Addresses",
|
||||||
|
"params": {
|
||||||
|
"supplier": "$ctrl.supplier"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "/create",
|
||||||
|
"state": "supplier.card.address.create",
|
||||||
|
"component": "vn-supplier-address-create",
|
||||||
|
"description": "New address",
|
||||||
|
"params": {
|
||||||
|
"supplier": "$ctrl.supplier"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "/:addressId/edit",
|
||||||
|
"state": "supplier.card.address.edit",
|
||||||
|
"component": "vn-supplier-address-edit",
|
||||||
|
"description": "Edit address"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
Loading…
Reference in New Issue