diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html index e4ca7ec..aea5dd3 100644 --- a/src/app/pages/activetask/activetask.page.html +++ b/src/app/pages/activetask/activetask.page.html @@ -20,7 +20,7 @@ - Price: {{jobData.price*0.01}} {{jobData.currency}} + Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}
diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html index b676af0..0abac39 100644 --- a/src/app/pages/marketdetail/marketdetail.page.html +++ b/src/app/pages/marketdetail/marketdetail.page.html @@ -21,7 +21,7 @@
- Price: {{jobData.price*0.01}} {{jobData.currency}} + Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}
diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html index fcc9711..21f08a3 100644 --- a/src/app/pages/my-course/my-course.page.html +++ b/src/app/pages/my-course/my-course.page.html @@ -28,7 +28,7 @@
{{item.title}} - {{item.price*0.01}} {{item.currency}} + {{item.price*0.01| number : '1.2-2'}} {{item.currency}} Timeline: {{item.timeline_days}} days
diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html index f3e86b9..b56a36e 100644 --- a/src/app/pages/mycoupons/mycoupons.page.html +++ b/src/app/pages/mycoupons/mycoupons.page.html @@ -56,12 +56,12 @@
- {{item.amount*0.01}} {{item.currency}} + {{item.amount*0.01| number : '1.2-2'}} {{item.currency}} {{item.code}} - {{item.added}}
- Redeem + Redeem
@@ -84,7 +84,7 @@
- {{item.amount*0.01}} {{item.currency}} + {{item.amount*0.01| number : '1.2-2'}} {{item.currency}} {{item.code}} - {{item.added}}
diff --git a/src/app/pages/mycoupons/mycoupons.page.ts b/src/app/pages/mycoupons/mycoupons.page.ts index b96b5ef..163954d 100644 --- a/src/app/pages/mycoupons/mycoupons.page.ts +++ b/src/app/pages/mycoupons/mycoupons.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {AlertController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; @@ -16,6 +16,7 @@ export class MycouponsPage implements OnInit { constructor( private navctr: NavController, private router: Router, + private alertController:AlertController, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, ) { } @@ -81,4 +82,52 @@ export class MycouponsPage implements OnInit { ); } + + redeemData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + code:string, + code_id: number + }; + async startRedeem(item){ + + const redMsg = "Confirm you are ready to redeem " + item.amount*0.01 + " " + item.currency; + const alert = await this.alertController.create({ + header: "Redeem Coupon", + message: redMsg, + buttons: [ + { + text: "Cancel", + role: "cancel", + handler: () => { + // this.getMyOffersData(); + }, + }, + { + text: "Redeem", + handler: () => { + this.redeemData = { + action:85020, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + code:item.code, + code_id: item.code_id + }; + debugger; + /* + redeemCoupon(redeemData){ + return this.getPostData("couponredeem", redeemData); + } + */ + this.getMyCouponHxData(); + this.getMyCouponPendData(); + }, + }, + ], + }); + await alert.present(); + } } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index ca818c9..aa3b052 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -184,6 +184,9 @@ export class WrenchService { getCouponPending(usrData){ return this.getPostData("couponpending", usrData); } + redeemCoupon(redeemData){ + return this.getPostData("couponredeem", redeemData); + } sendMoneyAction(sendmoneyData){ return this.getPostData("sendmoney", sendmoneyData); }