Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issues/1838 #1839

Merged
merged 1 commit into from
Jan 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/admin/marketPlaceSlider/marketPlaceSlide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,8 @@ export default {
this.data.inputData = [...locations]
const url = `${this.$config.studioServer.BASE_URL}api/v1/reward/distribution/serviceFee`;
let data = {}
data = { ...this.data }
data = { ...this.data }
data["eventId"] = this.eventToAirdrop._id
const headers = {
"Content-Type": "application/json",
Authorization: `Bearer ${this.authToken}`,
Expand Down
9 changes: 6 additions & 3 deletions src/components/participant/ActionInputs/RewardClaimAction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
`<span class="mr-auto">ABCD</span>`;
element.forEach((element, index) => {
*/
console.log(list);

const groupByMake = (list = []) => {
let result = [];
result = list.reduce((r, a) => {
Expand All @@ -166,8 +166,11 @@ export default {
list = groupByMake(json)
var swal_html = `<div class="list-group list-group-flush" style="max-height:500px;overflow-y: scroll;">`;
var groupName = `<div style="font-weight:bold">`
this.claimData.forEach((el) => {
let ele = list[el._id]
this.claimData.forEach((el) => {
let ele = list[el._id]
if(ele === undefined) {
return
}
ele.forEach((x,index)=>{
groupName = el.title
swal_html = swal_html + `<strong class="grpName pt-3" style="text-align: left;">`+ groupName +`</strong>`
Expand Down
13 changes: 13 additions & 0 deletions src/views/admin/Events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,19 @@ export default {
if(indexToFindNotification > -1) {
this.eventActionList.splice(indexToFindNotification, 1);
}
this.eventActionList.forEach((action)=>{
if(action.type === "PRIZE_CARD") {
const parsedData = JSON.parse(action.value)
if(parsedData.type ==="Tokens" && parsedData.isDistributed===true) {
delete parsedData["isDistributed"];
delete parsedData["externalRecordId"];
delete parsedData["contractAddress"];
delete parsedData["appBaseUrl"];
delete parsedData["chainId"];
return action.value = JSON.stringify(parsedData);
}
}
})
this.tagsTemp = project.tags;
await this.saveProject();
},
Expand Down
2 changes: 1 addition & 1 deletion src/views/participant/Event.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<template v-if="authToken != '' && authToken != null">

<ErrorMessage v-if="isEventOver && !checkIfRewardDistributed" errorMessage="Event is over awaiting for reward distribution" />
<ErrorMessage v-if="isEventOver && !checkIfRewardDistributed" errorMessage="Event is over" />
<Action v-if="checkIfRewardDistributed"
@UserUpdateEvent="updateUserData" :themeData="eventData.orgData"
:ActionSchema="eventActionsToShow"
Expand Down