geer-builder 1.2.615 → 1.2.618

package/GCheckout.vue

@@ -1175,9 +1175,33 @@ export default {
                                 this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Shipping Address is outdated please update or add new shipping address to use COD." });
                                 return;
                             }
+
+                            let is_fixed_poo = false;
+                            let fixed_poo_region_code = null;
+                            if(this.public_settings.hasOwnProperty("enable_fixed_poo_payo"))
+                            {
+                                if(this.public_settings.enable_fixed_poo_payo == true && this.public_settings.hasOwnProperty("fixed_poo_region_code"))
+                                {
+                                    is_fixed_poo = true;
+                                    fixed_poo_region_code = this.public_settings.fixed_poo_region_code;
+                                }
+                            }
+                            
+
+
+
                             let params = new URLSearchParams();
                             params.append("api_token", payo_courier_settings.api_token);
-                            params.append("point_of_origin", orders.merchant_details.pickup_address.province.reg_code);
+                            
+                            if(is_fixed_poo == true && fixed_poo_region_code != null)
+                            {
+                                params.append("point_of_origin", fixed_poo_region_code);
+                            }
+                            else
+                            {
+                                params.append("point_of_origin", orders.merchant_details.pickup_address.province.reg_code);
+                            }
+
                             params.append("amount", total_item_price);
                             params.append("size", size);
                             params.append("payment_method", "COD");

package/GCodeVault.vue

@@ -65,7 +65,7 @@
                     <div class="row text-center overflow-hidden">
                         <div class="col-md-12 q-ma-sm">
                             <q-btn @click="is_open_add_slot_dialog = true" class="create-btn" color="primary" outline>
-                                Create New Slot
+                                Activate Slot
                             </q-btn>
                         </div>
                         <div class="col-md-12 q-ma-sm">

package/GEcomChat.vue

@@ -264,7 +264,7 @@
                     <div class="row text-center overflow-hidden">
                         <div class="col-md-12 q-ma-sm">
                             <q-btn @click="is_open_add_slot_dialog = true" class="create-btn" color="primary" outline>
-                                Create New Slot
+                                Activate Slot
                             </q-btn>
                         </div>
                         <div class="col-md-12 q-ma-sm">

package/GProductPage.vue

@@ -1063,8 +1063,11 @@ export default {
                 if(this.variant_product_details.docs.length>0)
                 {
                     this.variant_product_details = this.variant_product_details.docs[0].data();
-                    let discount = new ProductClass().getProductDiscount( this.membership_discount,this.rank_discount, this.current_slot_info, this.stockist_discount, this.variant_product_details);
-                    this.variant_product_details.user_discount = discount;
+                    if(this.current_slot_info)
+                    {
+                        let discount = new ProductClass().getProductDiscount( this.membership_discount,this.rank_discount, this.current_slot_info, this.stockist_discount, this.variant_product_details);
+                        this.variant_product_details.user_discount = discount;
+                    }
                 }
                 else
                 {

package/GSlotWallet.vue

@@ -38,9 +38,12 @@
                     <div class="value">{{user_info.hasOwnProperty('slot_owned') ? user_info.slot_owned : 0}}/{{ slot_limit }}</div>
                 </div>
                 <div v-if="current_slot_info.points.reactivation_fee || is_reactivation_fee_avail == true" class="q-pt-sm q-pb-md section-holder">
-                    <div class="label" v-if="is_company_success">Higher Income Status</div>
-                    <div class="label" v-else>Reactivation Fee</div>
-                    <div class="value">{{$_formatNumber(current_slot_info.points.hasOwnProperty("reactivation_fee") ? current_slot_info.points.reactivation_fee : 0 , { decimal: 2 }) }}</div>
+                    <div v-if="!hide_reactivation">
+                         <div class="label" v-if="is_company_success">Higher Income Status</div>
+                        <div class="label" v-else>Reactivation Fee</div>
+                        <div class="value">{{$_formatNumber(current_slot_info.points.hasOwnProperty("reactivation_fee") ? current_slot_info.points.reactivation_fee : 0 , { decimal: 2 }) }}</div>
+                    </div>
+                   
                 </div>
             </div>
             <div class="wallet-grid" :style="is_company_ultrapro? 'display:block': temp_wallet ? 'grid-template-columns: 1fr 1fr 1fr' : 'grid-template-columns:1fr 1fr' && current_slot_info.points.hasOwnProperty('gc')">
@@ -229,7 +232,8 @@ export default
         is_company_qdy:Boolean,
         is_company_ultrapro:Boolean,
         show_points_history:Boolean,
-        show_binary_history:Boolean
+        show_binary_history:Boolean,
+        hide_reactivation:Boolean
     },
     data: () =>
     ({

package/package.json

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