🔀 Merge #1866 updates to deploy/rinkeby

likecoin · Oct 6, 2024 · 26040b7 · 26040b7
2 parents fb98c88 + 69cca51
commit 26040b7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 69 deletions.
diff --git a/src/components/NFTBook/CrossSellDialog.vue b/src/components/NFTBook/CrossSellDialog.vue
@@ -139,9 +139,13 @@ export default {
         1
       );
     },
-    async gotoCheckoutPage({ link, customPriceInDecimal }) {
+    async gotoCheckoutPage({
+      link,
+      customPriceInDecimal,
+      purchaseEventParams,
+    }) {
       try {
-        const { url } = await this.$axios.$post(link, {
+        const { url, paymentId } = await this.$axios.$post(link, {
           gaClientId: this.getGaClientId,
           gaSessionId: this.getGaSessionId,
           coupon: this.$route.query.coupon,
@@ -155,6 +159,10 @@ export default {
           gadSource: this.gadSource,
           fbClickId: this.fbClickId,
         });
+        logPurchaseFlowEvent(this, 'begin_checkout', {
+          ...purchaseEventParams,
+          paymentId,
+        });
         if (url) {
           window.location.href = url;
         } else {
@@ -208,13 +216,15 @@ export default {
         logPurchaseFlowEvent(this, 'add_to_cart', purchaseEventParams);
 
         if (this.shoppingCartBookItems.length < 1) {
-          logPurchaseFlowEvent(this, 'begin_checkout', purchaseEventParams);
-
           const link = getNFTBookPurchaseLink({
             collectionId: this.collectionId,
             platform: this.platform,
           });
-          await this.gotoCheckoutPage({ link, customPriceInDecimal });
+          await this.gotoCheckoutPage({
+            link,
+            customPriceInDecimal,
+            purchaseEventParams,
+          });
           return;
         }
 
@@ -254,14 +264,16 @@ export default {
         logPurchaseFlowEvent(this, 'add_to_cart', purchaseEventParams);
 
         if (this.shoppingCartBookItems.length < 1) {
-          logPurchaseFlowEvent(this, 'begin_checkout', purchaseEventParams);
-
           const link = getNFTBookPurchaseLink({
             classId: this.classId,
             priceIndex: edition.index,
             platform: this.platform,
           });
-          await this.gotoCheckoutPage({ link, customPriceInDecimal });
+          await this.gotoCheckoutPage({
+            link,
+            customPriceInDecimal,
+            purchaseEventParams,
+          });
           return;
         }
 

diff --git a/src/mixins/nft.js b/src/mixins/nft.js
@@ -23,7 +23,6 @@ import {
   getNFTCountByClassId,
   getNftBookBuyerMessage,
   getNFTBookPurchaseLink,
-  postNFTBookLIKEPurchaseEndpoint,
 } from '~/util/api';
 import { logTrackerEvent, logPurchaseFlowEvent } from '~/util/EventLogger';
 import { sleep, catchAxiosError } from '~/util/misc';
@@ -1048,23 +1047,13 @@ export default {
             result = { data: { nftId: this.listingInfo.nftId } };
           } else {
             this.uiSetTxStatus(TX_STATUS.PROCESSING_NON_BLOCKING);
-            if (this.nftIsNFTBook) {
-              result = await this.$api.post(
-                postNFTBookLIKEPurchaseEndpoint({
-                  classId,
-                  priceIndex: this.editionPriceIndex,
-                }),
-                { txHash, email }
-              );
-            } else {
-              result = await this.$api.post(
-                postNFTPurchase({
-                  txHash,
-                  classId,
-                  ts: Date.now(),
-                })
-              );
-            }
+            result = await this.$api.post(
+              postNFTPurchase({
+                txHash,
+                classId,
+                ts: Date.now(),
+              })
+            );
           }
           logTrackerEvent(
             this,

diff --git a/src/pages/nft/class/_classId/index.vue b/src/pages/nft/class/_classId/index.vue
@@ -1176,8 +1176,8 @@ export default {
           this.isOpeningCheckoutPage = true;
           const purchaseEventParams = this.getPurchaseEventParams(edition);
           logPurchaseFlowEvent(this, 'add_to_cart', purchaseEventParams);
-          logPurchaseFlowEvent(this, 'begin_checkout', purchaseEventParams);
           if (edition.price === 0 && !this.customPrice) {
+            logPurchaseFlowEvent(this, 'begin_checkout', purchaseEventParams);
             this.$router.push(
               this.localeLocation({
                 name: 'nft-claim',
@@ -1201,7 +1201,7 @@ export default {
               priceIndex: edition.index,
               platform: this.platform,
             });
-            const { url } = await this.$axios.$post(link, {
+            const { url, paymentId } = await this.$axios.$post(link, {
               gaClientId,
               gaSessionId,
               giftInfo,
@@ -1216,6 +1216,10 @@ export default {
               fbClickId: this.fbClickId,
               email: this.walletEmail,
             });
+            logPurchaseFlowEvent(this, 'begin_checkout', {
+              ...purchaseEventParams,
+              paymentId,
+            });
             if (url) {
               window.location.href = url;
             } else {

diff --git a/src/pages/nft/collection/_collectionId/index.vue b/src/pages/nft/collection/_collectionId/index.vue
@@ -317,12 +317,12 @@ export default {
         try {
           this.isOpeningCheckoutPage = true;
           logPurchaseFlowEvent(this, 'add_to_cart', this.purchaseEventParams);
-          logPurchaseFlowEvent(
-            this,
-            'begin_checkout',
-            this.purchaseEventParams
-          );
           if (this.collectionPrice === 0 && !this.customPrice) {
+            logPurchaseFlowEvent(
+              this,
+              'begin_checkout',
+              this.purchaseEventParams
+            );
             this.$router.push(
               this.localeLocation({
                 name: 'nft-claim',
@@ -344,7 +344,7 @@ export default {
               collectionId: this.collectionId,
               platform: this.platform,
             });
-            const { url } = await this.$axios.$post(link, {
+            const { url, paymentId } = await this.$axios.$post(link, {
               gaClientId,
               giftInfo,
               gaSessionId,
@@ -359,6 +359,10 @@ export default {
               fbClickId: this.fbClickId,
               email: this.walletEmail,
             });
+            logPurchaseFlowEvent(this, 'begin_checkout', {
+              ...this.purchaseEventParams,
+              paymentId,
+            });
             if (url) {
               window.location.href = url;
             } else {

diff --git a/src/pages/shopping-cart/book.vue b/src/pages/shopping-cart/book.vue
@@ -335,11 +335,10 @@ export default {
           this.productIdList,
           1
         );
-        logPurchaseFlowEvent(this, 'begin_checkout', this.purchaseEventParams);
         const gaClientId = this.getGaClientId;
         const gaSessionId = this.getGaSessionId;
         const link = getNFTBookCartPurchaseLink();
-        const { url } = await this.$axios.$post(link, {
+        const { url, paymentId } = await this.$axios.$post(link, {
           gaClientId,
           gaSessionId,
           utmCampaign: this.utmCampaign,
@@ -354,6 +353,10 @@ export default {
           coupon: this.coupon,
           giftInfo,
         });
+        logPurchaseFlowEvent(this, 'begin_checkout', {
+          ...this.purchaseEventParams,
+          paymentId,
+        });
         if (url) {
           window.location.href = url;
         } else {

diff --git a/src/util/api/index.js b/src/util/api/index.js
@@ -379,39 +379,6 @@ export const getFreeNFTBookPurchaseEndpoint = ({
       )}`;
 };
 
-export const postNFTBookLIKEPurchaseEndpoint = ({
-  classId,
-  collectionId,
-  priceIndex,
-  coupon,
-  gaClientId,
-  gaSessionId,
-  utmCampaign,
-  utmSource,
-  utmMedium,
-  referrer,
-  platform = NFT_BOOK_PLATFORM_LIKER_LAND,
-}) => {
-  const qsPayload = {
-    price_index: priceIndex,
-    from: platform,
-    coupon,
-    ga_client_id: gaClientId,
-    ga_session_id: gaSessionId,
-    utm_campaign: utmCampaign,
-    utm_source: utmSource,
-    utm_medium: utmMedium,
-    referrer,
-  };
-  return collectionId
-    ? `${LIKECOIN_API_BASE}/likernft/book/collection/purchase/${collectionId}/new/like?${querystring.stringify(
-        qsPayload
-      )}`
-    : `${LIKECOIN_API_BASE}/likernft/book/purchase/${classId}/new/like?${querystring.stringify(
-        qsPayload
-      )}`;
-};
-
 export const getNFTCollectionInfo = ({ wallet, classId, type }) => {
   const qsPayload = {
     class_id: classId,