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

232201_test_to_master #1582

Merged
alexm merged 126 commits from 232201_test_to_master into master 2023-06-01 06:16:49 +00:00
Conversation 0 Commits 126 Files Changed 56 +19 -19
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b19035d8d - Show all commits

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

@ -481,18 +481,21 @@
on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)"> on-accept="$ctrl.transferSales($ctrl.transfer.ticketId)">
</vn-confirm> </vn-confirm>
<vn-confirm
vn-id="claimSure"
message="Do you want to create a claim?"
on-accept="$ctrl.onCreateClaimAccepted()">
</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"
on-accept="$ctrl.onCreateClaimAccepted()"> on-accept="$ctrl.onCreateClaimAccepted()">
</vn-confirm>¡ </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-menu vn-id="moreOptions">
@ -514,11 +517,12 @@
</vn-item> </vn-item>
<vn-item translate <vn-item translate
name="claim" name="claim"
ng-click="$ctrl.createClaim()" ng-click="claimSure.show()"
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"
ng-click="$ctrl.markAsReserved()" ng-click="$ctrl.markAsReserved()"

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

@ -194,9 +194,6 @@ class Controller extends Section {
} }
createClaim() { createClaim() {
this.$.claimSure.show();
setTimeout(() => {
const timeDifference = new Date().getTime() - new Date(this.ticket.shipped).getTime(); const timeDifference = new Date().getTime() - new Date(this.ticket.shipped).getTime();
const pastDays = Math.floor(timeDifference / 86400000); const pastDays = Math.floor(timeDifference / 86400000);
@ -204,7 +201,6 @@ class Controller extends Section {
this.$.claimConfirm.show(); this.$.claimConfirm.show();
else else
this.onCreateClaimAccepted(); this.onCreateClaimAccepted();
}, 10000000);
} }
onCreateClaimAccepted() { onCreateClaimAccepted() {