geer-builder 1.2.957 → 1.2.959

package/GCheckout.vue

@@ -208,6 +208,23 @@
                                 <div v-if="!is_adspro" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
                                 <div v-if="(this.checkout_info.voucher_total*-1)>0">Voucher Discount: </div>
                                 <div v-if="(this.checkout_info.voucher_total*-1)>0" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(this.checkout_info.voucher_total, { decimal: 2})}}</div>
+                                <!-- Coupon Code Input -->
+                                <div v-if="show_coupon_code" style="grid-column: 1 / -1;" class="q-mt-sm q-mb-sm">
+                                    <div style="display:flex; align-items:center;">
+                                        <q-input dense outlined v-model="coupon_code_input" label="Coupon Code"
+                                            @input="coupon_code_input = coupon_code_input.toUpperCase()"
+                                            style="flex:1;" class="q-mr-sm"></q-input>
+                                        <q-btn :loading="is_coupon_loading" dense color="primary" label="Apply"
+                                            @click="applyProductCoupon" no-caps></q-btn>
+                                        <q-btn v-if="applied_product_coupon" dense flat color="negative" icon="close"
+                                            @click="removeProductCoupon" class="q-ml-xs"></q-btn>
+                                    </div>
+                                </div>
+                                <!-- Coupon Discount line -->
+                                <div v-if="show_coupon_code && coupon_discount_total > 0">Coupon Discount: </div>
+                                <div v-if="show_coupon_code && coupon_discount_total > 0" class="text-right">
+                                    {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(coupon_discount_total, { decimal: 2})}}
+                                </div>
                                 <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'">{{public_settings.custom_ecommerce_fee.label}}: </div>
                                 <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'" class="text-right">{{main_currency}} {{$_formatNumber(custom_fees, { decimal: 2})}}<template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee') && public_settings.custom_ecommerce_fee.percentage">(<b>{{public_settings.custom_ecommerce_fee.value}}%</b>)</template></div>
                                 <div><b>Total Payment: </b></div>
@@ -366,6 +383,23 @@
                         <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'" >{{main_currency}} {{$_formatNumber(custom_fees, { decimal: 2})}}<template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee') && public_settings.custom_ecommerce_fee.percentage">(<b>{{public_settings.custom_ecommerce_fee.value}}%</b>)</template></div>
                         <div>Shipping Total: </div>
                         <div>{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
+                        <!-- Coupon Code Input (Mobile) -->
+                        <div v-if="show_coupon_code" style="grid-column: 1 / -1;" class="q-mt-sm q-mb-sm">
+                            <div style="display:flex; align-items:center;">
+                                <q-input dense outlined v-model="coupon_code_input" label="Coupon Code"
+                                    @input="coupon_code_input = coupon_code_input.toUpperCase()"
+                                    style="flex:1;" class="q-mr-sm"></q-input>
+                                <q-btn :loading="is_coupon_loading" dense color="primary" label="Apply"
+                                    @click="applyProductCoupon" no-caps></q-btn>
+                                <q-btn v-if="applied_product_coupon" dense flat color="negative" icon="close"
+                                    @click="removeProductCoupon" class="q-ml-xs"></q-btn>
+                            </div>
+                        </div>
+                        <!-- Coupon Discount line (Mobile) -->
+                        <div v-if="show_coupon_code && coupon_discount_total > 0">Coupon Discount: </div>
+                        <div v-if="show_coupon_code && coupon_discount_total > 0" class="text-right">
+                            {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(coupon_discount_total, { decimal: 2})}}
+                        </div>
                     </div>
                 </div>
 
