From c1f91906134c91f9c1ae439220be369f94e017f2 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Sat, 27 Nov 2021 19:08:15 -0600
Subject: [PATCH] Show current/sale pricing for products in new custorder page

---
 tailbone/templates/custorders/create.mako | 69 ++++++++++++++++++++---
 1 file changed, 61 insertions(+), 8 deletions(-)

diff --git a/tailbone/templates/custorders/create.mako b/tailbone/templates/custorders/create.mako
index cfbc4894..98dafda4 100644
--- a/tailbone/templates/custorders/create.mako
+++ b/tailbone/templates/custorders/create.mako
@@ -552,6 +552,10 @@
                               <span>{{ productSize }}</span>
                             </b-field>
 
+                            <b-field label="Case Size">
+                              <span>{{ productCaseQuantity }}</span>
+                            </b-field>
+
                             <b-field label="Unit Price">
                               <span
                                 % if product_price_may_be_questionable:
@@ -565,8 +569,18 @@
                             <!--   <span>2021-01-01</span> -->
                             <!-- </b-field> -->
 
-                            <b-field label="Case Size">
-                              <span>{{ productCaseQuantity }}</span>
+                            <b-field label="Sale Price"
+                                     v-if="productSalePriceDisplay">
+                              <span class="has-background-warning">
+                                {{ productSalePriceDisplay }}
+                              </span>
+                            </b-field>
+
+                            <b-field label="Sale Ends"
+                                     v-if="productSaleEndsDisplay">
+                              <span class="has-background-warning">
+                                {{ productSaleEndsDisplay }}
+                              </span>
                             </b-field>
 
                           </b-field>
@@ -622,6 +636,20 @@
                           </span>
                         </b-field>
 
+                        <b-field label="Sale Price"
+                                 v-if="productSalePriceDisplay">
+                          <span class="has-background-warning">
+                            {{ productSalePriceDisplay }}
+                          </span>
+                        </b-field>
+
+                        <b-field label="Sale Ends"
+                                 v-if="productSaleEndsDisplay">
+                          <span class="has-background-warning">
+                            {{ productSaleEndsDisplay }}
+                          </span>
+                        </b-field>
+
                         <b-field label="Case Size">
                           <span>{{ productCaseQuantity }}</span>
                         </b-field>
@@ -629,7 +657,9 @@
                         <b-field label="Case Price">
                           <span
                             % if product_price_may_be_questionable:
-                            :class="productPriceNeedsConfirmation ? 'has-background-warning' : ''"
+                            :class="(productPriceNeedsConfirmation || productSalePriceDisplay) ? 'has-background-warning' : ''"
+                            % else:
+                            :class="productSalePriceDisplay ? 'has-background-warning' : ''"
                             % endif
                             >
                             {{ productCasePriceDisplay }}
@@ -702,11 +732,6 @@
                                       field="description"
                                       sortable>
                         {{ props.row.description }}
-                      </b-table-column>
-
-                      <b-table-column label="Size"
-                                      field="size"
-                                      sortable>
                         {{ props.row.size }}
                       </b-table-column>
 
@@ -716,6 +741,22 @@
                         {{ props.row.unit_price_display }}
                       </b-table-column>
 
+                      <b-table-column label="Sale Price"
+                                      field="sale_price"
+                                      sortable>
+                        <span class="has-background-warning">
+                          {{ props.row.sale_price_display }}
+                        </span>
+                      </b-table-column>
+
+                      <b-table-column label="Sale Ends"
+                                      field="sale_ends"
+                                      sortable>
+                        <span class="has-background-warning">
+                          {{ props.row.sale_ends_display }}
+                        </span>
+                      </b-table-column>
+
                       <b-table-column label="Department"
                                       field="department_name"
                                       sortable>
@@ -933,6 +974,8 @@
                 productCaseQuantity: null,
                 productUnitPriceDisplay: null,
                 productCasePriceDisplay: null,
+                productSalePriceDisplay: null,
+                productSaleEndsDisplay: null,
                 productURL: null,
                 productImageURL: null,
                 productQuantity: null,
@@ -1486,6 +1529,8 @@
                 this.productCaseQuantity = null
                 this.productUnitPriceDisplay = null
                 this.productCasePriceDisplay = null
+                this.productSalePriceDisplay = null
+                this.productSaleEndsDisplay = null
                 this.productImageURL = '${request.static_url('tailbone:static/img/product.png')}'
                 this.productQuantity = 1
                 this.productUnitChoices = this.defaultUnitChoices
@@ -1533,6 +1578,8 @@
                 this.productCaseQuantity = selected.case_quantity
                 this.productUnitPriceDisplay = selected.unit_price_display
                 this.productCasePriceDisplay = selected.case_price_display
+                this.productSalePriceDisplay = selected.sale_price_display
+                this.productSaleEndsDisplay = selected.sale_ends_display
                 this.productImageURL = selected.image_url
                 this.productURL = selected.url
                 this.productQuantity = 1
@@ -1561,6 +1608,8 @@
                 this.productURL = row.product_url
                 this.productUnitPriceDisplay = row.unit_price_display
                 this.productCasePriceDisplay = row.case_price_display
+                this.productSalePriceDisplay = row.sale_price_display
+                this.productSaleEndsDisplay = row.sale_ends_display
                 this.productImageURL = row.product_image_url
                 this.productQuantity = row.order_quantity
                 this.productUnitChoices = row.order_uom_choices
@@ -1606,6 +1655,8 @@
                 this.productCaseQuantity = null
                 this.productUnitPriceDisplay = null
                 this.productCasePriceDisplay = null
+                this.productSalePriceDisplay = null
+                this.productSaleEndsDisplay = null
                 this.productURL = null
                 this.productImageURL = null
                 this.productUnitChoices = this.defaultUnitChoices
@@ -1651,6 +1702,8 @@
                         this.productCaseQuantity = response.data.case_quantity
                         this.productUnitPriceDisplay = response.data.unit_price_display
                         this.productCasePriceDisplay = response.data.case_price_display
+                        this.productSalePriceDisplay = response.data.sale_price_display
+                        this.productSaleEndsDisplay = response.data.sale_ends_display
                         this.productURL = response.data.url
                         this.productImageURL = response.data.image_url
                         this.setProductUnitChoices(response.data.uom_choices)