Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
This commit is contained in:
commit
6135a8f576
|
@ -251,6 +251,7 @@ describe('Ticket Edit sale path', () => {
|
|||
await page.waitToClick(selectors.ticketSales.moreMenu);
|
||||
await page.waitToClick(selectors.ticketSales.moreMenuCreateClaim);
|
||||
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||
await page.waitToClick(selectors.globalItems.acceptButton);
|
||||
await page.waitForState('claim.card.basicData');
|
||||
});
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
vn-id="model"
|
||||
url="Routes/filter"
|
||||
limit="20"
|
||||
order="created DESC">
|
||||
order="created DESC, id DESC">
|
||||
</vn-crud-model>
|
||||
<vn-portal slot="topbar">
|
||||
<vn-searchbar
|
||||
|
@ -17,4 +17,4 @@
|
|||
<vn-portal slot="menu">
|
||||
<vn-left-menu></vn-left-menu>
|
||||
</vn-portal>
|
||||
<ui-view></ui-view>
|
||||
<ui-view></ui-view>
|
||||
|
|
|
@ -488,6 +488,12 @@
|
|||
on-accept="$ctrl.onCreateClaimAccepted()">
|
||||
</vn-confirm>
|
||||
|
||||
<vn-confirm
|
||||
vn-id="claimSure"
|
||||
message="Do you want to create a claim?"
|
||||
on-accept="$ctrl.createClaim()">
|
||||
</vn-confirm>
|
||||
|
||||
<vn-menu vn-id="moreOptions">
|
||||
<vn-item translate
|
||||
name="sms"
|
||||
|
@ -507,10 +513,9 @@
|
|||
</vn-item>
|
||||
<vn-item translate
|
||||
name="claim"
|
||||
ng-click="$ctrl.createClaim()"
|
||||
ng-click="claimSure.show()"
|
||||
ng-if="$ctrl.isClaimable">
|
||||
Add claim
|
||||
|
||||
Add claim
|
||||
</vn-item>
|
||||
<vn-item translate
|
||||
name="reserve"
|
||||
|
|
|
@ -42,3 +42,4 @@ Claim mana: Maná reclamación
|
|||
History: Historial
|
||||
Do you want to continue?: ¿Desea continuar?
|
||||
Claim out of time: Reclamación fuera de plazo
|
||||
Do you want to create a claim?: ¿Quieres crear una reclamación?
|
Loading…
Reference in New Issue