diff --git a/api/models/designer.py b/api/models/designer.py index f1bfabb..6ceff81 100644 --- a/api/models/designer.py +++ b/api/models/designer.py @@ -4,23 +4,35 @@ from api import db class Designer(db.Model): __tablename__ = 'designers' + commission = db.Column(db.Integer(), nullable=False) + commission_resale = db.Column(db.Integer(), nullable=False) + currency = db.Column(db.String(3), nullable=False) designerid = db.Column(db.Integer, primary_key=True) name = db.Column(db.String(100), nullable=False) + no_follow = db.Column(db.Integer(), nullable=True, default=0) path = db.Column(db.String(100), nullable=False) - username = db.Column(db.String(100), nullable=False) + sort_desc = db.Column(db.Boolean(), nullable=False, default=False) territory = db.Column(db.String(2), nullable=False) - currency = db.Column(db.String(3), nullable=False) - commission = db.Column(db.Integer, nullable=False) - commission_resale = db.Column(db.Integer, nullable=False) + username = db.Column(db.String(100), nullable=False) + visible_designerpage = db.Column(db.Integer(), nullable=False, default=1) + visible_list = db.Column(db.Integer(), nullable=False, default=1) + visible_productpage = db.Column(db.Integer(), nullable=False, default=1) + visible_search = db.Column(db.Integer(), nullable=False, default=1) - def to_json(self, nested=False): + def to_json(self): return { + 'commission': self.commission, + 'commission_resale': self.commission_resale, + 'currency': self.currency, 'designerid': self.designerid, 'name': self.name, + 'no_follow': self.no_follow, 'path': self.path, - 'username': self.username, + 'sort_desc': 1 if self.sort_desc else 0, 'territory': self.territory, - 'currency': self.currency, - 'commission': self.commission, - 'commission_resale': self.commission_resale + 'username': self.username, + 'visible_designerpage': self.visible_designerpage, + 'visible_list': self.visible_list, + 'visible_productpage': self.visible_productpage, + 'visible_search': self.visible_search, } diff --git a/api/tasks/esales.py b/api/tasks/esales.py index 71a4b12..cd8379f 100644 --- a/api/tasks/esales.py +++ b/api/tasks/esales.py @@ -8,7 +8,13 @@ from esales.utils import ImportFile def update_designer(designer): category = Category( "root/designer/{}".format(designer.path), - designer.name, + name=designer.name, + visible_search=designer.visible_search, + visible_list=designer.visible_list, + visible_productpage=designer.visible_productpage, + visible_designerpage=designer.visible_designerpage, + sort_desc=designer.sort_desc, + no_follow=designer.no_follow, hidden=1, path="/designers/{}".format(designer.path) )