geer-builder 1.2.718 → 1.2.720

package/GBinaryWidget.vue

@@ -326,15 +326,50 @@ export default
             // let today_pair_daily      = moment().set({'hour' : setting_reset_schedule, 'minute' : 0, 'second' : 0, 'millisecond': 0}).utc(default_utc_timezone);
             
             let for_update_date       = moment().set({'hour' : setting_reset_schedule, 'minute' : 0, 'second' : 0, 'millisecond': 0});
+
+            let pairing_cycle          = 1; 
+            let current_cycle          = 1; 
+            let slot_current_cycle     = this.slot_info.slot_current_cycle ? this.slot_info.slot_current_cycle : 1;
+         
+            // if (typeof (this.slot_info.date_pair_daily) === 'undefined')
+            // {
+            //     reset = 1
+            // }
+            // else if(today.diff( moment(this.slot_info.date_pair_daily.toDate()).tz("Asia/Singapore") ,"hours") >= 24)
+            // {
+            //     reset = 1;
+            // }
+
+            if(binary_settings.hasOwnProperty('pairing_cycle'))
+            {
+                if(binary_settings.pairing_cycle == 2)
+                {
+                    pairing_cycle              = 2;
+
+                    if(today.diff( for_update_date ,"hours") >= 12)
+                    {
+                        current_cycle = 2;
+                    }
+                }
+            }
+
             if (typeof (this.slot_info.date_pair_daily) === 'undefined')
             {
-                reset = 1
+                reset = 1;
+            }
+            else if(pairing_cycle == 2 && slot_current_cycle == 1 && today.diff( moment(this.slot_info.date_pair_daily.toDate()).tz("Asia/Singapore") ,"hours") >= 12)
+            {
+                reset = 1;
             }
             else if(today.diff( moment(this.slot_info.date_pair_daily.toDate()).tz("Asia/Singapore") ,"hours") >= 24)
             {
                 reset = 1;
             }
 
+
+
+
+
             if(reset == 1)
             {
                 this.pairs_today = 0;

package/GProductList.vue

@@ -24,10 +24,10 @@
 
                             </div>
                     </template>
-                    <template v-if="show_reseller_commission && field.referral_commission > 0 ">
+                    <template v-if="show_reseller_commission && (field.referral_commission > 0 || (is_rc_fixed == true ? (field.fix_referral_recommission ? field.fix_referral_recommission : 1) : field.referral_commission ) > 0 ) ">
                         <div class="commission-badge">
                             <div class="commission-label">rc: </div>
-                            <div class="commission-value">{{$_formatNumber((field.referral_commission), { decimal: 2})}} </div>
+                            <div class="commission-value">{{$_formatNumber((is_rc_fixed == true  ? (field.fix_referral_recommission ? field.fix_referral_recommission : 1) : field.referral_commission), { decimal: 2})}} </div>
                         </div>
                     </template>
                     <template v-if="show_reseller_commission && field.referral_commission == 0">
@@ -150,6 +150,7 @@ export default {
         membership_list:'',
         stockist_list:'',
         show_reseller_commission:false,
+        is_rc_fixed:false
     }),
     async mounted()
     {
@@ -167,7 +168,14 @@ export default {
         if(this.public_settings.hasOwnProperty('referral_commission_earning') && this.reseller_commission)
         {
             if(this.public_settings.referral_commission_earning) this.show_reseller_commission = true;
+            if(this.public_settings.referral_commission_earning.hasOwnProperty("is_rc_fixed"))
+            {
+                if(this.public_settings.referral_commission_earning.is_rc_fixed == true) this.is_rc_fixed = true;
+            }
         }
+        
+
+  
         await this.newGetProduct(Number(this.prod_per_page));
         this.first_load_done=true;
     },

package/GSlotChange.vue

@@ -51,6 +51,7 @@ export default
         is_accessible: true,
         page_config: {},
         _slot_list: [],
+        _slot_list_placement: [],
         main_currency: "",
     }),
     async mounted()
@@ -58,6 +59,7 @@ export default
         if(this.user_info)
         {
             this._slot_list = [];
+            this._slot_list_placement = [];
             this.main_currency = await new DB_SETTINGS().doc('public_settings').get();
             this.slot_display_counter = this.main_currency.data().value.hasOwnProperty("slot_display_counter") ? this.main_currency.data().value.slot_display_counter : false;
             this.loadSlotOwned();
@@ -100,13 +102,41 @@ export default
                     if(this._slot_list)
                     {
                         await this.$bind('_slot_list', this.db_slot.collection().where('owner', '==', this.user_info.uid).orderBy('created_date', 'desc'));
+
+                        this._slot_list.sort(function(a,b)
+                        {
+                            
+                            // Turn your strings into dates, and then subtract them
+                            // to get a value that is either negative, positive, or zero.
+                            if(a.placement_date && b.placement_date)
+                            {
+                                return new Date(a.placement_date.seconds * 1000) - new Date(b.placement_date.seconds * 1000);
+                            }
+                            else if(a.placement_date)
+                            {
+                                return new Date(a.placement_date.seconds * 1000) - new Date("2050");
+                            }
+                            else if(b.placement_date)
+                            {
+                                return new Date("2050-01-02") - new Date(b.placement_date.seconds * 1000);
+                            }
+                            else
+                            {
+                                return new Date("2050-01-02") - new Date("2050-01-01");
+                            }
+                        });
+
+
                         if(this._slot_list.length >= 1)
                         {
                             let ctr = 1;
                             this._slot_list.forEach((d, i) =>
                             {
-                                this._slot_list[i].temp_ctr = ctr;
-                                ctr++;
+                                if(d.placement_date)
+                                {
+                                    this._slot_list[i].temp_ctr = ctr;
+                                    ctr++;
+                                }
                             });
                         }
                     }

package/package.json

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