mirror of
https://github.com/Steffo99/greed.git
synced 2024-11-22 05:54:18 +00:00
PEP8
This commit is contained in:
parent
9688575fd7
commit
5828ba8f31
1 changed files with 17 additions and 11 deletions
28
worker.py
28
worker.py
|
@ -408,10 +408,12 @@ class ChatWorker(threading.Thread):
|
||||||
caption=product.text(cart_qty=cart[callback.message.message_id][1]),
|
caption=product.text(cart_qty=cart[callback.message.message_id][1]),
|
||||||
reply_markup=product_inline_keyboard)
|
reply_markup=product_inline_keyboard)
|
||||||
|
|
||||||
self.bot.edit_message_text(chat_id=self.chat.id, message_id=final_msg.message_id,
|
self.bot.edit_message_text(
|
||||||
text=strings.conversation_confirm_cart.format(product_list=self.__get_cart_summary(cart),
|
chat_id=self.chat.id,
|
||||||
total_cost=str(self.__get_cart_value(cart))),
|
message_id=final_msg.message_id,
|
||||||
reply_markup=final_inline_keyboard)
|
text=strings.conversation_confirm_cart.format(product_list=self.__get_cart_summary(cart),
|
||||||
|
total_cost=str(self.__get_cart_value(cart))),
|
||||||
|
reply_markup=final_inline_keyboard)
|
||||||
# If the Remove from cart button has been pressed...
|
# If the Remove from cart button has been pressed...
|
||||||
elif callback.data == "cart_remove":
|
elif callback.data == "cart_remove":
|
||||||
# Get the selected product, ensuring it exists
|
# Get the selected product, ensuring it exists
|
||||||
|
@ -450,10 +452,12 @@ class ChatWorker(threading.Thread):
|
||||||
caption=product.text(cart_qty=cart[callback.message.message_id][1]),
|
caption=product.text(cart_qty=cart[callback.message.message_id][1]),
|
||||||
reply_markup=product_inline_keyboard)
|
reply_markup=product_inline_keyboard)
|
||||||
|
|
||||||
self.bot.edit_message_text(chat_id=self.chat.id, message_id=final_msg.message_id,
|
self.bot.edit_message_text(
|
||||||
text=strings.conversation_confirm_cart.format(product_list=self.__get_cart_summary(cart),
|
chat_id=self.chat.id,
|
||||||
total_cost=str(self.__get_cart_value(cart))),
|
message_id=final_msg.message_id,
|
||||||
reply_markup=final_inline_keyboard)
|
text=strings.conversation_confirm_cart.format(product_list=self.__get_cart_summary(cart),
|
||||||
|
total_cost=str(self.__get_cart_value(cart))),
|
||||||
|
reply_markup=final_inline_keyboard)
|
||||||
# If the done button has been pressed...
|
# If the done button has been pressed...
|
||||||
elif callback.data == "cart_done":
|
elif callback.data == "cart_done":
|
||||||
# End the loop
|
# End the loop
|
||||||
|
@ -489,14 +493,16 @@ class ChatWorker(threading.Thread):
|
||||||
# User has credit and valid order, perform transaction now
|
# User has credit and valid order, perform transaction now
|
||||||
self.__order_transaction(order=order, value=-int(self.__get_cart_value(cart)))
|
self.__order_transaction(order=order, value=-int(self.__get_cart_value(cart)))
|
||||||
|
|
||||||
def __get_cart_value(self, cart):
|
@staticmethod
|
||||||
|
def __get_cart_value(cart):
|
||||||
# Calculate total items value in cart
|
# Calculate total items value in cart
|
||||||
value = utils.Price(0)
|
value = utils.Price(0)
|
||||||
for product in cart:
|
for product in cart:
|
||||||
value += cart[product][0].price * cart[product][1]
|
value += cart[product][0].price * cart[product][1]
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def __get_cart_summary(self, cart):
|
@staticmethod
|
||||||
|
def __get_cart_summary(cart):
|
||||||
# Create the cart summary
|
# Create the cart summary
|
||||||
product_list = ""
|
product_list = ""
|
||||||
for product_id in cart:
|
for product_id in cart:
|
||||||
|
@ -505,7 +511,7 @@ class ChatWorker(threading.Thread):
|
||||||
return product_list
|
return product_list
|
||||||
|
|
||||||
def __order_transaction(self, order, value):
|
def __order_transaction(self, order, value):
|
||||||
# Create a new transaction and add it to the session
|
# Create a new transaction and add it to the session
|
||||||
transaction = db.Transaction(user=self.user,
|
transaction = db.Transaction(user=self.user,
|
||||||
value=value,
|
value=value,
|
||||||
order_id=order.order_id)
|
order_id=order.order_id)
|
||||||
|
|
Loading…
Reference in a new issue