geer-builder 1.2.955 → 1.2.957

package/GManualPaymentPage.vue

@@ -40,13 +40,19 @@
                             <q-img :src="qr_image"></q-img>
                         </q-avatar>
                         <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>
+                            <div class="q-mt-sm" style="font-weight:600;">Select an account to pay:</div>
+                            <q-option-group
+                                v-model="selected_account_number"
+                                :options="all_account_options"
+                                type="radio"
+                                dense
+                                class="q-mt-xs"
+                            ></q-option-group>
+                        </template>
+                        <template v-else>
+                            <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>
                         <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>
@@ -77,6 +83,7 @@ export default {
         order_info: {},
         payment_account_list: [],
         slot_code: "",
+        selected_account_number: "",
         is_qr_enable: false,
         qr_image_settings: "",
         qr_image: "",
@@ -152,6 +159,43 @@ export default {
                 seen[acc.account_number] = true;
                 return true;
             });
+        },
+        all_account_options()
+        {
+            var choice = this.order_info && this.order_info.payment_method
+                ? this.order_info.payment_method.manual_pay_choice
+                : null;
+            if (!choice) return [];
+
+            var options = [
+                { label: choice.account_name + ' - ' + choice.account_number, value: choice.account_number, account: choice }
+            ];
+            var self = this;
+            self.resolved_additional_accounts.forEach(function(acc) {
+                options.push({ label: acc.account_name + ' - ' + acc.account_number, value: acc.account_number, account: acc });
+            });
+            return options;
+        },
+        selected_account_detail()
+        {
+            if (!this.selected_account_number) return null;
+            var found = this.all_account_options.find(function(opt) {
+                return opt.value === this.selected_account_number;
+            }.bind(this));
+            return found ? found.account : null;
+        }
+    },
+    watch:
+    {
+        'order_info.payment_method': {
+            handler(val)
+            {
+                if (val && val.manual_pay_choice && !this.selected_account_number)
+                {
+                    this.selected_account_number = val.manual_pay_choice.account_number;
+                }
+            },
+            immediate: true
         }
     },
     methods:
@@ -182,15 +226,29 @@ export default {
                 this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Please enter a reference number." });
                 return;
             }
+            if(this.resolved_additional_accounts.length > 0 && !this.selected_account_number)
+            {
+                this.$q.dialog({ html: true, title: `Something's not quite right`, message: "Please select an account to pay." });
+                return;
+            }
             if(this.proof_of_payment.length>0)
             {
                 try
                 {
                     let order_det = Object.assign({}, this.order_info);
+                    if(this.selected_account_detail)
+                    {
+                        order_det.payment_method = Object.assign({}, order_det.payment_method);
+                        order_det.payment_method.manual_pay_choice = Object.assign({}, order_det.payment_method.manual_pay_choice, {
+                            account_name: this.selected_account_detail.account_name,
+                            account_number: this.selected_account_detail.account_number
+                        });
+                    }
                     order_det.proof_of_payment = {};
                     order_det.proof_of_payment.pictures = this.proof_of_payment;
                     order_det.proof_of_payment.reference_number = this.reference_number.trim();
                     this.$q.loading.show();
+                    
                     await this.$_fbCall('memberUploadProofOfPayment', order_det);
                     sessionStorage.removeItem("order_id");
                     this.order_id = "";

package/GProductPage.vue

@@ -225,7 +225,8 @@
 
             </div>
         </div>
-        <div v-if="!show_only"> 
+        <slot name="before-tabs"></slot>
+        <div v-if="!show_only">
             <div style="width:300px">
             <q-tabs v-if="is_done" v-model="tab" dense class="text-grey" active-color="primary" indicator-color="primary" align="justify" narrow-indicator >
                 <q-tab no-caps name="description" label="Description" />
@@ -374,6 +375,7 @@
                 </q-tab-panel>
             </q-tab-panels>
         </div>
+        <slot name="after-tabs"></slot>
     <q-dialog v-model="is_select_branch_dialog">
         <choose-branch-dialog :product_id="variant_product_details ? variant_product_details.product_id : product_details.product_id" @chooseBranch="selectBranch" @outOfStock="outOfStock"></choose-branch-dialog>
     </q-dialog>       

package/package.json

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