geer-builder 1.2.650 → 1.2.652

package/components/Checkout/Printable.vue

@@ -44,19 +44,22 @@
                             <th v-if="payment_method.payment_method_id != 'gc_points'" class="text-right">Price</th>
                             <th v-else class="text-right">GC Price</th>
                             <th class="text-right">Discount</th>
+                            <th class="text-right" v-if="total_merchant_discount > 0">Merchant Discount</th>
                             <th class="text-right">Line Sub Total</th>
                             <th class="text-right">Line Total</th>
                         </tr>
                     </thead>
                     <tbody v-for="(merch, i) in orders" :key="i">
                         <tr v-for="(prod, x) in merch.products" :key="x">
-                            <!-- {{prod}} -->
+                            <!-- {{prod.product}} -->
                             <td>{{ prod.product_name ? prod.product_name : prod.product_sku }}</td>
                             <td class="text-right">{{ prod.quantity }}</td>
                             <td v-if="payment_method.payment_method_id != 'gc_points'" class="text-right">{{ $_formatNumber(prod.selling_price, { decimal: 2}) }} </td>
                             <td v-else class="text-right">{{ $_formatNumber(prod.gc_price, { decimal: 2}) }} </td>
                             <td v-if="payment_method.payment_method_id != 'gc_points'" class="text-right">{{ $_formatNumber(Number(prod.order_discount_total), { decimal: 2}) }} <span>({{ prod.discount_merge_percent }}%)</span></td>
                             <td v-else class="text-right">{{ $_formatNumber(0) }} <span>({{ prod.discount_percent }}%)</span></td>
+                            <td v-if="prod.product.hasOwnProperty('merchant_discount_applied') && prod.product.merchant_discount_applied" class="text-right">{{$_formatNumber(prod.product.merchant_percentage_discount , { decimal: 2 } ) }}</td>
+                            <td v-else class="text-right">{{ $_formatNumber(0) }} <span>({{ 0 }}%)</span></td>
                             <td class="text-right">{{$_formatNumber(prod.item_sub_total , { decimal: 2 } ) }}</td>
                             <td class="text-right">{{$_formatNumber(prod.item_total , { decimal: 2 } ) }}</td>
                         </tr>
@@ -67,6 +70,10 @@
                 <div class="col-6">
                 </div>
                 <div class="col-6 text-right q-mt-lg">
+                    <div class="row" v-if="total_merchant_discount > 0">
+                        <div class="col-7 label">Merchant Discount</div>
+                        <div class="col-5 value">{{ $_formatNumber(total_merchant_discount, { decimal: 2}) }}</div>
+                    </div>
                     <div class="row">
                         <div class="col-7 label">Sub Total</div>
                         <div class="col-5 value">{{ $_formatNumber(sub_total, { decimal: 2}) }}</div>
@@ -172,6 +179,10 @@
                 <div class="col-12">
                 </div>
                 <div class="col-12 text-left q-mt-lg">
+                    <div class="row bordered" v-if="total_merchant_discount > 0">
+                        <div class="col-7 label">Merchant Discount</div>
+                        <div class="col-5 value text-right">{{ $_formatNumber(total_merchant_discount, { decimal: 2}) }}</div>
+                    </div>
                     <div class="row bordered">
                         <div class="col-7 label">Sub Total</div>
                         <div class="col-5 value text-right">{{ $_formatNumber(sub_total, { decimal: 2}) }}</div>
@@ -202,10 +213,27 @@ export default {
     mixins: [GlobalMixins],
     data: () =>
     ({
+        total_merchant_discount: 0,
         settings : "",
     }),
     async mounted()
     {
+        setTimeout(() => {
+            if(this.orders)
+            {
+                for(let i of this.orders)
+                {
+                    for(let x of i.products)
+                    {
+                        if(x.product.hasOwnProperty('merchant_discount_applied') && x.product.merchant_discount_applied)
+                        {
+                            this.total_merchant_discount += x.product.merchant_discounted_price;
+                        }
+                    }
+                }
+            }
+        }, 1000);
+
         this.settings= await this.$_getData('public_settings');
     }
 }

package/components/Checkout/ProcessCheckoutConfirmDialog.vue

@@ -101,12 +101,12 @@ export default {
     props: ['sale_id', 'hide_bottom', 'proc_id'],
     async mounted()
     {
-        console.log(this.proc_id, 'proc id');
         this.ipay88_backend_url = `https://asia-northeast1-${config.projectId}.cloudfunctions.net/memberBackendIpayResponse`;
         this.dragonpay_backend = `https://asia-northeast1-${config.projectId}.cloudfunctions.net/memberDragonpayResponse`;
         this.ipay88_response_url = location.href;
         this.public_settings = await this.$_getData('public_settings');
         await this.$bind('sale', this.db_checkout_request.doc(this.sale_id));
+        console.log(this.sale);
         if(this.public_settings && this.public_settings.hasOwnProperty('ipay88_details'))
         {
             this.merchant_code = this.public_settings.ipay88_details.merchant_code;

package/components/CollectorPages/GcashWalletRequest.vue

@@ -78,7 +78,6 @@ import DB_USER                              from '../../models/DB_USER';
 import DB_GCASH_REQUEST                     from '../../models/DB_GCASH_REQUEST';
 import {formatDate}                         from '../../utilities/DateUtils';
 import {formatNumber}                       from '../../utilities/NumberUtils';
-import { fill } from '../../../documentation/src/references/nav.js';
 
 
 export default {

package/package.json

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