steffo/greed
steffo/greed
1
Fork 0
mirror of https://github.com/Steffo99/greed.git synced 2024-11-27 16:14:19 +00:00
Code Activity

feature Payments2.0

Browse source
This commit is contained in:
valentino-sm 2021-05-06 09:34:12 +05:00
parent 7c7c1ce0d9
commit dfcd44e5ce
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 67109941CB0F2DAB
2 changed files with 94 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core.py
View file

@ -205,7 +205,28 @@ def main():
# Forward the update to the corresponding worker
receiving_worker = chat_workers.get(update.pre_checkout_query.from_user.id)
# Check if it's the active invoice for this chat
if receiving_worker is None or \
if update.pre_checkout_query.invoice_payload.startswith("prod-"):
log.info(f"Received payment2.0")
# Check if a worker already exists for that chat
if receiving_worker is not None:
receiving_worker.stop("request")
# Initialize a new worker for the payment2.0
chat = telegram.Chat(id=update.pre_checkout_query.from_user.id, type='private')
new_worker = worker.Worker(bot=bot,
chat=chat,
telegram_user=update.pre_checkout_query.from_user,
cfg=user_cfg,
engine=engine,
daemon=True)
# Set start_point to checkout process
new_worker.start_point=new_worker.fast_checkout_process
# Start the worker
log.debug(f"Starting {new_worker.name} for Payments2.0")
new_worker.start()
# Store the worker in the dictionary
chat_workers[update.pre_checkout_query.from_user.id] = new_worker
receiving_worker = new_worker
elif receiving_worker is None or \
update.pre_checkout_query.invoice_payload != receiving_worker.invoice_payload:
# Notify the user that the invoice has expired
log.debug(f"Received a pre-checkout query for an expired invoice in: {update.pre_checkout_query.from_user.id}")

73
worker.py
View file

@ -883,6 +883,44 @@ class Worker(threading.Thread):
# Commit all the changes
self.session.commit()
def fast_checkout_process(self):
precheckoutquery = self.__wait_for_precheckoutquery(cancellable=True)
# Check if the user has cancelled the invoice
if isinstance(precheckoutquery, CancelSignal):
# Exit the function
return
id = precheckoutquery.invoice_payload.split('-', 1)[1]
if not id.isnumeric():
self.bot.answer_pre_checkout_query(precheckoutquery.id, ok=False, error_message="Invalid Invoice")
return
product = self.session.query(db.Product).filter_by(id=id, deleted=False).one_or_none()
if product is None:
self.bot.answer_pre_checkout_query(precheckoutquery.id, ok=False, error_message="Invoice was expired")
return
# Check correct amount
amount = self.Price(product.price)
fee = int(self.__get_total_fee(amount))
if precheckoutquery.total_amount != amount + fee:
self.bot.answer_pre_checkout_query(precheckoutquery.id, ok=False, error_message="The price was expired")
return
# Create a new Order
order = db.Order(user=self.user,
creation_date=datetime.datetime.now(),
notes="")
# Add the record to the session and get an ID
self.session.add(order)
order_item = db.OrderItem(product=product, order=order)
self.session.add(order_item)
self.__success_payment_processing(precheckoutquery, fee)
if self.user.credit < amount + fee:
# Rollback all the changes
self.session.rollback()
else:
# User has credit and valid order, perform transaction now
self.__order_transaction(order=order, value=-int(amount + fee))
def __get_total_fee(self, amount):
# Calculate a fee for the required amount
fee_percentage = self.cfg["Payments"]["CreditCard"]["fee_percentage"] / 100
@ -907,7 +945,7 @@ class Worker(threading.Thread):
# Create a keyboard with the admin main menu based on the admin permissions specified in the db
keyboard = []
if self.admin.edit_products:
keyboard.append([self.loc.get("menu_products")])
keyboard.append([self.loc.get("menu_products"), "Payments 2.0"])
if self.admin.receive_orders:
keyboard.append([self.loc.get("menu_orders")])
if self.admin.create_transactions:
@ -921,6 +959,7 @@ class Worker(threading.Thread):
reply_markup=telegram.ReplyKeyboardMarkup(keyboard, one_time_keyboard=True))
# Wait for a reply from the user
selection = self.__wait_for_specific_message([self.loc.get("menu_products"),
"Payments 2.0",
self.loc.get("menu_orders"),
self.loc.get("menu_user_mode"),
self.loc.get("menu_edit_credit"),
@ -931,6 +970,9 @@ class Worker(threading.Thread):
if selection == self.loc.get("menu_products"):
# Open the products menu
self.__products_menu()
elif selection == "Payments 2.0":
# Open the Payments2.0 menu
self.__payments20_menu()
# If the user has selected the Orders option...
elif selection == self.loc.get("menu_orders"):
# Open the orders menu
@ -958,6 +1000,35 @@ class Worker(threading.Thread):
# Generate the .csv file
self.__transactions_file()
def __payments20_menu(self):
"""Display the admin menu to select a product to edit."""
log.debug("Displaying __payments2.0_menu")
# Get the products list from the db
products = self.session.query(db.Product).filter_by(deleted=False).all()
# Create a list of product names
self.bot.send_message(self.chat.id, "Forward invoices for buzz")
# Payments 2.0 invoices for forwarding
for product in products:
amount = self.Price(product.price)
prices = [telegram.LabeledPrice(label=self.loc.get("payment_invoice_label"), amount=int(amount))]
# If the user has to pay a fee when using the credit card, add it to the prices list
fee = int(self.__get_total_fee(amount))
if fee > 0:
prices.append(telegram.LabeledPrice(label=self.loc.get("payment_invoice_fee_label"),
amount=fee))
self.bot.send_invoice(self.chat.id,
title=product.name,
description=product.description,
payload="prod-" + str(product.id),
provider_token=self.cfg["Payments"]["CreditCard"]["credit_card_token"],
currency=self.cfg["Payments"]["currency"],
prices=prices,
need_name=self.cfg["Payments"]["CreditCard"]["name_required"],
need_email=self.cfg["Payments"]["CreditCard"]["email_required"],
need_phone_number=self.cfg["Payments"]["CreditCard"]["phone_required"])
def __products_menu(self):
"""Display the admin menu to select a product to edit."""
log.debug("Displaying __products_menu")