Merge pull request 'add message before delete a line on a claim' (#321) from 2328-claim_detail into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
This commit is contained in:
commit
99ccd8f45e
|
@ -69,7 +69,7 @@
|
|||
vn-tooltip="Remove sale"
|
||||
ng-if ="$ctrl.isRewritable"
|
||||
icon="delete"
|
||||
ng-click="$ctrl.deleteClaimedSale($index)"
|
||||
ng-click="$ctrl.showDeleteConfirm($index)"
|
||||
tabindex="-1">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
|
@ -165,3 +165,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</vn-popover>
|
||||
<vn-confirm
|
||||
vn-id="confirm"
|
||||
question="Delete sale from claim?"
|
||||
on-accept="$ctrl.deleteClaimedSale()">
|
||||
</vn-confirm>
|
|
@ -73,12 +73,16 @@ class Controller extends Section {
|
|||
});
|
||||
}
|
||||
|
||||
deleteClaimedSale(index) {
|
||||
let sale = this.salesClaimed[index];
|
||||
let query = `ClaimBeginnings/${sale.id}`;
|
||||
showDeleteConfirm(index) {
|
||||
this.sale = this.salesClaimed[index];
|
||||
this.$.confirm.show();
|
||||
}
|
||||
|
||||
deleteClaimedSale() {
|
||||
let query = `ClaimBeginnings/${this.sale.id}`;
|
||||
this.$http.delete(query).then(() => {
|
||||
this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
|
||||
this.$.model.remove(index);
|
||||
this.$.model.remove(this.sale);
|
||||
this.calculateTotals();
|
||||
});
|
||||
}
|
||||
|
|
|
@ -71,14 +71,16 @@ describe('claim', () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe('deleteClaimedSale(index)', () => {
|
||||
describe('deleteClaimedSale()', () => {
|
||||
it('should make a delete and call refresh and showSuccess', () => {
|
||||
controller.sale = {id: 1};
|
||||
jest.spyOn(controller.$.model, 'remove');
|
||||
$httpBackend.expectDELETE(`ClaimBeginnings/1`).respond({});
|
||||
controller.deleteClaimedSale(0);
|
||||
jest.spyOn(controller.vnApp, 'showSuccess');
|
||||
$httpBackend.expectDELETE(`ClaimBeginnings/1`).respond('ok');
|
||||
controller.deleteClaimedSale();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.$.model.remove).toHaveBeenCalledWith(0);
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -7,4 +7,5 @@ Claimable sales from ticket: Lineas reclamables del ticket
|
|||
Detail: Detalles
|
||||
Add sale item: Añadir artículo
|
||||
Insuficient permisos: Permisos insuficientes
|
||||
Total claimed price: Precio total reclamado
|
||||
Total claimed price: Precio total reclamado
|
||||
Delete sale from claim?: ¿Borrar la linea de la reclamación?
|
Loading…
Reference in New Issue