@@ -440,7 +474,7 @@ import EcommerceMaintenance     from './dialogs/EcommerceMaintenance';
 export default {
     components: { EcommerceMaintenance,SelectShippingOptions, AddNewAddressForm ,ProcessCheckoutConfirmDialog, GLoader, axios ,ChooseCourierDialog, SelectVoucherDialog},
     mixins: [GlobalMixins],
-    props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean, is_adspro : Boolean },
+    props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean, is_adspro : Boolean, show_coupon_code: Boolean },
     data: () =>
     ({
         is_branch_pickup:false,
@@ -495,6 +529,10 @@ export default {
         courier_list_cod:[],
         pass_merchant_order: {},
         all_voucher_list:[],
+        applied_product_coupon: null,
+        coupon_code_input: '',
+        coupon_discount_total: 0,
+        is_coupon_loading: false,
         cod_payment_limit:999999,
         online_payment_limit:999999,
         hide_voucher:false,
@@ -985,6 +1023,95 @@ export default {
             this.pass_merchant_order = Object.assign({},merch);
             this.is_select_voucher_open = true;
         },
+        async applyProductCoupon()
+        {
+            if (!this.coupon_code_input || !this.coupon_code_input.trim())
+            {
+                this.$q.dialog({ html: true, title: 'Invalid Coupon', message: 'Please enter a coupon code.' });
+                return;
+            }
+            this.is_coupon_loading = true;
+            try
+            {
+                // Collect cart product IDs for backend validation
+                let cart_product_ids = [];
+                for (let m = 0; m < this.groupedProducts.length; m++)
+                {
+                    for (let p = 0; p < this.groupedProducts[m].products.length; p++)
+                    {
+                        let pid = this.groupedProducts[m].products[p].product_id || '';
+                        if (pid && cart_product_ids.indexOf(pid) === -1)
+                        {
+                            cart_product_ids.push(pid);
+                        }
+                    }
+                }
+                let result = await this.$_fbCall('memberValidateProductCoupon', {
+                    coupon_code: this.coupon_code_input.trim().toUpperCase(),
+                    cart_product_ids: cart_product_ids
+                });
+                this.applied_product_coupon = result;
+                this.coupon_discount_total = this.computeCouponDiscount();
+                await this.getShippingFee();
+                this.$q.dialog({ html: true, title: 'Coupon Applied', message: 'Coupon code <b>' + this.applied_product_coupon.coupon_code + '</b> applied successfully!' });
+            }
+            catch (error)
+            {
+                this.applied_product_coupon = null;
+                this.coupon_discount_total = 0;
+                this.$q.dialog({ html: true, title: 'Invalid Coupon', message: error.message || 'Invalid coupon code.' });
+            }
+            this.is_coupon_loading = false;
+        },
+        removeProductCoupon()
+        {
+            this.applied_product_coupon = null;
+            this.coupon_code_input = '';
+            this.coupon_discount_total = 0;
+            this.getShippingFee();
+        },
+        computeCouponDiscount()
+        {
+            if (!this.applied_product_coupon) return 0;
+
+            var coupon = this.applied_product_coupon;
+            var product_ids = coupon.product_ids || [];
+            var total_coupon_discount = 0;
+
+            for (var m = 0; m < this.groupedProducts.length; m++)
+            {
+                var merch = this.groupedProducts[m];
+                for (var p = 0; p < merch.products.length; p++)
+                {
+                    var prod = merch.products[p];
+                    var pid = prod.product_id || (prod.id ? prod.id : '');
+                    if (product_ids.indexOf(pid) !== -1)
+                    {
+                        var unit_price = Number(prod.selling_price);
+                        var qty = Number(prod.quantity);
+                        var discount_amount = 0;
+
+                        if (coupon.discount_type === 'fix_discount')
+                        {
+                            discount_amount = Number(coupon.discount) * qty;
+                        }
+                        else if (coupon.discount_type === 'percent')
+                        {
+                            discount_amount = (unit_price * (Number(coupon.discount) / 100)) * qty;
+                        }
+
+                        // Cap: cannot make product price go below 0
+                        var max_discount = unit_price * qty;
+                        if (discount_amount > max_discount)
+                        {
+                            discount_amount = max_discount;
+                        }
+                        total_coupon_discount += discount_amount;
+                    }
+                }
+            }
+            return Number(total_coupon_discount.toFixed(2));
+        },
         courierListChecker(order)
         {
             // this.courier_settings.courier_list.forEach(cour => {
@@ -2277,6 +2404,13 @@ export default {
                 // });
 
             }
+            // Apply product coupon discount (after vouchers, before custom fees)
+            this.coupon_discount_total = 0;
+            if (this.applied_product_coupon)
+            {
+                this.coupon_discount_total = this.computeCouponDiscount();
+                this.checkout_info.grand_total -= this.coupon_discount_total;
+            }
             if(this.public_settings.hasOwnProperty('custom_ecommerce_fee') && this.payment_method.payment_method_id != 'gc_points')
             {
                 if(this.public_settings.custom_ecommerce_fee.percentage)
@@ -2380,6 +2514,16 @@ export default {
         },
         async proceedCheckout()
         {
+            // Auto-apply coupon if user typed one but didn't click Apply
+            if (this.show_coupon_code && this.coupon_code_input && this.coupon_code_input.trim() && !this.applied_product_coupon)
+            {
+                await this.applyProductCoupon();
+                if (!this.applied_product_coupon)
+                {
+                    return;
+                }
+            }
+
             if(this.show_gcash_fee && this.gcash_fee > 0)
             {
                 this.checkout_info.grand_total + this.gcash_fee;
@@ -2552,6 +2696,18 @@ export default {
         },
         async executeProceedCheckout()
         {
+            // Attach product coupon data if applied
+            if (this.applied_product_coupon)
+            {
+                this.checkout_info.applied_product_coupon = {
+                    coupon_code: this.applied_product_coupon.coupon_code,
+                    coupon_id: this.applied_product_coupon.id,
+                    discount_type: this.applied_product_coupon.discount_type,
+                    discount: this.applied_product_coupon.discount,
+                    product_ids: this.applied_product_coupon.product_ids
+                };
+                this.checkout_info.coupon_discount_total = this.coupon_discount_total;
+            }
             if(this.checkout_info.payment_method.payment_method_id == "wallet")
             {
                 this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)

package/GEarningBreakdownWidget.vue

@@ -122,11 +122,12 @@ export default
             {
                 complan_plan.breakdown_complan.map((val) =>
                 {
-                    let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show };
+                    let extra_keys = val.extra_keys && Array.isArray(val.extra_keys) ? val.extra_keys : [];
+                    let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show, extra_keys: extra_keys };
                     this.earning_breakdown.forEach((breakdown) =>
                     {
                         let another_keyword = val.key+"_convert";
-                        if(breakdown.id == val.key || breakdown.id == another_keyword)
+                        if(breakdown.id == val.key || breakdown.id == another_keyword || extra_keys.indexOf(breakdown.id) !== -1)
                         {
                             res.amount = res.amount+breakdown.amount;
                             res.last_update = breakdown.last_update;
@@ -141,9 +142,9 @@ export default
                         }
                     });
 
-                    for (var key in this.earning_breakdown_slot.temporary_wallet) 
+                    for (var key in this.earning_breakdown_slot.temporary_wallet)
                     {
-                        if(key == val.key)
+                        if(key == val.key || extra_keys.indexOf(key) !== -1)
                         {
                             res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
                         }