Add more "manually priced" awareness to pricing batch UI

This commit is contained in:
Lance Edgar 2017-11-29 18:25:47 -06:00
parent 366b1c9073
commit df3623b663
2 changed files with 5 additions and 0 deletions

View file

@ -70,6 +70,7 @@ class PricingBatchView(BatchMasterView):
'new_price', 'new_price',
'price_margin', 'price_margin',
'price_diff', 'price_diff',
'manually_priced',
'status_code', 'status_code',
] ]
@ -79,9 +80,11 @@ class PricingBatchView(BatchMasterView):
fs.id, fs.id,
fs.description, fs.description,
fs.min_diff_threshold, fs.min_diff_threshold,
fs.calculate_for_manual,
fs.notes, fs.notes,
fs.created, fs.created,
fs.created_by, fs.created_by,
fs.rowcount,
fs.executed, fs.executed,
fs.executed_by, fs.executed_by,
]) ])
@ -99,6 +102,7 @@ class PricingBatchView(BatchMasterView):
g.set_label('price_margin', "Margin") g.set_label('price_margin', "Margin")
g.set_label('price_markup', "Markup") g.set_label('price_markup', "Markup")
g.set_label('price_diff', "Diff") g.set_label('price_diff', "Diff")
g.set_label('manually_priced', "Manual")
def row_grid_extra_class(self, row, i): def row_grid_extra_class(self, row, i):
if row.status_code == row.STATUS_CANNOT_CALCULATE_PRICE: if row.status_code == row.STATUS_CANNOT_CALCULATE_PRICE:

View file

@ -519,6 +519,7 @@ class ProductsView(MasterView):
class PricingParamsForm(wtforms.Form): class PricingParamsForm(wtforms.Form):
description = wtforms.StringField() description = wtforms.StringField()
min_diff_threshold = wtforms.DecimalField(places=2, validators=[wtforms.validators.optional()]) min_diff_threshold = wtforms.DecimalField(places=2, validators=[wtforms.validators.optional()])
calculate_for_manual = wtforms.BooleanField()
notes = wtforms.TextAreaField() notes = wtforms.TextAreaField()
return PricingParamsForm(self.request.POST) return PricingParamsForm(self.request.POST)