photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-485 add more attributes to designers that are required for the esales import

Browse Source
This commit is contained in:
Martin
2016-06-01 16:19:43 +02:00
parent 390d18679e
commit fe8d46540d
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/models/designer.py
+21 -9
View File
@@ -4,23 +4,35 @@ from api import db
class Designer(db.Model): class Designer(db.Model):
__tablename__ = 'designers' __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) designerid = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(100), nullable=False) 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) 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) territory = db.Column(db.String(2), nullable=False)
currency = db.Column(db.String(3), nullable=False) username = db.Column(db.String(100), nullable=False)
commission = db.Column(db.Integer, nullable=False) visible_designerpage = db.Column(db.Integer(), nullable=False, default=1)
commission_resale = db.Column(db.Integer, nullable=False) 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 { return {
'commission': self.commission,
'commission_resale': self.commission_resale,
'currency': self.currency,
'designerid': self.designerid, 'designerid': self.designerid,
'name': self.name, 'name': self.name,
'no_follow': self.no_follow,
'path': self.path, 'path': self.path,
'username': self.username, 'sort_desc': 1 if self.sort_desc else 0,
'territory': self.territory, 'territory': self.territory,
'currency': self.currency, 'username': self.username,
'commission': self.commission, 'visible_designerpage': self.visible_designerpage,
'commission_resale': self.commission_resale 'visible_list': self.visible_list,
'visible_productpage': self.visible_productpage,
'visible_search': self.visible_search,
} }
api/tasks/esales.py
+7 -1
View File
@@ -8,7 +8,13 @@ from esales.utils import ImportFile
def update_designer(designer): def update_designer(designer):
category = Category( category = Category(
"root/designer/{}".format(designer.path), "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, hidden=1,
path="/designers/{}".format(designer.path) path="/designers/{}".format(designer.path)
) )