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

Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Satorres 2023-05-30 10:22:49 +00:00
parent eaffd61579 6ff4c4f51d
commit 813c4ede00
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ticket/back/methods/sale/refund.js
View File

@ -101,6 +101,9 @@ module.exports = Self => {
} }
} }
const query = `CALL vn.ticket_recalc(?)`;
await Self.rawSql(query, [refundTicket.id], myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();
return refundTicket; return refundTicket;

24
modules/ticket/front/sale/index.html
View File

@ -61,20 +61,20 @@
</vn-th> </vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
<vn-th shrink>Visible</vn-th> <vn-th ng-click="$ctrl.sortBy('visible')" field="visible" shrink>Visible</vn-th>
<vn-th shrink>Available</vn-th> <vn-th ng-click="$ctrl.sortBy('available')" field="available" shrink>Available</vn-th>
<vn-th>Id</vn-th> <vn-th ng-click="$ctrl.sortBy('itemFk')" field="itemFk">Id</vn-th>
<vn-th shrink>Quantity</vn-th> <vn-th ng-click="$ctrl.sortBy('quantity')" field="quantity" shrink>Quantity</vn-th>
<vn-th expand>Item</vn-th> <vn-th ng-click="$ctrl.sortBy('concept')" field="concept" expand>Item</vn-th>
<vn-th number>Price</vn-th> <vn-th ng-click="$ctrl.sortBy('price')" field="price" number>Price</vn-th>
<vn-th number>Disc</vn-th> <vn-th ng-click="$ctrl.sortBy('discount')" field="discount" number>Disc</vn-th>
<vn-th number>Amount</vn-th> <vn-th ng-click="$ctrl.sortBy('amount')" field="amount" number>Amount</vn-th>
<vn-th shrink>Packaging</vn-th> <vn-th ng-click="$ctrl.sortBy('itemPackingTypeFk')" field="itemPackingTypeFk" shrink>Packaging</vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="sale in $ctrl.sales"> <vn-tr ng-repeat="sale in $ctrl.sales | orderBy: $ctrl.propertyName:$ctrl.reverse">
<vn-td shrink> <vn-td shrink>
<vn-check tabindex="-1" <vn-check tabindex="-1"
ng-model="sale.checked"> ng-model="sale.checked">
@ -481,7 +481,7 @@
on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)"> on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)">
</vn-confirm> </vn-confirm>
<vn-confirm <vn-confirm
vn-id="claimConfirm" vn-id="claimConfirm"
question="Do you want to continue?" question="Do you want to continue?"
message="Claim out of time" message="Claim out of time"
@ -515,7 +515,7 @@
name="claim" name="claim"
ng-click="$ctrl.createClaim()" ng-click="$ctrl.createClaim()"
ng-if="$ctrl.isClaimable"> ng-if="$ctrl.isClaimable">
Add claim Add claim
</vn-item> </vn-item>
<vn-item translate <vn-item translate
name="reserve" name="reserve"

5
modules/ticket/front/sale/index.js
View File

@ -10,6 +10,11 @@ class Controller extends Section {
this.getConfig(); this.getConfig();
} }
sortBy(propertyName) {
this.reverse = (this.propertyName === propertyName) ? !this.reverse : false;
this.propertyName = propertyName;
}
get manaCode() { get manaCode() {
return this._manaCode; return this._manaCode;
} }

10
modules/ticket/front/sale/index.spec.js
View File

@ -758,5 +758,15 @@ describe('Ticket', () => {
expect(controller.$.editDiscount.hide).toHaveBeenCalledWith(); expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
}); });
}); });
describe('sortBy()', () => {
it('should set reverse and propertyName properties', () => {
const propertyName = 'id';
controller.sortBy(propertyName);
expect(controller.propertyName).toEqual(propertyName);
expect(controller.reverse).toEqual(false);
});
});
}); });
}); });