From df3623b6637cc8c6311ee31866f89b6ae2662cf2 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 29 Nov 2017 18:25:47 -0600 Subject: [PATCH] Add more "manually priced" awareness to pricing batch UI --- tailbone/views/batch/pricing.py | 4 ++++ tailbone/views/products.py | 1 + 2 files changed, 5 insertions(+) diff --git a/tailbone/views/batch/pricing.py b/tailbone/views/batch/pricing.py index 273430b1..70199440 100644 --- a/tailbone/views/batch/pricing.py +++ b/tailbone/views/batch/pricing.py @@ -70,6 +70,7 @@ class PricingBatchView(BatchMasterView): 'new_price', 'price_margin', 'price_diff', + 'manually_priced', 'status_code', ] @@ -79,9 +80,11 @@ class PricingBatchView(BatchMasterView): fs.id, fs.description, fs.min_diff_threshold, + fs.calculate_for_manual, fs.notes, fs.created, fs.created_by, + fs.rowcount, fs.executed, fs.executed_by, ]) @@ -99,6 +102,7 @@ class PricingBatchView(BatchMasterView): g.set_label('price_margin', "Margin") g.set_label('price_markup', "Markup") g.set_label('price_diff', "Diff") + g.set_label('manually_priced', "Manual") def row_grid_extra_class(self, row, i): if row.status_code == row.STATUS_CANNOT_CALCULATE_PRICE: diff --git a/tailbone/views/products.py b/tailbone/views/products.py index 807f2a8f..53e5057e 100644 --- a/tailbone/views/products.py +++ b/tailbone/views/products.py @@ -519,6 +519,7 @@ class ProductsView(MasterView): class PricingParamsForm(wtforms.Form): description = wtforms.StringField() min_diff_threshold = wtforms.DecimalField(places=2, validators=[wtforms.validators.optional()]) + calculate_for_manual = wtforms.BooleanField() notes = wtforms.TextAreaField() return PricingParamsForm(self.request.POST)