Merge branch 'master' into feat/merge-addresses-button-detail

Author: chedieck

PRIVACY.md

@@ -0,0 +1,30 @@
+## Privacy Policy
+
+**Effective Date:** 2025-05-03
+
+At PayButton.org, your privacy matters. Here’s what we collect and how we use it:
+
+1. **What We Collect**
+   - Basic info associated with your account (eg. email, organization)
+   - Technical data (eg. IP address, browser info) for security and analytics
+   - Payment metadata (eg. amount, recipient address) for transaction records
+
+2. **What We Don’t Collect**
+   - Credit card information
+   - Private keys
+
+3. **Cookies & Analytics**
+   - We use cookies and tracking tools (like Google Analytics) to improve site performance.
+
+4. **Third Parties**
+   - We may use third-party services (e.g., CDN, analytics providers), but we don’t share your personal data for marketing.
+
+5. **Your Control**
+   - You can update your account settings anytime.
+   - Contact us to request data deletion or access.
+
+6. **Security**
+   - We take reasonable steps to protect your data, but no system is 100% secure.
+
+7. **Changes**
+   - We may revise this policy. Continued use means you accept the new terms.

TERMS.md

@@ -0,0 +1,12 @@
+## Terms of Use
+
+**Effective Date:** 2025-05-03
+
+Welcome to PayButton.org. By using this site, you agree to the following terms:
+
+1. **Eligibility**: This service is available worldwide and may be used by individuals of any age.
+2. **Account**: You may create an account to manage your settings. You are responsible for keeping your login information secure.
+3. **Usage**: PayButton.org does not store or control funds. Any payment activity you associate with your PayButton account is read-only and on-chain.
+4. **Conduct**: You agree not to abuse the platform or use it for illegal activity. We may suspend accounts for violations.
+5. **Changes**: We may update these terms at any time. Continued use of the site means you accept the changes.
+6. **Disclaimer**: PayButton.org is provided “as is” without warranty. We are not responsible for losses resulting from site use or payment activity.

assets/settings-slider-icon.png

