geer-builder 1.2.731 → 1.2.732

package/GCashOut.vue

@@ -10,6 +10,16 @@
                             <q-select v-model="cashout_choice" outlined dense :options="payoutmethodlist" option-label="method_label" option-value="method_key"/>
                         </div>
                     </g-card>
+                    <g-card :nomargin="true" class="cashout__box cashout__amount" v-if="required_personal_pv_encash === true" >
+                        <div class="cash__amount-balance" >
+                            <div class="cashout__content-label cashout_title">Required Monthly Personal PV</div>
+                            <div class="cash__balance-value text-primary">{{ $_formatNumber(this.required_personal_pv, { decimal: 2 }) }}</div>
+                        </div>
+                        <div class="cash__amount-balance" >
+                            <div class="cashout__content-label cashout_title">Current Monthly Personal PV</div>
+                            <div class="cash__balance-value text-primary">{{ personal_pv_generating == true ? "Loading..." : $_formatNumber(this.current_slot_info.personal_monthly_pv_amount, { decimal: 2 }) }}</div>
+                        </div>
+                    </g-card>
                     <g-card :nomargin="true" class="cashout__box cashout__amount">
                         <div class="cash__amount-balance">
                             <div class="cashout__content-label cashout_title" v-if="is_company_ultrapro">Current Available Balance</div>
@@ -91,7 +101,8 @@
                     </g-card>
                     <div class="button-cashout">
                         <q-btn @click="viewStatus" color="primary" class="full-width q-pa-sm status_button" outline v-if="!metamask">View Cash Out Status</q-btn>
-                        <q-btn type="submit" :disable="dontsubmit" color="primary" class="full-width q-pa-sm q-mt-sm cashout_button">{{metamask? 'CONFIRM ':'Proceed on Cash out '}}&raquo;</q-btn>
+                        <q-btn type="submit" :disable="dontsubmit || required_personal_pv_encash === true ? required_personal_pv > this.current_slot_info.personal_monthly_pv_amount  : false" color="primary" class="full-width q-pa-sm q-mt-sm cashout_button">{{metamask? 'CONFIRM ':'Proceed on Cash out '}}&raquo;</q-btn>
+                        <!-- <q-btn type="submit" :disable="false" color="primary" class="full-width q-pa-sm q-mt-sm cashout_button">{{metamask? 'CONFIRM ':'Proceed on Cash out '}}&raquo;</q-btn> -->
                     </div>
                 </div>
             </div>   
@@ -120,11 +131,13 @@ import DB_USER                  from './models/DB_USER';
 import CashoutStatusDialog      from './dialogs/CashoutStatusDialog'
 import TinRegistrationDialog    from './dialogs/TinRegistrationDialog'
 import {QSpinnerFacebook }      from 'quasar'
+import moment                   from 'moment';
 
 export default {
     data: () =>
     ({
         total_charge: 0,
+        required_ppv: 0,
         convert_currency:'',
         convert_rate:0,
         convert_cashout:false,
@@ -149,6 +162,11 @@ export default {
         member_field:[],
         cashout_details_tin:false,
         settings:{},
+        membership_option:[],
+        required_personal_pv: 0,
+        required_personal_pv_encash: false,
+        personal_pv_generating: false
+
     }),
     mixins:[GlobalMixins],
     components: { GCard , CashoutStatusDialog, TinRegistrationDialog},
@@ -171,6 +189,7 @@ export default {
         this.is_initializing = false;
         this.getMainCurrency();
         this.getConvertionRate();
+        this.checkPersonalPV();
     },
     watch:
         {
@@ -193,6 +212,54 @@ export default {
         },
     methods:
     {
+        async checkPersonalPV()
+        {
+            if(this.settings.hasOwnProperty('enable_encashment_pv_maintenance') && this.settings.enable_encashment_pv_maintenance === true)
+            {
+                this.required_personal_pv_encash = true;
+
+                let membership_list          = await this.$_getData('membership_list');
+                let cursor_slot_membership   = this._getMembershipByID(this.current_slot_info.membership.membership_id,membership_list);
+                
+                if(cursor_slot_membership)
+                {
+                    this.required_personal_pv = cursor_slot_membership.computation.unilevel.required_personal_pv;
+                }
+                
+                let default_utc_timezone  = this.settings.hasOwnProperty('default_utc_timezone') ? this.settings.default_utc_timezone : 8;
+                let startOfMonth          = moment().utc(default_utc_timezone).format("YYYY-MM-01");
+
+                if(!this.current_slot_info.is_personal_monthly_check || startOfMonth != this.current_slot_info.personal_monthly_pv_date)
+                {
+                    try
+                    {
+                        this.personal_pv_generating = true;
+                        await this.$_fbCall('memberCheckCashoutPV', {slot_code:this.current_slot_info.slot_code});
+                        await this.$_getSlotInfo();
+                        this.personal_pv_generating = false;
+                    }
+                    catch (error)
+                    {
+                        // this.$q.dialog({ html: true, title: `Something's not quite right`, message: error.message });
+                    }
+                }
+            }
+
+        },
+        _getMembershipByID(membership_id, mem_list)
+        {
+            let membership = null;
+
+            mem_list.forEach(val =>
+            {
+                if(val.membership_id === membership_id)
+                {
+                    membership = val;
+                }
+            });
+
+            return membership;
+        },
         async getCashoutMethod()
         {
             this.public_settings = await this.$_getData('public_settings');

package/classes/ProductClass.js

@@ -5,7 +5,7 @@ export default class ProductClass
     }
     getProductDiscount( membership_list, rank_list, slot_details, stockist_list, product_details)
     {
-        let sum_discount = false;
+        let sum_discount = true;
         let stockist_info={};
 
         if(slot_details.stockist)

package/package.json

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