geer-builder 1.2.663 → 1.2.665

package/GCheckout.vue

@@ -671,15 +671,18 @@ export default {
     },
     watch:
     {
-        async dragon_pay_choice()
+        async dragon_pay_choice(value)
         {
-            this.gcash_fee = 0;
-            this.show_gcash_fee = false;
-            if(this.dragon_pay_choice.shortName == 'GCash' || this.dragon_pay_choice.shortName == 'GCash App')
-            {
-                this.show_gcash_fee = true;
-                this.addGcashFee(this.groupedProducts);
+            if (value.remarks) {
+                this.$q.dialog({ html: true, title: `Remarks`, message: value.remarks });
             }
+            // this.gcash_fee = 0;
+            // this.show_gcash_fee = false;
+            // if(this.dragon_pay_choice.shortName == 'GCash' || this.dragon_pay_choice.shortName == 'GCash App')
+            // {
+            //     this.show_gcash_fee = true;
+            //     this.addGcashFee(this.groupedProducts);
+            // }
         },
         async payment_method()
         {
@@ -767,26 +770,52 @@ export default {
         },
         async getPaymentChannel()
         {
+            const checkMaskCurrentDayAvailable = (mask) => {
+                if (mask.length !== 7) return false;
+                const today = new Date();
+                const currentDayIndex = today.getUTCDay();
+                const currentDayAvailability = mask[currentDayIndex];
+                return currentDayAvailability === 'X';
+            };
+
+            const isCurrentTimeAvailable = (startTime, endTime) => {
+                if (startTime === endTime) return true;
+
+                const currentTime = new Date();
+                const currentHours = currentTime.getHours();
+                const currentMinutes = currentTime.getMinutes();
+                const currentTimeInMinutes = currentHours * 60 + currentMinutes;
+
+                const startHours = parseInt(startTime.split(':')[0], 10);
+                const startMinutes = parseInt(startTime.split(':')[1], 10);
+                const startTimeInMinutes = startHours * 60 + startMinutes;
+
+                const endHours = parseInt(endTime.split(':')[0], 10);
+                const endMinutes = parseInt(endTime.split(':')[1], 10);
+                const endTimeInMinutes = endHours * 60 + endMinutes;
+
+                if (startTimeInMinutes <= endTimeInMinutes) {
+                    // start time and end time are in the same day
+                    return currentTimeInMinutes >= startTimeInMinutes && currentTimeInMinutes <= endTimeInMinutes;
+                } else {
+                    // start time is later than end time, so it spans across midnight
+                    return currentTimeInMinutes >= startTimeInMinutes || currentTimeInMinutes <= endTimeInMinutes;
+                }
+            };
+
             if(this.public_settings.hasOwnProperty('dragonpay_details') && this.public_settings.dragonpay_details.active)
             {
-                // this.filtered_payment_channel = this.public_settings.dragonpay_details.hasOwnProperty('active_payment') ? this.public_settings.dragonpay_details.active_payment : [];
                 try 
                 {
                     let ret = await this.$_fbCall('memberGetPaymentChannel', {amount:this.dragon_pay_amount});
                     let return_payment = ret.data;
-                    // console.log(return_payment, 'All Dragonpay channel');
-                    let x = 0;
-                    // let filtered_payment = [];
-                    // for (const element of return_payment) 
-                    // {
-                    //     if(this.filtered_payment_channel.includes(element.shortName))
-                    //     {
-                    //         filtered_payment.push(element);
-                    //     }
-                    //     x++;
-                    // }
-                    // console.log(return_payment);
-                    this.available_payment_channel = return_payment.filter(data => data.status === 'A');
+
+                    this.available_payment_channel = return_payment.filter(data => {
+                        const isAvailable = data.status === 'A';
+                        const isTimeAvailable = isCurrentTimeAvailable(data.startTime, data.endTime);
+                        const isMaskAvailable = checkMaskCurrentDayAvailable(data.dayOfWeek);
+                        return (isAvailable && isTimeAvailable && isMaskAvailable) || false;
+                    });
                 }
                 catch (error) 
                 {

package/package.json

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