geer-builder 1.2.505 → 1.2.512

package/GCheckout.vue

@@ -91,6 +91,11 @@
                                 <q-radio dense v-model="online_payment_choice" :val="onlines" :label="onlines.online_payment_label" />
                             </div>                
                         </div>
+                        <div class="manual-pay-method" v-if="payment_method.payment_method_id == 'dragon_pay'" >
+                            <div  v-for="(onlines, ind) in available_payment_channel" class="dragon-pay-list"  :key="ind">
+                                <q-radio dense v-model="dragon_pay_choice" :val="onlines" :label="onlines.shortName" />
+                            </div>                
+                        </div>
                     </div>
                     <div class="grid-right">
                         <div class="shipping-address">
@@ -171,7 +176,7 @@
                 <add-new-address-form @done="updateAddress"></add-new-address-form>
             </q-dialog>
             <q-dialog persistent v-model="is_dialog_confirm_open">
-                <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data"></process-checkout-confirm-dialog>
+                <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data" :proc_id="dragon_pay_choice"></process-checkout-confirm-dialog>
             </q-dialog>    
             </div> 
         </div>
@@ -311,7 +316,7 @@
                     <add-new-address-form @done="updateAddress"></add-new-address-form>
                 </q-dialog>
                 <q-dialog persistent v-model="is_dialog_confirm_open" :maximized="true">
-                    <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data"></process-checkout-confirm-dialog>
+                    <process-checkout-confirm-dialog @closePopup="confirmedCheckout" :checkout_details="checkout_info" :sale_id="sale_id.data" :chosen_proc="true" ></process-checkout-confirm-dialog>
                 </q-dialog>   
             </div>
         </div>
@@ -355,7 +360,6 @@ import ProductClass             from './classes/ProductClass';
 import EcommerceMaintenance     from './dialogs/EcommerceMaintenance';
 
 
-
 export default {
     
     components: { EcommerceMaintenance,SelectShippingOptions, AddNewAddressForm ,ProcessCheckoutConfirmDialog, GLoader, axios ,ChooseCourierDialog, SelectVoucherDialog},
@@ -412,8 +416,14 @@ export default {
         online_payment_limit:999999,
         hide_voucher:false,
         disable_ecom:false,
+        total_amount:0,
+        available_payment_channel:[],
+        dragon_pay_choice:"",
+        check:{},
+        dragon_pay_amount:[],
     }),
