diff --git a/UI_V2/pages/profile/profilepage.py b/UI_V2/pages/profile/profilepage.py index 24ef025..11024ca 100644 --- a/UI_V2/pages/profile/profilepage.py +++ b/UI_V2/pages/profile/profilepage.py @@ -148,6 +148,26 @@ class ProfilePage: self.error_message.value = "Profilul a fost salvat!" self.error_message.color = ft.Colors.GREEN self.error_message.update() + self.user = self.user_manager.get(self.user['id']) + self.page.session.set('user',self.user) + self.user_name.value = self.user['name'] + self.user_name.update() + self.phone.value = self.user['phone'] + self.phone.update() + self.address.value = self.user['address'].split("~")[0] if self.user['address'] else '' + self.address.update() + + self.company = self.company_manager.get_company(self.user['id']) + self.company_name.value=self.company['name'] if self.company else '' + self.company_name.update() + self.vat.value = self.company['vat'] if self.company else '' + self.vat.update() + self.register_number.value=self.company['register_number'] if self.company else '' + self.register_number.update() + self.company_address.value=self.company['address'] if self.company else '' + self.company_address.update() + self.second_address.value=self.user['address'].split("~")[1] if self.user['address'] and len(self.user['address'].split("~"))>1 else '' + self.second_address.update() def on_back_btn_click(self, e): self.page.go('/') diff --git a/UI_V2/pages/shopping_cart/cart.py b/UI_V2/pages/shopping_cart/cart.py index 33f1e0f..2ab2388 100644 --- a/UI_V2/pages/shopping_cart/cart.py +++ b/UI_V2/pages/shopping_cart/cart.py @@ -3,6 +3,7 @@ from dbActions.orders import Orders from dbActions.products import Products from dbActions.company import Company from dbActions.users import Users +from dbActions.fidelity_cards import FidelityCards from helpers.emails import send_gmail import re @@ -14,6 +15,7 @@ class Cart: self.productsDB = Products() self.company_manager = Company() self.user_manager = Users() + self.card_manager = FidelityCards() self.products = [] self.is_second_address = None self.is_company = None @@ -202,6 +204,15 @@ class Cart: self.page.add(self.delete_dialog) self.page.add(self.confirm_dialog) + + discount_cards= self.card_manager.get_all_fidelity_cards() + _card_id = None + for card in discount_cards: + if card['phone_number'] == self.user['phone']: + _card_id = card['card_id'] + break + + self.card_id = ft.Text(f"Card de reducere nr. {_card_id}" if _card_id else '', weight=ft.FontWeight.BOLD) def on_second_address_btn_click(self, e): self.is_second_address = True @@ -595,11 +606,12 @@ class Cart: ft.Column( [ self.pret_total, - ft.Text( - "Produse adugate:", - weight=ft.FontWeight.BOLD, - size=15 - ), + self.card_id, + # ft.Text( + # "Produse adugate:", + # weight=ft.FontWeight.BOLD, + # size=15 + # ), ] ) ]