diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 7e7208e..7418bdb 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -530,6 +530,11 @@ class MyProductsService(BaseService): aboutFields = SettingsItemsData.get_site_about_items() testimonialFields = SettingsItemsData.get_site_testimonial_settings() + blogConnect = False + if product_data.blog_product_id != None or product_data.blog_product_id != '': + blogConnect = True + blog_product_data = Products.get_product_by_product_id(product_data.blog_product_id) + settings_items = {} if product_id == "A000001": settings_items = { @@ -549,9 +554,9 @@ class MyProductsService(BaseService): "social_tab": {"title": 'Socials', "controls": 'social', "active": '', "custom": False, "data": socialFields, "list_order": 6}, "template_tab": {"title": 'Template', "controls": 'template', "active": '', "custom": True, - "data": templateData, "list_order": 7}, + "data": templateData, "list_order": 17}, "color_scheme_tab": {"title": 'Color Scheme', "controls": 'color-scheme', "active": '', - "custom": True, "data": {}, "list_order": 8} + "custom": True, "data": {}, "list_order": 18} } if product_id == "A000002": @@ -575,17 +580,21 @@ class MyProductsService(BaseService): "social_tab": {"title": 'Socials', "controls": 'social', "active": '', "custom": False, "data": socialFields, "list_order": 7}, "template_tab": {"title": 'Template', "controls": 'template', "active": '', "custom": True, - "data": templateData, "list_order": 8}, + "data": templateData, "list_order": 18}, "color_scheme_tab": {"title": 'Color Scheme', "controls": 'color-scheme', "active": '', - "custom": True, "data": {}, "list_order": 8} + "custom": True, "data": {}, "list_order": 19} } - # + if blogConnect: + settings_items["blog_connect_tab"] = {"title": 'Blog Connect', "controls": 'blog-connect-scheme', "active": '', + "custom": True, "data": {}, "list_order": 9} + # Simulate processing response_data = { "settings_items": settings_items, "member_id": member_id, "product_subscription_uid": product_subscription_uid, + "blog_connect": blogConnect } return ResponseHelper.success(data=response_data) @@ -628,7 +637,6 @@ class MyProductsService(BaseService): member_id = member_data.id - membersSubResult = MembersProducts.get_member_product_by_subscription_uid(subscription_uid) if not membersSubResult: return { @@ -639,7 +647,6 @@ class MyProductsService(BaseService): }, 400 logger.info(f"External URL Member Data: {member_data}") - if int(membersSubResult.member_id) != member_id: return { "message": "Mismatch subscription and User", @@ -648,7 +655,6 @@ class MyProductsService(BaseService): "error": f"Mismatch subscription and User." }, 400 - setUrlResult = MembersProducts.set_member_product_external_url(member_id, membersSubResult.product_id, external_url) diff --git a/app/api/services/register.py b/app/api/services/register.py index ff84bd2..b655b64 100644 --- a/app/api/services/register.py +++ b/app/api/services/register.py @@ -61,7 +61,7 @@ class RegisterService(BaseService): previousAcc = Members.get_member_by_username(username) if previousAcc: response_data = { - "error_message": "try another username ", + "error_message": "Please try another username!", "error_message_key": "use_another_username", } return ResponseHelper.error(data=response_data) diff --git a/app/models/products.py b/app/models/products.py index 1299cb6..b33738c 100644 --- a/app/models/products.py +++ b/app/models/products.py @@ -35,6 +35,7 @@ class Products(db.Model): list_order = db.Column(db.Integer, nullable=True, default=0) contacts = db.Column(db.Integer, nullable=True, default=0) comments = db.Column(db.Integer, nullable=True, default=0) + blog_product_id = db.Column(db.String(25), nullable=True) members_products = relationship( "MembersProducts", @@ -116,6 +117,7 @@ class Products(db.Model): 'id': self.id, 'uid': self.uid, 'product_id': self.product_id, + 'blog_product_id': self.blog_product_id, 'name': self.name, 'description' : self.description, 'start_url': self.start_url,