diff --git a/payment_backend/app.py b/payment_backend/app.py index d4ded9a..9c2146f 100644 --- a/payment_backend/app.py +++ b/payment_backend/app.py @@ -35,8 +35,8 @@ def create_order(): return jsonify({ "message": "wrong payment method" }), 400 - quant = data.get('amount', 0) - if quant < config.order.min_quant: + quant = int(data.get('amount', 0)) + if quant < config.order.get_int("min_quant"): return jsonify({ "message": "Amount below minimum limit." }), 400 diff --git a/payment_backend/config/utils.py b/payment_backend/config/utils.py index 5153730..585c63e 100644 --- a/payment_backend/config/utils.py +++ b/payment_backend/config/utils.py @@ -87,9 +87,10 @@ class Setting: self[k] = getattr(argument_parser, k) def get(self, item, default=None): + item = item.lower() if item not in self.__dict__ and self._parent is not None: - return self._parent.get(item.lower(), default) - return default + return self._parent.get(item, default) + return self.__dict__.get(item, default) def get_int(self, item): return int(self.get(item)) @@ -119,6 +120,9 @@ class Setting: for k, v in self.__dict__.items(): yield k, v + def __contains__(self, item): + return item.lower() in self.__dict__ + def __str__(self): def _str_helper(settings, visited=None, indent_count=0): if visited is None: @@ -138,6 +142,7 @@ class Setting: else: lines.append(f"{indent_str}{key}: {value}") return '\n'.join(lines) + return _str_helper(self) def __repr__(self): @@ -157,6 +162,7 @@ class Setting: else: lines.append(f"{key}={value}") return f'Setting({", ".join(lines)})' + return _str_helper(self) diff --git a/payment_backend/services/order.py b/payment_backend/services/order.py index 125c8e1..e233905 100644 --- a/payment_backend/services/order.py +++ b/payment_backend/services/order.py @@ -19,7 +19,7 @@ class OrderService: order_id = f"{date_str}-{unique_id}" create_timestamp = self.order_repo.create(order_id, quant, - address, self.config['PaymentAddresses']) + address, self.config['PaymentAddresses']['usdt']) return order_id, create_timestamp def finish_order(self, order_id): diff --git a/payment_headend/index.html b/payment_headend/index.html index 3a0d446..8209fb7 100644 --- a/payment_headend/index.html +++ b/payment_headend/index.html @@ -15,9 +15,16 @@

Kind Reminder:

    -
  1. Currently, only USDT deposits are supported, and balances can be withdrawn. Other deposit methods are under development. Please stay tuned for announcements regarding their release.
    2. -
  2. The deposit amount will be credited within 1 minute after payment. If it does not arrive within 5 minutes, please contact customer support and provide your U address, deposit screenshot, transaction ID, and account name.
    3. -
  3. The actual amount credited for USDT deposits must match the amount displayed on the USDT deposit payment page; otherwise, the deposit will not be credited. Please be informed.
    4. +
  4. Currently, only USDT deposits are supported, and balances can be withdrawn. Other deposit methods are + under development. Please stay tuned for announcements regarding their release. +
    5. +
  5. The deposit amount will be credited within 1 minute after payment. If it does not arrive within 5 + minutes, please contact customer support and provide your U address, deposit screenshot, transaction ID, + and account name. +
    6. +
  6. The actual amount credited for USDT deposits must match the amount displayed on the USDT deposit payment + page; otherwise, the deposit will not be credited. Please be informed. +
Special Notice: Please ensure the recipient address is correct when making a transfer! @@ -59,28 +66,28 @@
@@ -133,8 +140,8 @@
Wallet address: TNrzRLi2ArZhiMx51zusBEHHh1qyB9Ldq2 + copy +
diff --git a/payment_headend/index.js b/payment_headend/index.js index a9b85f5..a22601d 100644 --- a/payment_headend/index.js +++ b/payment_headend/index.js @@ -47,7 +47,7 @@ function finishOrder() { return; } - const url = `/finishOrder?orderID=${orderID}`; + const url = `http://127.0.0.1:5000/finishOrder?orderID=${orderID}`; return fetch(url, { method: 'GET' @@ -95,36 +95,6 @@ function handleMultipleAddresses(walletAddresses) { openAddressModal(); } -// Function to show the modal with an image -function showImageModal(imageUrl, walletAddress) { - // Find the modal and modal body - const modal = document.getElementById('modal'); - const modalBody = document.getElementById('modalBody'); - - // Clear any previous content - modalBody.innerHTML = ''; - - // Create an image element - const imageElement = document.createElement('img'); - imageElement.src = imageUrl; - imageElement.alt = 'Image'; - imageElement.style.maxWidth = '100%'; - imageElement.style.maxHeight = '80vh'; // Limit the height for better UX - - // Create a div to display the wallet address - const addressDiv = document.createElement('div'); - addressDiv.textContent = walletAddress; - addressDiv.style.marginTop = '10px'; - addressDiv.style.fontSize = '16px'; - addressDiv.style.color = '#333'; - - // Add image and address to modal body - modalBody.appendChild(imageElement); - modalBody.appendChild(addressDiv); - - openAddressModal(); -} - function openPaymentModal(orderId, amount, orderCreateTimestamp, orderExpirationTime) { document.getElementById('paymentModal').style.display = 'flex'; @@ -184,11 +154,7 @@ function promptUserForPaymentMethod() { } function handleError(message) { - const errorDiv = document.getElementById('error'); - errorDiv.innerText = `错误：${message}`; - errorDiv.classList.remove('hidden'); - document.getElementById('message').classList.add('hidden'); - document.getElementById('addresses').classList.add('hidden'); + alert(message) } function promptUserForAddress() {