@@ -55,7 +55,13 @@ export default function CodeBlock ({ button }): JSX.Element {
         return camelToKebabCase(key) + `="${value as string}"`
       }
     } else if (codeType === 'js') {
-      if (key === 'amount' || key === 'goalAmount' || key === 'onSuccess' || key === 'onTransaction' || typeof value === 'boolean') {
+      if (key === 'amount' ||
+      key === 'goalAmount' ||
+      key === 'onSuccess' ||
+      key === 'onTransaction' ||
+      key === 'onClose' ||
+      key === 'onOpen' ||
+       typeof value === 'boolean') {
         if (key === 'randomSatoshis' && button.amount <= 0) {
           return ''
         } else return `  ${key}: ${value as string}`
@@ -67,7 +73,13 @@ export default function CodeBlock ({ button }): JSX.Element {
         return `  ${key}: '${value as string}'`
       }
     } else {
-      if (key === 'amount' || key === 'goalAmount' || key === 'onSuccess' || key === 'onTransaction' || typeof value === 'boolean') {
+      if (key === 'amount' ||
+          key === 'goalAmount' ||
+          key === 'onSuccess' ||
+          key === 'onTransaction' ||
+          key === 'onClose' ||
+          key === 'onOpen' ||
+          typeof value === 'boolean') {
         if (key === 'randomSatoshis' && button.amount <= 0) {
           return ''
         } else return `const ${key} = ${value as string}`

components/ButtonGenerator/CodeBlock.tsx

@@ -89,6 +89,16 @@ export const generatorFormFields = [
     onChange: 'handleChange',
     helpText: 'The text displayed upon successful payment'
   },
+  {
+    name: 'Contribution Offset',
+    placeholder: 'Contribution Offset',
+    key: 'contributionOffset',
+    className: 'col_lg',
+    type: 'input',
+    onChange: 'handleChange',
+    helpText: 'Adjusts the total contributions displayed, simulating prior contributions or subtracting from the total.',
+    advanced: true
+  },
   {
     name: 'Widget',
     key: 'widget',
@@ -180,4 +190,63 @@ export const generatorFormFields = [
     helpText: 'Removes the random ID generated for the payment that is used to prevent the onSuccess callback to be triggered by a person who has the payment screen open at the same time as another',
     advanced: true
   },
+  {
+    name: 'Disable Altpayment',
+    key: 'disableAltpayment',
+    className: 'col_sm_center',
+    type: 'boolean',
+    default: false,
+    helpText: 'Disables altpayment logic',
+    advanced: true  
+  },
+  {
+    name: 'On-close',
+    placeholder: 'Callback function',
+    key: 'onClose',
+    className: 'col_lg',
+    type: 'input',
+    onChange: 'handleChange',
+    helpText: 'Callback function that runs when the button dialog closes',
+    advanced: true
+  },
+  {
+    name: 'Auto close',
+    key: 'autoClose',
+    className: 'col_sm_center',
+    type: 'boolean',
+    default: true,
+    helpText: 'Enables auto-close of the button dialog after a successful payment',
+    advanced: true  
+  },
+  {
+    name: 'On-open',
+    placeholder: 'Callback function',
+    key: 'onOpen',
+    className: 'col_lg',
+    type: 'input',
+    onChange: 'handleChange',
+    helpText: 'Callback function that runs when the button dialog opens',
+    advanced: true
+  },
+  {
+    name: 'Ws base url',
+    placeholder: 'Your websocket server',
+    key: 'wsBaseUrl',
+    className: 'col_lg',
+    type: 'input',
+    onChange: 'handleChange',
+    helpText: 'Link to the websocket server that will be used',
+    advanced: true
+  },
+  {
+    name: 'Api base url',
+    placeholder: 'Your api server',
+    key: 'apiBaseUrl',
+    className: 'col_lg',
+    type: 'input',
+    onChange: 'handleChange',
+    helpText: 'Link to the api server that will be used',
+    advanced: true
+  },
+  
 ]

components/ButtonGenerator/data.js

@@ -36,6 +36,8 @@ interface ButtonState {
   editable: boolean
   widget: boolean
   disablePaymentId: boolean
+  contributionOffset: number
+  disableAltpayment: boolean
   opReturn: string
   [key: string]: any
 }
@@ -74,7 +76,14 @@ export const initialButtonState: ButtonState = {
   editable: false,
   widget: false,
   disablePaymentId: false,
-  opReturn: ''
+  opReturn: '',
+  contributionOffset: 0,
+  disableAltpayment: false,
+  autoClose: true,
+  onOpen: '',
+  onClose: '',
+  wsBaseURL: '',
+  apiBaseURL: '',
 }
 
 export default function ButtonGenerator (): JSX.Element {
@@ -379,6 +388,8 @@ export default function ButtonGenerator (): JSX.Element {
                   randomSatoshis={button.randomSatoshis}
                   hideToasts={button.hideToasts}
                   disableEnforceFocus={button.disableEnforceFocus}
+                  contributionOffset={button.contributionOffset}
+                  disableAltpayment={button.disableAltpayment}
                   disabled={button.disabled}
                   editable={button.editable}
                 />
@@ -412,8 +423,15 @@ export default function ButtonGenerator (): JSX.Element {
                   randomSatoshis={button.randomSatoshis}
                   hideToasts={button.hideToasts}
                   disableEnforceFocus={button.disableEnforceFocus}
+                  contributionOffset={button.contributionOffset}
+                  disableAltpayment={button.disableAltpayment}
                   disabled={button.disabled}
                   editable={button.editable}
+                  autoClose={button.autoClose}
+                  onOpen={button.onOpen}
+                  onClose={button.onClose}
+                  wsBaseURL={button.wsBaseURL}
+                  apiBaseURL={button.apiBaseURL}
                 />
                       )
                 )

components/ButtonGenerator/index.tsx

@@ -213,6 +213,8 @@ export default ({ paybuttonId, emailCredits }: IProps): JSX.Element => {
                   <div>&lt;opReturn&gt;</div>
                   <div>&lt;signature&gt;</div>
                   <div>&lt;inputAddresses&gt;</div>
+                  <div>&lt;value&gt;</div>
+
                 </div>
               </div>
               {/* Tooltip */}

components/Paybutton/PaybuttonTrigger.tsx

@@ -80,6 +80,10 @@ const TableContainer = ({ columns, dataGetter, opts, ssr, tableRefreshCount, emp
     usePagination
   )
 
+  useEffect(() => {
+    gotoPage(0)
+  }, [tableRefreshCount])
+
   useEffect(() => {
     void (async () => {
       setLoading(true)

components/TableContainer/TableContainerGetter.tsx

@@ -241,7 +241,8 @@ export const TRIGGER_POST_VARIABLES = [
   '<signature>',
   '<timestamp>',
   '<txId>',
-  '<inputAddresses>'
+  '<inputAddresses>',
+  '<value>'
 ]
 
 export const PAYBUTTON_TRANSACTIONS_FILE_HEADERS = {

constants/index.ts

@@ -1,6 +1,7 @@
 import { CacheGet } from 'redis/index'
 import { fetchUserProfileFromId } from 'services/userService'
 import { setSession } from 'utils/setSession'
+import { getFilteredTransactionCount } from 'services/transactionService'
 
 export default async (req: any, res: any): Promise<void> => {
   if (req.method === 'GET') {
@@ -10,7 +11,20 @@ export default async (req: any, res: any): Promise<void> => {
     const userProfile = await fetchUserProfileFromId(userId)
     const userPreferredTimezone = userProfile?.preferredTimezone
     const timezone = userPreferredTimezone !== '' ? userPreferredTimezone : userReqTimezone
-    const resJSON = await CacheGet.paymentsCount(userId, timezone)
-    res.status(200).json(resJSON)
+
+    let buttonIds: string[] | undefined
+    if (typeof req.query.buttonIds === 'string' && req.query.buttonIds !== '') {
+      buttonIds = (req.query.buttonIds as string).split(',')
+    }
+
+    if ((buttonIds !== undefined) && buttonIds.length > 0) {
+      const totalCount = await getFilteredTransactionCount(userId, buttonIds)
+      res.status(200).json(totalCount)
+    } else {
+      const resJSON = await CacheGet.paymentsCount(userId, timezone)
+      res.status(200).json(resJSON)
+    }
+  } else {
+    res.status(405).json({ error: 'Method not allowed' })
   }
 }