diff --git a/front/core/components/index.js b/front/core/components/index.js index eb40d5e1fe..cfa46f0cbb 100644 --- a/front/core/components/index.js +++ b/front/core/components/index.js @@ -39,6 +39,7 @@ import './range'; import './input-time'; import './input-file'; import './label'; +import './link-phone'; import './list'; import './popover'; import './popup'; diff --git a/front/core/components/link-phone/index.html b/front/core/components/link-phone/index.html new file mode 100644 index 0000000000..2789ab75ca --- /dev/null +++ b/front/core/components/link-phone/index.html @@ -0,0 +1,14 @@ + + {{$ctrl.phoneNumber}} + + + + + +- diff --git a/front/core/components/link-phone/index.js b/front/core/components/link-phone/index.js new file mode 100644 index 0000000000..6f3eec5b12 --- /dev/null +++ b/front/core/components/link-phone/index.js @@ -0,0 +1,15 @@ +import ngModule from '../../module'; +import './style.scss'; +class Controller { + constructor() { + this.phoneNumber = null; + } +} + +ngModule.vnComponent('vnLinkPhone', { + template: require('./index.html'), + controller: Controller, + bindings: { + phoneNumber: '<', + } +}); diff --git a/front/core/components/link-phone/style.scss b/front/core/components/link-phone/style.scss new file mode 100644 index 0000000000..22beaf8fd3 --- /dev/null +++ b/front/core/components/link-phone/style.scss @@ -0,0 +1,7 @@ +vn-link-phone { + vn-icon { + font-size: 1.1em; + vertical-align: bottom; +} +} + diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index c622913bb9..a42e192d06 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -45,11 +45,18 @@ - + + + + - + + + diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index 3622ae9324..218359992b 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -48,8 +48,10 @@ - + + diff --git a/modules/route/front/roadmap/summary/index.html b/modules/route/front/roadmap/summary/index.html index e6b50601e6..9fab0bf874 100644 --- a/modules/route/front/roadmap/summary/index.html +++ b/modules/route/front/roadmap/summary/index.html @@ -25,7 +25,10 @@ + > + + > + + > + + ng-if="$ctrl.summary.client.phone != null"> + + ng-if="$ctrl.summary.client.mobile != null"> + diff --git a/modules/ticket/front/summary/style.scss b/modules/ticket/front/summary/style.scss index e92ff0d422..2f52de65e9 100644 --- a/modules/ticket/front/summary/style.scss +++ b/modules/ticket/front/summary/style.scss @@ -47,4 +47,9 @@ vn-ticket-summary .summary { } } } + + vn-icon.tel { + font-size: 1.1em; + vertical-align: bottom; + } } \ No newline at end of file diff --git a/modules/worker/front/descriptor/index.html b/modules/worker/front/descriptor/index.html index 05e8835337..758f639ff4 100644 --- a/modules/worker/front/descriptor/index.html +++ b/modules/worker/front/descriptor/index.html @@ -28,11 +28,17 @@ + > + + > +
diff --git a/modules/worker/front/descriptor/index.js b/modules/worker/front/descriptor/index.js index 0214f85003..07e16c0d66 100644 --- a/modules/worker/front/descriptor/index.js +++ b/modules/worker/front/descriptor/index.js @@ -1,6 +1,5 @@ import ngModule from '../module'; import Descriptor from 'salix/components/descriptor'; - class Controller extends Descriptor { constructor($element, $, $rootScope) { super($element, $); diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html index 6604ef6ca8..2372634bc2 100644 --- a/modules/worker/front/summary/index.html +++ b/modules/worker/front/summary/index.html @@ -42,14 +42,21 @@ {{::worker.boss.name}} - + + - + + + > + diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js index 2bb1f08530..212609f582 100644 --- a/modules/worker/front/summary/index.js +++ b/modules/worker/front/summary/index.js @@ -1,6 +1,5 @@ import ngModule from '../module'; import Summary from 'salix/components/summary'; - class Controller extends Summary { get worker() { return this._worker;