gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/remove-apple-google-pay' into 'main'

Browse Source 
hotfix/remove-apple-google-pay

See merge request witapp/aura-webapp!501
This commit is contained in:
Daniil Chemerkin 2024-12-26 12:42:00 +00:00
commit f16f7e8f72
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/PalmistryV1/components/PaymentModalV1/PaymentForm/index.tsx
View File

@ -10,8 +10,6 @@ import cn from "classnames";
import { getFormattedPrice } from '@/utils/price.utils'; import { getFormattedPrice } from '@/utils/price.utils';
import SecurityPayments from '@/components/pages/TrialPayment/components/SecurityPayments'; import SecurityPayments from '@/components/pages/TrialPayment/components/SecurityPayments';
import { usePayment } from '@/hooks/payment/nmi/usePayment'; import { usePayment } from '@/hooks/payment/nmi/usePayment';
import GooglePayButton from '@/components/Payment/nmi/GooglePayButton';
import ApplePayButton from '@/components/Payment/nmi/ApplePayButton';
import Title from '@/components/Title'; import Title from '@/components/Title';
import metricService, { EGoals, EMetrics } from '@/services/metric/metricService'; import metricService, { EGoals, EMetrics } from '@/services/metric/metricService';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
@ -130,8 +128,8 @@ function PaymentForm({
<CreditCardIcon /> <CreditCardIcon />
<div>Credit / Debit Card</div> <div>Credit / Debit Card</div>
</div> </div>
<GooglePayButton /> {/* <GooglePayButton />
<ApplePayButton /> <ApplePayButton /> */}
<div className={styles.infoContainer}> <div className={styles.infoContainer}>
<SecurityPayments /> <SecurityPayments />
<p className={styles.address}> <p className={styles.address}>

4
src/hooks/payment/nmi/usePayment.ts
View File

@ -61,8 +61,8 @@ export const usePayment = ({ placementKey, activeProduct }: IUsePaymentProps) =>
} }
}, },
price: formPrice, price: formPrice,
country: "US", // country: "US",
currency: "USD", // currency: "USD",
}); });
}, [placementId, paywallId]); }, [placementId, paywallId]);

8
src/utils/FBMetaPixel/index.tsx
View File

@ -166,19 +166,19 @@ fbq('track', 'PageView');`;
{isPalmistry && <script>{FBScriptPalmistry2}</script>} {isPalmistry && <script>{FBScriptPalmistry2}</script>}
{isPalmistry && <script>{FBScriptPalmistry3}</script>} {isPalmistry && <script>{FBScriptPalmistry3}</script>}
{isPalmistry && locale === "es" && ( {isPalmistry && locale === "es" && (
<>
<script>{FBScriptPalmistryES1}</script> <script>{FBScriptPalmistryES1}</script>
)}
{isPalmistry && locale === "es" && (
<script>{FBScriptPalmistryES2}</script> <script>{FBScriptPalmistryES2}</script>
</>
)} )}
{isPalmistry && locale?.includes("pt") && ( {isPalmistry && locale?.includes("pt") && (
<script>{FBScriptPalmistryPT1}</script> <script>{FBScriptPalmistryPT1}</script>
)} )}
{isPalmistry && locale === "en" && ( {isPalmistry && locale === "en" && (
<>
<script>{FBScriptPalmistryEN1}</script> <script>{FBScriptPalmistryEN1}</script>
)}
{isPalmistry && locale === "en" && (
<script>{FBScriptPalmistryEN2}</script> <script>{FBScriptPalmistryEN2}</script>
</>
)} )}
{/* Compatibility */} {/* Compatibility */}
{!isPalmistry && !isChats && locale === "es" && ( {!isPalmistry && !isChats && locale === "es" && (