geer-builder 1.2.950 → 1.2.952

package/GManualPaymentPage.vue

@@ -42,6 +42,12 @@
                         <div>Payment: <b>{{this.order_info.payment_method.manual_pay_choice.bank_label}}</b></div>
                         <div>Account Name: <b>{{this.order_info.payment_method.manual_pay_choice.account_name}}</b></div>
                         <div>Account Number: <b>{{this.order_info.payment_method.manual_pay_choice.account_number}}</b></div>
+                        <template v-if="resolved_additional_accounts.length > 0">
+                            <div v-for="(extra, idx) in resolved_additional_accounts" :key="idx" style="margin-top:5px;">
+                                <div>Account Name: <b>{{extra.account_name}}</b></div>
+                                <div>Account Number: <b>{{extra.account_number}}</b></div>
+                            </div>
+                        </template>
                         <div>Order Total: <b>{{ public_settings.main_currency }} {{$_formatNumber(this.order_info.orders.order_total, { decimal: 2})}} {{ public_settings.hasOwnProperty('adspro_cashin_conversion_rate') ? `(PHP ${this.order_info.orders.order_total * public_settings.adspro_cashin_conversion_rate})` : '' }}</b></div>
                     </div>
                 </div>
@@ -110,6 +116,35 @@ export default {
 
         // this.getaAccountList();
     },
+    computed:
+    {
+        resolved_additional_accounts()
+        {
+            var choice = this.order_info && this.order_info.payment_method
+                ? this.order_info.payment_method.manual_pay_choice
+                : null;
+            if (!choice) return [];
+
+            // Source 1: additional_account saved on the order
+            if (choice.additional_account && choice.additional_account.length > 0)
+            {
+                return choice.additional_account;
+            }
+
+            // Source 2: fallback to public_settings.manual_payment_additional_account filtered by bank_id
+            if (this.public_settings
+                && this.public_settings.manual_payment_additional_account
+                && this.public_settings.manual_payment_additional_account.length > 0)
+            {
+                var bank_id = choice.bank_id;
+                return this.public_settings.manual_payment_additional_account.filter(function(acc) {
+                    return acc.bank_id === bank_id;
+                });
+            }
+
+            return [];
+        }
+    },
     methods:
     {
         getPictures(val)

package/GReferralLink.vue

@@ -7,18 +7,33 @@
             <div v-else-if="change_label_1">{{change_label_1}}</div>
             <div v-else>Copy Referral Link</div>
         </q-btn>
+        <!-- QR Code Section -->
+        <div v-if="show_qr && qr_data_url" class="q-mt-md" style="text-align: center;">
+            <img :src="qr_data_url" alt="QR Code" style="max-width: 250px;" />
+            <div class="q-mt-sm">
+                <q-btn @click="downloadQR()" color="primary" outline size="sm" class="q-mr-sm">
+                    <q-icon name="fas fa-download" size="14px" class="q-mr-xs"></q-icon>
+                    Download QR
+                </q-btn>
+                <q-btn @click="shareQR()" color="primary" outline size="sm">
+                    <q-icon name="fas fa-share-alt" size="14px" class="q-mr-xs"></q-icon>
+                    Share
+                </q-btn>
+            </div>
+        </div>
         <input style="opacity: 0" v-model="replicated_link" id="referral_link" type="text">
     </div>
 </template>
 <script>
 import GlobalMixins from './mixins/global_mixins';
+import QRCode from 'qrcode';
 
 export default
     {
         name: "GReferralLinkComponent",
         components: {},
         mixins: [GlobalMixins],
-        props: ['ref_link', 'is_company_ultrapro','change_label_1'],
+        props: ['ref_link', 'is_company_ultrapro', 'change_label_1', 'show_qr'],
         filters: {},
         data: () => (
             {
@@ -27,6 +42,7 @@ export default
                 public_settings: {},
                 link: '',
                 settings_link: false,
+                qr_data_url: '',
             }),
         async mounted() {
             await this.$_getSlotInfo();
@@ -43,6 +59,13 @@ export default
                 this.replicated_link = `https://${window.location.host}/#/invite/${replace_space}`;
             }
             this.loading = false;
+
+            // Generate QR code if show_qr prop is enabled
+            if (this.show_qr) {
+                QRCode.toDataURL(this.replicated_link, { width: 250, margin: 2 })
+                    .then(function(url) { this.qr_data_url = url; }.bind(this))
+                    .catch(function(err) { console.error('QR generation failed:', err); });
+            }
         },
         methods:
         {
@@ -77,10 +100,39 @@ export default
                         color: 'black'
                     });
                 }
+            },
+            downloadQR() {
+                var link = document.createElement('a');
+                link.download = 'referral-qr-code.png';
+                link.href = this.qr_data_url;
+                link.click();
+            },
+            shareQR() {
+                var self = this;
+                if (navigator.share) {
+                    fetch(this.qr_data_url)
+                        .then(function(response) { return response.blob(); })
+                        .then(function(blob) {
+                            var file = new File([blob], 'referral-qr-code.png', { type: 'image/png' });
+                            return navigator.share({
+                                title: 'My Referral Link',
+                                text: self.replicated_link,
+                                files: [file]
+                            });
+                        })
+                        .catch(function() {
+                            // Fallback: just share the link text
+                            if (navigator.share) {
+                                navigator.share({ title: 'My Referral Link', text: self.replicated_link });
+                            }
+                        });
+                } else {
+                    // Desktop fallback: copy link
+                    this.copyLink();
+                }
             }
-
         },
         computed: {}
     }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geer-builder",
-  "version": "1.2.950",
+  "version": "1.2.952",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.33",
     "philippine-location-json-for-geer": "^1.1.11",
+    "qrcode": "^1.5.3",
     "soap": "^0.43.0",
     "sweetalert": "^2.1.2",
     "validator": "^13.5.2",