verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Carlos Jimenez Ruiz 2019-01-24 09:08:38 +01:00
parent 8cbde4c137 bbb7fafed1
commit 79ee9bb0da
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/client/front/billing-data/index.spec.js
View File

@ -30,7 +30,7 @@ describe('Client', () => {
expect(controller.notifyChanges).toHaveBeenCalledWith(); expect(controller.notifyChanges).toHaveBeenCalledWith();
}); });
}); });
// Excluded due mailer changes #79 // Excluded due mailer changes #1001
xdescribe('notifyChanges()', () => { xdescribe('notifyChanges()', () => {
it(`should perform a GET query`, () => { it(`should perform a GET query`, () => {
$httpBackend.when('GET', `/mailer/notification/payment-update/101`).respond(true); $httpBackend.when('GET', `/mailer/notification/payment-update/101`).respond(true);

4
modules/ticket/front/index/index.html
View File

@ -43,8 +43,6 @@
<vn-th field="state" >State</vn-th> <vn-th field="state" >State</vn-th>
<vn-th field="agencyMode">Agency</vn-th> <vn-th field="agencyMode">Agency</vn-th>
<vn-th field="warehouse">Warehouse</vn-th> <vn-th field="warehouse">Warehouse</vn-th>
<vn-th field="refFk" number>Invoice</vn-th>
<vn-th field="routeFk" number>Route</vn-th>
<vn-th number>Total</vn-th> <vn-th number>Total</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
</vn-tr> </vn-tr>
@ -75,8 +73,6 @@
<vn-td class="{{$ctrl.stateColor(ticket)}}">{{::ticket.state}}</vn-td> <vn-td class="{{$ctrl.stateColor(ticket)}}">{{::ticket.state}}</vn-td>
<vn-td>{{::ticket.agencyMode}}</vn-td> <vn-td>{{::ticket.agencyMode}}</vn-td>
<vn-td>{{::ticket.warehouse}}</vn-td> <vn-td>{{::ticket.warehouse}}</vn-td>
<vn-td number>{{::ticket.refFk | dashIfEmpty}}</vn-td>
<vn-td number>{{::ticket.routeFk | dashIfEmpty}}</vn-td>
<vn-td number>{{::ticket.total | currency: '€': 2}}</vn-td> <vn-td number>{{::ticket.total | currency: '€': 2}}</vn-td>
<vn-td> <vn-td>
<vn-icon-button <vn-icon-button

9
modules/ticket/front/index/index.js
View File

@ -2,16 +2,17 @@ import ngModule from '../module';
import './style.scss'; import './style.scss';
export default class Controller { export default class Controller {
constructor($scope, $state, $stateparams) { constructor($scope, $state, $stateParams) {
this.$ = $scope; this.$ = $scope;
this.$stateparams = $stateparams; this.$stateParams = $stateParams;
this.$state = $state; this.$state = $state;
this.selectedTicket = null; this.selectedTicket = null;
this.moreOptions = [ this.moreOptions = [
{callback: this.goToTurns, name: 'Turns', always: true}, {callback: this.goToTurns, name: 'Turns', always: true},
]; ];
if (!$state && !$stateparams) { if (!$stateParams.q) {
console.log($stateParams);
let today = new Date(); let today = new Date();
let offset = today.getTimezoneOffset() * 60000; let offset = today.getTimezoneOffset() * 60000;
today.setHours(0, 0, 0, 0); today.setHours(0, 0, 0, 0);
@ -96,7 +97,7 @@ export default class Controller {
} }
} }
Controller.$inject = ['$scope', '$state']; Controller.$inject = ['$scope', '$state', '$stateParams'];
ngModule.component('vnTicketIndex', { ngModule.component('vnTicketIndex', {
template: require('./index.html'), template: require('./index.html'),

3
modules/ticket/front/summary/index.html
View File

@ -17,6 +17,9 @@
<vn-label-value label="Package size" <vn-label-value label="Package size"
value="{{$ctrl.summary.packages}}"> value="{{$ctrl.summary.packages}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Invoice"
value="{{$ctrl.summary.refFk}}">
</vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-label-value label="Shipped" <vn-label-value label="Shipped"