-    async mounted(){
+    async mounted()
+    {
         if (this.user_info)
         {
             if(this.user_info.slot_owned >0)
@@ -459,9 +469,18 @@ export default {
             {
                 this.$q.loading.show();
                 let pending_checkout = JSON.parse(sessionStorage.pending_checkout);
-                let check = await this.$_fbCall('memberCheckPendingCheckout', { sale_id: pending_checkout.sale_id, amount:pending_checkout.amount }); 
-                if(check.data)
+                if(pending_checkout.hasOwnProperty('mode') && pending_checkout.mode == "dragonpay")
+                {
+                    this.check = await this.$_fbCall('memberCheckPendingCheckoutDragonpay', { sale_id: pending_checkout.sale_id, amount:pending_checkout.amount, mode:pending_checkout.mode }); 
+                }
+                else
                 {
+                    console.log('check online pay');
+                    this.check = await this.$_fbCall('memberCheckPendingCheckout', { sale_id: pending_checkout.sale_id, amount:pending_checkout.amount }); 
+                }
+                if(this.check.data)
+                {
+                    console.log(this.check.data, 'check data');
                     sessionStorage.removeItem('checkout_list');
                     sessionStorage.removeItem('referral_slot_code');
                     sessionStorage.removeItem('pending_checkout');
@@ -470,7 +489,6 @@ export default {
                     swal("Transaction Succesful!!", `Sale No. ${this.sale_id} has been successfully processed.`, "success");
 
                     // this.$q.dialog({ title: "Transaction Succesful!", message: `Sale No. ${pending_checkout.sale_id} has been successfully processed.` });
-
                 }
                 else
                 {
@@ -494,6 +512,7 @@ export default {
                 sessionStorage.setItem('referral_slot_code', this.user_info.sponsor);
             }
         }
+        this.getPaymentChannel();
 
     },
     computed:
@@ -527,7 +546,24 @@ export default {
     {
         // this.getordersbymerchant();
     },
-    methods:{
+    methods:
+    {
+        async getPaymentChannel()
+        {
+            if(this.public_settings.hasOwnProperty('dragonpay_details') && this.public_settings.dragonpay_details.active)
+            {
+                console.log('dragonpay:', this.public_settings.dragonpay_details.active );
+                try 
+                {
+                    let ret = await this.$_fbCall('memberGetPaymentChannel', {amount:this.dragon_pay_amount});
+                    this.available_payment_channel = ret.data;
+                }
+                catch (error) 
+                {
+                    console.log(error);
+            }
+            }
+        },
         async removeVoucher(data)
         {
             this.all_voucher_list = [];
@@ -872,6 +908,7 @@ export default {
                 merch.total_weight += Number(prod.delivery_settings.weight) * prod.quantity;
                 }
             }
+            this.dragon_pay_amount = this.groupedProducts;
             this.checkout_info.orders = this.groupedProducts;
             this.checkout_info.sub_total = merchandise_subtotal;
             this.checkout_info.discount_total = discount_total;
@@ -1583,6 +1620,18 @@ export default {
                         this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
                         this.is_dialog_confirm_open = true;
                     }
+                    else if (this.checkout_info.payment_method.payment_method_id == "dragon_pay")
+                    {
+                        if(!this.dragon_pay_choice)
+                        {
+                            this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Invalid Dragon payment Method" });
+                        }
+                        else
+                        {
+                            this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
+                            this.is_dialog_confirm_open = true;
+                        }
+                    }
                     else if (this.checkout_info.payment_method.payment_method_id == "cod_manual")
                     {
                         this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)

package/GMyPurchases.vue

@@ -117,7 +117,7 @@ export default {
                 { 
                     this.processing_count++;
                 }
-                else if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked")
+                else if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" || order_list.status == "pre_processing")
                 { 
                     this.to_pay_count++;
                 }

package/GMyTransactions.vue

@@ -120,7 +120,7 @@ export default {
                 { 
                     this.approval_count++;
                 }
-                else if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked")
+                else if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" || order_list.status == "pre_processing")
                 {
                     this.to_pay_count++;
                 }

package/components/Checkout/ProcessCheckoutConfirmDialog.vue

@@ -1,7 +1,6 @@
 <template>
     <q-card class="process-checkout-dialog refill form" style="width: 900px; max-width: 1000px;">
         <q-form @submit="submit()">
-
             <div v-if="sale" style="min-height: 300px;" class="product-list">
                 <printable  title="Order Summary"
                             :orders="sale.orders"
@@ -32,6 +31,19 @@
                     <input type="hidden" name="ResponseURL" :value="ipay88_response_url">
                     <input type="hidden" name="BackendURL" :value="ipay88_backend_url">
                 </form>
+                <form v-if="sale.payment_method.payment_method_id == 'dragon_pay'" method="get" id="dragon_pay_form" name="ePayment" :action="public_settings.dragonpay_details.test_payment_request_url">
+                    <input type="hidden" name="merchantid" :value="merchant_id">
+                    <input type="hidden" name="txnid" :value="txnid">
+                    <input type="hidden" name="amount" :value="amount">
+                    <input type="hidden" name="ccy" :value="ccy">
+                    <input type="hidden" name="description" :value="description">
+                    <input type="hidden" name="email" :value="email">
+                    <input type="hidden" name="digest" :value="digest_string.toString('hex')">
+                    <input v-if="!public_settings.dragonpay_details.test" type="hidden" name="procid" :value="proc_id.procId">
+                    <!-- <input type="hidden" name="mode" :value="mode"> -->
+                    <!-- <input type="hidden" name="ResponseURL" :value="ipay88_response_url"> -->
+                    <input type="hidden" name="param1" :value="dragonpay_backend">
+                </form>
             </div>
             <div v-else style="min-height: 300px;" class="product-list text-center q-pt-lg">
                 <q-spinner-ball style="margin-top: 50px" class="q-mt-lg" color="primary" size="60px"/>
@@ -55,6 +67,7 @@ import Printable                from './Printable';
 import GlobalMixins             from '../../mixins/global_mixins.js';
 import {encryptSha}             from '../../utilities/sha1';
 import swal                     from 'sweetalert';
+import crypto                     from 'crypto';
 import config                   from 'app/settings';
 
 
@@ -68,16 +81,28 @@ export default {
         public_settings: {},
         merchant_code : "",
         signature : "",
+        digest:"",
         ipay88_backend_url:'',
-        ipay88_response_url:''
+        ipay88_response_url:'',
+        redirect:"",
+        merchant_id : "",
+        password : "",
+        txnid : "",
+        amount : "",
+        ccy : "PHP",
+        description : "",
+        email : "admin@test.com",
+        digest_cry:"",
+        digest_string:"",
+        dragonpay_backend:"",
+        mode:"7"
     }),
-    props: ['sale_id', 'hide_bottom', ],
+    props: ['sale_id', 'hide_bottom', 'proc_id'],
     async mounted()
     {
         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;
-        console.log(this.ipay88_response_url,"response");
-        console.log(this.ipay88_backend_url,"backend");
         this.public_settings = await this.$_getData('public_settings');
         await this.$bind('sale', this.db_checkout_request.doc(this.sale_id));
         if(this.public_settings && this.public_settings.hasOwnProperty('ipay88_details'))
@@ -86,7 +111,23 @@ export default {
             let amount_for_ip88 = this.public_settings.ipay88_details.test ? '1500' : this.$_formatNumber(this.sale.grand_total, { decimal: 2}).replace(/[ ,.]/g, "");
             this.signature = encryptSha(this.public_settings.ipay88_details.merchant_key+this.public_settings.ipay88_details.merchant_code+this.sale_id+amount_for_ip88+this.public_settings.ipay88_details.currency);
         }
-
+        
+        if(this.public_settings && this.public_settings.hasOwnProperty('dragonpay_details') && this.public_settings.dragonpay_details.active)
+        {
+            this.merchant_id = this.public_settings.dragonpay_details.test ? this.public_settings.dragonpay_details.test_merchant_id : this.public_settings.dragonpay_details.merchant_id;
+            this.password = this.public_settings.dragonpay_details.test ? this.public_settings.dragonpay_details.test_merchant_key : this.public_settings.dragonpay_details.merchant_key;
+            let floattotal = parseFloat(this.sale.grand_total).toFixed(2);
+            this.txnid = this.sale.sale_id.toString();
+            this.amount = floattotal.toString();
+            this.ccy = "PHP";
+            this.description = "test";
+            this.email = this.public_settings.dragonpay_details.test ? "admin@gmail.com" : this.sale.customer_email;
+            let digest_string = `${this.merchant_id}:${this.txnid}:${this.amount}:${this.ccy}:${this.description}:${this.email}:${this.password}`;
+            this.digest = encryptSha(digest_string);
+            this.digest_cry = crypto.createHash("sha1").update(digest_string).digest();
+            this.digest_string = this.digest_cry.toString('hex');
+            console.log(this.digest_string);
+        }
 
     },
     methods: 
@@ -102,18 +143,27 @@ export default {
                 this.$q.loading.hide();
                 
                 this.$emit('closePopup', this.sale.payment_method.payment_method_id);
-                if(this.sale.payment_method.payment_method_id != "online_payment")
+                if(this.sale.payment_method.payment_method_id != "online_payment" && this.sale.payment_method.payment_method_id != "dragon_pay" )
                 {
                     swal("Transaction Succesful!!", `Sale No. ${this.sale_id} has been successfully processed.`, "success");
                     // this.$q.dialog({ title: "Transaction Succesful!", message: `Sale No. ${this.sale_id} has been successfully processed.` });
                     sessionStorage.removeItem('checkout_list');
                     sessionStorage.removeItem('referral_slot_code');
                 }
-                else
+                else if(this.sale.payment_method.payment_method_id == "online_payment")
                 {
                     sessionStorage.setItem('pending_checkout', JSON.stringify({status:'pending',amount: "15.00", sale_id:this.sale_id}));
                     document.getElementById('ip88form').submit();
                 }
+                else if(this.sale.payment_method.payment_method_id == "dragon_pay")
+                {
+                    sessionStorage.setItem('pending_checkout', JSON.stringify({status:'pending',amount: "15.00", sale_id:this.sale_id, mode:"dragonpay"}));
+                    document.getElementById('dragon_pay_form').submit();
+                }
+                else
+                {
+                    console.log('dito sa else pumasok');
+                }
             }
             catch (error)
             {

package/components/MyPurchases/tabs/ToPayTab.vue

@@ -16,7 +16,7 @@
                 <div class="header__container">
                     <div class="header-slot-code">
                         <div><q-icon name="fas fa-ticket-alt" class="q-mr-sm q-ml-xs"></q-icon>Slot Code: {{list.slot_code}}</div>
-                        <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div></div> 
+                        <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" ||  list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div></div> 
                     </div>
                 </div>
                 <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);"> 
@@ -129,7 +129,7 @@
                     <div class="order-info">
                         <!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div>  -->
                         <div>Status:</div> 
-                        <div class="order-items"> {{list.status == "to_pay" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div> 
+                        <div class="order-items"> {{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</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> 
@@ -194,7 +194,7 @@ export default {
             this.main_currency = this.public_settings.main_currency;
             let myOrder = [];
                 this.order_list.forEach(order_list => {
-                    if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked")
+                    if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" ||order_list.status == "pre_processing" )
                     {
                         myOrder.push(order_list);
                     }

package/components/MyPurchases/tabs/ToReceiveTab.vue

@@ -84,13 +84,13 @@
                         <div style="padding-left:10px;margin-right:10px;border-left: 1px solid rgb(194, 189, 189);" v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}: {{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div> 
                         <div style="padding-left:10px;border-left: 1px solid rgb(194, 189, 189);">Order Total ({{list.orders.total_quantity}} Item): {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>  -->
                     </div>
-                    <div class="order-total" style="border:none;padding-top:0px;">
-                        <!-- <div style="margin-left:auto">Tracking Number: {{list.shipping_details.tracking_number}}</div>  -->
+                    <div class="order-total" style="border:none;padding-top:0px; display:flex; justify-content:">
                         <div>Courier: {{list.shipping_details.courier}}</div> 
+                        <div style="margin-left:auto">Tracking Number: {{list.shipping_details.tracking_number}}</div> 
                     </div>
                     <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
                         <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
-                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
+                        <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='delivered' && list.payment_method.payment_method_id =='dragon_pay'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
                     </div>
                 </div>
             </div>
@@ -259,7 +259,8 @@ export default {
                 });
             }
         },
-        openTrackingDialog(index){
+        openTrackingDialog(index)
+        {
            this.pass_data = this.my_order_list[index];
            this.is_trace_dialog_open = true;
         },

package/components/MyTransactions/dialogs/TraceProductDialog.vue

@@ -10,7 +10,7 @@
         </q-bar>
         <div class="top-banner">Visit this website to track your order:</div>
         <div class="url">
-            <a :href="link"> {{order_info.shipping_details.courier_link}}</a>
+            <a :href="link"> {{link}}</a>
         </div>
         <div class="tracking">
             <input type="text" name="myInput" :value="tracking_number" id="myInput" class="input">
@@ -34,9 +34,10 @@ export default
         tracking_number:'',
         link:'',
     }),
-    async mounted() {
+    async mounted()
+    {
         this.tracking_number = this.order_info.shipping_details.tracking_number;
-        this.link = this.order_info.shipping_details.courier_link;
+        this.link = this.order_info.shipping_details.courier_link ?  this.order_info.shipping_details.courier_link : 'https://merchant-portal.payo.asia/widget/tracking?merchant=0011v00002qrGlhAAE';
      },
     methods: { 
         copyTracking(){

package/components/MyTransactions/tabs/ToPayTab.vue

@@ -166,7 +166,7 @@ export default {
             
             let myOrder = [];
             this.order_list.forEach(order_list => {
-                if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked")
+                if (order_list.status == "to_pay" || order_list.status == "payment_to_be_checked" || order_list.status == "pre_processing")
                 {
                     myOrder.push(order_list);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.505",
+  "version": "1.2.512",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
     "jquery": "^3.5.1",
     "moment-timezone": "^0.5.33",
     "philippine-location-json-for-geer": "^1.1.11",
+    "soap": "^0.43.0",
     "sweetalert": "^2.1.2",
     "validator": "^13.5.2",
     "vue-socialmedia-share": "^1.0.1",