geer-builder 1.2.957 → 1.2.959

package/components/MyPurchases/tabs/cancelled.vue

@@ -44,10 +44,10 @@
                                 <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
                                 <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
                             </div>
-                            <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
+                            <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
                             <div class="labels__quantity">{{field.quantity}}</div>
                             <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
-                            <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
+                            <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
                         </div>
                     </div>
                 </div>
@@ -61,7 +61,10 @@
                             <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div> 
                             <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
                             <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
-                            <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div> 
+                            <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
+                            <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
+                            <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
+                            <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
                             <div class="col-4"></div>
 
                             <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -124,10 +127,10 @@
                         <div class="product-info">
                             <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
                             <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
-                            <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
+                            <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
                             <div class="product-qty">Qty: {{field.quantity}}</div>
                             <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
-                            <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
+                            <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
                         </div>
                     </div>
                 </div>
@@ -141,10 +144,12 @@
                     <div class="order-items">{{list.status == "cancelled" ? "Cancelled" : ""}}</div> 
                     <div>Shipping Fee:</div> 
                     <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div> 
-                    <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div> 
-                    <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div> 
-                    <div>Order Total ({{list.orders.total_quantity}} Item):</div> 
-                    <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div> 
+                    <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
+                    <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
+                    <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
+                    <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
+                    <div>Order Total ({{list.orders.total_quantity}} Item):</div>
+                    <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
                 </div>
                 </div>
             </div>

package/models/DB_CMS.js

@@ -0,0 +1,9 @@
+import MODEL from './MODEL';
+
+export default class DB_CMS extends MODEL
+{
+    constructor()
+    {
+        super(`cms`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.957",
+  "version": "1.2.959",
   "description": "",
   "main": "index.js",
   "scripts": {