ts-glitter 14.2.5 → 14.2.7

package/lowcode/jspage/main.ts

@@ -37,7 +37,6 @@ const html = String.raw;
 //
 const editorContainerID = `HtmlEditorContainer`;
 init(import.meta.url, (gvc, glitter, gBundle) => {
-
     glitter.share.loading_dialog = (new ShareDialog(gvc.glitter))
 
     const css = String.raw;

package/lowcode/public-components/checkout/index.js

@@ -17,6 +17,7 @@ import { ApiUser } from "../../glitter-base/route/user.js";
 import { FormWidget } from "../../official_view_component/official/form.js";
 import { ShareDialog } from "../../glitterBundle/dialog/ShareDialog.js";
 import { PdClass } from "../product/pd-class.js";
+import { Ad } from "../public/ad.js";
 const html = String.raw;
 const css = String.raw;
 export class CheckoutIndex {
@@ -1593,7 +1594,7 @@ export class CheckoutIndex {
                                                                                                 ${vm.cartData.voucherList.filter((dd) => {
                                                     return dd.bind.find((d2) => {
                                                         return d2.id === item.id;
-                                                    }) && dd.reBackType !== 'giveaway';
+                                                    }) && (dd.reBackType !== 'giveaway') && (dd.reBackType !== 'add_on_items');
                                                 }).map((dd) => {
                                                     return `<div class="fs-6 w-100 " ><i class="fa-solid fa-tickets-perforated  me-2"></i>${dd.title}</div>`;
                                                 }).join('<div class="my-1"></div>')}
@@ -3108,14 +3109,20 @@ export class CheckoutIndex {
                                 distribution_code: ApiCart.cart.distribution_code,
                                 give_away: ApiCart.cart.give_away
                             }).then((res) => {
+                                dialog.dataLoading({ visible: false });
                                 if (res.response.off_line || res.response.is_free) {
                                     ApiCart.clearCart();
                                     location.href = res.response.return_url;
                                 }
                                 else {
-                                    const id = gvc.glitter.getUUID();
-                                    $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
-                                    document.querySelector(`#${id} #submit`).click();
+                                    if (res.response.form.approveLink) {
+                                        location.href = res.response.form.approveLink;
+                                    }
+                                    else {
+                                        const id = gvc.glitter.getUUID();
+                                        $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
+                                        document.querySelector(`#${id} #submit`).click();
+                                    }
                                     ApiCart.clearCart();
                                 }
                             });
@@ -3134,6 +3141,31 @@ export class CheckoutIndex {
                 },
                 divCreate: {},
                 onCreate: () => {
+                    Ad.gtagEvent('view_cart', {
+                        currency: 'TWD',
+                        value: vm.cartData.total,
+                        items: vm.cartData.lineItems.map((item) => {
+                            return {
+                                item_id: item.id,
+                                item_name: item.title,
+                                item_variant: item.spec.join('-'),
+                                price: item.sale_price,
+                                quantity: item.count,
+                                discount: item.discount_price,
+                            };
+                        }),
+                    });
+                    Ad.fbqEvent('AddPaymentInfo', {
+                        value: vm.cartData.total,
+                        currency: 'TWD',
+                        contents: vm.cartData.lineItems.map((item) => {
+                            return {
+                                id: item.id,
+                                quantity: item.count,
+                            };
+                        }),
+                        content_ids: vm.cartData.lineItems.map((item) => item.id),
+                    });
                 },
             };
         })());
@@ -3226,23 +3258,32 @@ export class CheckoutIndex {
                 checkString(subData.phone, '收件人電話', 'phone');
                 checkString(subData.email, '收件人信箱', 'email');
                 if (pass) {
-                    if (window.gtag) {
-                        window.gtag('event', 'begin_checkout', {
-                            currency: 'TWD',
-                            value: cartData.total,
-                            coupon: (_a = cartData.code) !== null && _a !== void 0 ? _a : '',
-                            items: cartData.lineItems.map((item) => {
-                                return {
-                                    item_id: item.id,
-                                    item_name: item.title,
-                                    item_variant: item.spec.join('-'),
-                                    price: item.sale_price,
-                                    quantity: item.count,
-                                    discount: item.discount_price,
-                                };
-                            }),
-                        });
-                    }
+                    Ad.gtagEvent('begin_checkout', {
+                        currency: 'TWD',
+                        value: cartData.total,
+                        coupon: (_a = cartData.code) !== null && _a !== void 0 ? _a : '',
+                        items: cartData.lineItems.map((item) => {
+                            return {
+                                item_id: item.id,
+                                item_name: item.title,
+                                item_variant: item.spec.join('-'),
+                                price: item.sale_price,
+                                quantity: item.count,
+                                discount: item.discount_price,
+                            };
+                        }),
+                    });
+                    Ad.fbqEvent('Purchase', {
+                        value: cartData.total,
+                        currency: 'TWD',
+                        contents: cartData.lineItems.map((item) => {
+                            return {
+                                id: item.id,
+                                quantity: item.count,
+                            };
+                        }),
+                        content_type: 'product',
+                    });
                     resolve(subData);
                 }
             }

package/lowcode/public-components/checkout/index.ts

@@ -13,6 +13,7 @@ import {ShareDialog} from "../../glitterBundle/dialog/ShareDialog.js";
 import {Voucher as OriginVoucher, VoucherContent} from '../user-manager/um-voucher.js'
 import {PdClass} from "../product/pd-class.js";
 import * as vm from "node:vm";
+import {Ad} from "../public/ad.js";
 
 const html = String.raw;
 const css = String.raw;
@@ -1652,7 +1653,7 @@ function getBadgeClass(){
                                                                                                 ${vm.cartData.voucherList.filter((dd: any) => {
                                                                                                     return dd.bind.find((d2: any) => {
                                                                                                         return d2.id === item.id 
-                                                                                                    }) && dd.reBackType!=='giveaway'
+                                                                                                    }) && (dd.reBackType!=='giveaway') && (dd.reBackType!=='add_on_items')
                                                                                                 }).map((dd: any) => {
                                                                                                     return `<div class="fs-6 w-100 " ><i class="fa-solid fa-tickets-perforated  me-2"></i>${dd.title}</div>`
                                                                                                 }).join('<div class="my-1"></div>')}
@@ -3236,13 +3237,21 @@ function getBadgeClass(){
                                                     distribution_code: ApiCart.cart.distribution_code,
                                                     give_away: ApiCart.cart.give_away
                                                 }).then((res) => {
+                                                    dialog.dataLoading({visible:false})
+                                                    
                                                     if (res.response.off_line || res.response.is_free) {
                                                         ApiCart.clearCart()
                                                         location.href = res.response.return_url;
                                                     } else {
-                                                        const id = gvc.glitter.getUUID();
-                                                        $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
-                                                        (document.querySelector(`#${id} #submit`) as any).click();
+                                                        // todo if 他是paypal的key值 上面應該有select之類的
+                                                        if (res.response.form.approveLink){
+                                                            location.href = res.response.form.approveLink;
+                                                        }else{
+                                                            const id = gvc.glitter.getUUID();
+                                                            $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
+                                                            (document.querySelector(`#${id} #submit`) as any).click();
+                                                        }
+                                                        
                                                         ApiCart.clearCart()
                                                     }
                                                 })
@@ -3260,6 +3269,31 @@ function getBadgeClass(){
                     },
                     divCreate: {},
                     onCreate: () => {
+                        Ad.gtagEvent('view_cart', {
+                            currency: 'TWD',
+                            value: vm.cartData.total,
+                            items: vm.cartData.lineItems.map((item: any) => {
+                                return {
+                                    item_id: item.id,
+                                    item_name: item.title,
+                                    item_variant: item.spec.join('-'),
+                                    price: item.sale_price,
+                                    quantity: item.count,
+                                    discount: item.discount_price,
+                                };
+                            }),
+                        });
+                        Ad.fbqEvent('AddPaymentInfo', {
+                            value: vm.cartData.total,
+                            currency: 'TWD',
+                            contents: vm.cartData.lineItems.map((item: any) => {
+                                return {
+                                    id: item.id,
+                                    quantity: item.count,
+                                };
+                            }),
+                            content_ids: vm.cartData.lineItems.map((item: any) => item.id),
+                        });
                     },
                 };
             })()
@@ -3358,23 +3392,32 @@ function getBadgeClass(){
                 checkString(subData.phone, '收件人電話', 'phone');
                 checkString(subData.email, '收件人信箱', 'email');
                 if (pass) {
-                    if ((window as any).gtag) {
-                        (window as any).gtag('event', 'begin_checkout', {
-                            currency: 'TWD',
-                            value: cartData.total,
-                            coupon: cartData.code ?? '',
-                            items: cartData.lineItems.map((item: any) => {
-                                return {
-                                    item_id: item.id,
-                                    item_name: item.title,
-                                    item_variant: item.spec.join('-'),
-                                    price: item.sale_price,
-                                    quantity: item.count,
-                                    discount: item.discount_price,
-                                };
-                            }),
-                        });
-                    }
+                    Ad.gtagEvent('begin_checkout', {
+                        currency: 'TWD',
+                        value: cartData.total,
+                        coupon: cartData.code ?? '',
+                        items: cartData.lineItems.map((item: any) => {
+                            return {
+                                item_id: item.id,
+                                item_name: item.title,
+                                item_variant: item.spec.join('-'),
+                                price: item.sale_price,
+                                quantity: item.count,
+                                discount: item.discount_price,
+                            };
+                        }),
+                    });
+                    Ad.fbqEvent('Purchase', {
+                        value: cartData.total,
+                        currency: 'TWD',
+                        contents: cartData.lineItems.map((item: any) => {
+                            return {
+                                id: item.id,
+                                quantity: item.count,
+                            };
+                        }),
+                        content_type: 'product',
+                    });
                     resolve(subData);
                 }
             }