ts-glitter 21.8.4 → 21.8.7

package/lowcode/public-components/layout-plugin/social-links-01.ts

@@ -33,17 +33,33 @@ export class SocialLinks01 {
     };
     const gotoTopImg = 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/arrow-up-to-line-light.svg';
     gvc.addStyle(css`
-      .floating-action-panel {
-        position: fixed;
-        bottom: 30px;
-        right: 30px;
-        display: flex;
-        flex-direction: column; /* 垂直排列 */
-        align-items: center;
-        gap: 10px; /* 按鈕間距 */
-        z-index: 1000;
+      @media (max-width: 768px) {
+        .floating-action-panel {
+          position: fixed;
+          bottom: 20px;
+          right: 10px;
+          display: flex;
+          flex-direction: column; /* 垂直排列 */
+          align-items: center;
+          gap: 10px; /* 按鈕間距 */
+          z-index: 1000;
+        }
+      }
+
+      @media (min-width: 769px) {
+        .floating-action-panel {
+          position: fixed;
+          bottom: 30px;
+          right: 30px;
+          display: flex;
+          flex-direction: column; /* 垂直排列 */
+          align-items: center;
+          gap: 10px; /* 按鈕間距 */
+          z-index: 1000;
+        }
       }
 
+
       .social-links {
         display: flex;
         flex-direction: column;
@@ -69,56 +85,64 @@ export class SocialLinks01 {
         border: none;
         padding: 2px;
         cursor: pointer;
+        width: 40px;
+        height: 40px;
         border-radius: 50%;
         box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
       }
 
-      .component-img {
-        width: 40px;
-        height: 40px;
-        object-fit: contain;
-      }
 
-      .component-circle:hover .component-img {
+
+      .component-circle:hover {
         opacity: 0.8;
       }
 
       .up-to-top.hidden {
-        display: none;
+        display: none !important;
       }
     `);
+
     return gvc.bindView({
       bind:vm.id,
       view:()=>{
         return html`
-      <div class="floating-action-panel">
-        <div class="social-links">
-          ${socialList
-          .map(socialLink => {
-            const imgSrc = supportSocial.includes(socialLink.social_type)
-              ? socialIMG[socialLink.social_type]
-              : socialIMG.other;
-            return html`
-                <a href="${socialLink.link}" class="component-circle">
-                  <img src="${socialLink.icon??imgSrc}" alt="Go to top" class="component-img" />
-                </a>
-              `;
-          })
-          .join('')}
-        </div>
-        <button
-          class="component-circle up-to-top hidden"
-          onclick="${gvc.event(() => {
-          scrollToTop();
-        })}"
-        >
-          <img src="${gotoTopImg}" alt="Go to top" class="component-img" />
-        </button>
-      </div>
-    `;
+          <div class="floating-action-panel">
+            <div class="social-links">
+              ${socialList
+                .map(socialLink => {
+                  if(socialLink.icon==='https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1722936949034-default_image.jpg'){
+                    (socialLink.icon as any) = undefined;
+                  }
+                  const imgSrc = supportSocial.includes(socialLink.social_type)
+                    ? socialIMG[socialLink.social_type]
+                    : socialIMG.other;
+                  return html`
+                    <div onclick="${
+                      gvc.event(()=>{
+                        gvc.glitter.href = socialLink.link;
+                      })
+                    }" class="component-circle" style="overflow: hidden;
+background-image: url('${socialLink.icon??imgSrc}');background-size: cover;background-position: center;"
+                    >
+                    </div>
+                  `;
+                })
+                .join('')}
+            </div>
+            <button
+              class="component-circle up-to-top hidden  rounded-circle  align-items-center justify-content-center"
+              style="overflow: hidden; background-color: white;display: flex; "
+              onclick="${gvc.event(() => {
+                scrollToTop();
+              })}"
+            >
+              <i class="fa-solid fa-angle-up fs-3"></i>
+            </button>
+          </div>
+        `;
       },divCreate:{}
       ,onInitial:()=>{
-        (window as any).onscroll = function() {
+        window.addEventListener('scroll', function() {
           const scrollPosition = window.scrollY;
 
           const threshold = window.innerHeight / 2;
@@ -130,7 +154,8 @@ export class SocialLinks01 {
           } else {
             panel!.classList.add('hidden');
           }
-        };
+        });
+
       }
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "21.8.4",
+  "version": "21.8.7",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/services/checkout-event.js

@@ -58,7 +58,7 @@ class CheckoutEvent {
         return JSON.parse(JSON.stringify((0, glitter_finance_js_1.onlinePayArray)()));
     }
     async toCheckout(data, type = 'add', replace_order_id) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17;
         try {
             const utTimer = new ut_timer_js_1.UtTimer('TO-CHECKOUT');
             const checkPoint = utTimer.checkPoint;
@@ -313,8 +313,9 @@ class CheckoutEvent {
                 }
             }
             const store_info = await userClass.getConfigV2({ key: 'store-information', user_id: 'manager' });
+            const store_manager = (_z = (await userClass.getConfigV2({ key: 'store_manager', user_id: 'manager' })).list) !== null && _z !== void 0 ? _z : [];
             data.line_items = await Promise.all(data.line_items.map(async (item) => {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c;
                 const getProductData = (await this.shopping.getProduct({
                     page: 0,
                     limit: 1,
@@ -336,7 +337,20 @@ class CheckoutEvent {
                         const isUnderstockingVisible = variant.show_understocking !== 'false';
                         const isManualType = type === 'manual' || type === 'manual-preview';
                         if (isPOS && isUnderstockingVisible && !data.isExhibition) {
-                            variant.stock = ((_b = (_a = variant.stockList) === null || _a === void 0 ? void 0 : _a[data.pos_store]) === null || _b === void 0 ? void 0 : _b.count) || 0;
+                            variant.stock =
+                                store_manager
+                                    .filter((dd) => {
+                                    var _a;
+                                    return (dd.id === data.pos_store ||
+                                        ((_a = store_manager.find((dd) => {
+                                            return dd.id === data.pos_store;
+                                        }).support_store) !== null && _a !== void 0 ? _a : []).includes(dd.id));
+                                })
+                                    .map((d1) => {
+                                    var _a, _b;
+                                    return (_b = (_a = variant.stockList) === null || _a === void 0 ? void 0 : _a[d1.id]) === null || _b === void 0 ? void 0 : _b.count;
+                                })
+                                    .reduce((acc, val) => acc + val, 0) || 0;
                         }
                         if (variant.stock < item.count && isUnderstockingVisible && !isManualType) {
                             if (isPOS || isPreOrderStore) {
@@ -378,7 +392,7 @@ class CheckoutEvent {
                                 show_understocking: variant.show_understocking,
                                 stockList: variant.stockList,
                                 weight: parseInt(variant.weight || '0', 10),
-                                designated_logistics: (_c = content.designated_logistics) !== null && _c !== void 0 ? _c : { type: 'all', list: [] },
+                                designated_logistics: (_a = content.designated_logistics) !== null && _a !== void 0 ? _a : { type: 'all', list: [] },
                                 product_customize_tag: content.product_customize_tag || [],
                             });
                             const shipmentValue = (() => {
@@ -403,8 +417,8 @@ class CheckoutEvent {
                                 if (!scheduledData) {
                                     const sql = `WHERE JSON_CONTAINS(content->'$.pending_order', '"${data.temp_cart_id}"'`;
                                     const scheduledDataQuery = `
-                        SELECT *
-                        FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
+                      SELECT *
+                      FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
                     `;
                                     scheduledData = (await database_js_1.default.query(scheduledDataQuery, []))[0];
                                     if (scheduledData) {
@@ -439,15 +453,35 @@ class CheckoutEvent {
                                     }
                                 }
                                 else {
-                                    variant.deduction_log = { [data.pos_store]: item.count };
-                                    variant.stockList[data.pos_store].count -= item.count;
+                                    const refer = JSON.parse(JSON.stringify(variant.stockList));
+                                    Object.keys(refer).forEach(key => {
+                                        var _a;
+                                        if ((key !== data.pos_store) &&
+                                            (!((_a = store_manager.find((dd) => {
+                                                return dd.id === data.pos_store;
+                                            }).support_store) !== null && _a !== void 0 ? _a : []).includes(key))) {
+                                            delete refer[key];
+                                        }
+                                    });
+                                    const returnData = new stock_js_1.Stock(this.app, this.token).allocateStock(refer, item.count);
+                                    variant.stockList = Object.assign(Object.assign({}, variant.stockList), refer);
+                                    variant.deduction_log = Object.assign(Object.assign({}, variant.deduction_log), returnData.deductionLog);
                                     item.deduction_log = variant.deduction_log;
+                                    console.log(`item.deduction_log===>`, item.deduction_log);
+                                    console.log(`variant.stockList===>`, variant.stockList);
+                                    console.log(`variant.deduction_log===>`, variant.deduction_log);
+                                    content.variants.forEach((d1, index) => {
+                                        console.log(`update-content-pos->`, d1.stockList);
+                                    });
                                 }
                             }
                             else {
                                 const returnData = new stock_js_1.Stock(this.app, this.token).allocateStock(variant.stockList, item.count);
                                 variant.deduction_log = returnData.deductionLog;
                                 item.deduction_log = returnData.deductionLog;
+                                content.variants.forEach((d1, index) => {
+                                    console.log(`update-content-web->`, d1.stockList);
+                                });
                             }
                             saveStockArray.push(() => new Promise(async (resolve, reject) => {
                                 var _a;
@@ -456,8 +490,8 @@ class CheckoutEvent {
                                         if (!scheduledData) {
                                             const sql = `WHERE JSON_CONTAINS(content->'$.pending_order', '"${data.temp_cart_id}"'`;
                                             const scheduledDataQuery = `
-                                SELECT *
-                                FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
+                              SELECT *
+                              FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
                             `;
                                             scheduledData = (await database_js_1.default.query(scheduledDataQuery, []))[0];
                                         }
@@ -492,11 +526,12 @@ class CheckoutEvent {
                                             item.deduction_log = { [store_config.list[0].id]: item.count };
                                         }
                                         else {
-                                            await this.shopping.updateVariantsWithSpec(variant, item.id, item.spec);
+                                            content.variants.forEach((d1, index) => {
+                                                console.log(`update-content->`, d1.stockList);
+                                            });
+                                            await this.shopping.postVariantsAndPriceValue(content);
                                         }
-                                        await database_js_1.default.query(`UPDATE \`${this.app}\`.\`t_manager_post\`
-                             SET ?
-                             WHERE id = ${getProductData.id}`, [{ content: JSON.stringify(content) }]);
+                                        console.log(`post-variants===>`, content);
                                     }
                                     resolve(true);
                                 }
@@ -511,8 +546,8 @@ class CheckoutEvent {
                         is_hidden: content.visible === 'false',
                         is_gift: content.productType.giveaway,
                         sale_price: content.productType.giveaway ? 0 : item.sale_price,
-                        min_qty: (_d = content.min_qty) !== null && _d !== void 0 ? _d : item.min_qty,
-                        max_qty: (_e = content.max_qty) !== null && _e !== void 0 ? _e : item.max_qty,
+                        min_qty: (_b = content.min_qty) !== null && _b !== void 0 ? _b : item.min_qty,
+                        max_qty: (_c = content.max_qty) !== null && _c !== void 0 ? _c : item.max_qty,
                     });
                     item.is_add_on_items && add_on_items.push(item);
                     item.is_gift && gift_product.push(item);
@@ -530,24 +565,24 @@ class CheckoutEvent {
             }
             if (hasMaxProduct && data.email !== 'no-email') {
                 const cartTokenSQL = `
-            SELECT cart_token
-            FROM \`${this.app}\`.t_checkout
-            WHERE email IN (${[-99, (_z = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _z === void 0 ? void 0 : _z.email, (_0 = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _0 === void 0 ? void 0 : _0.phone]
+          SELECT cart_token
+          FROM \`${this.app}\`.t_checkout
+          WHERE email IN (${[-99, (_0 = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _0 === void 0 ? void 0 : _0.email, (_1 = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _1 === void 0 ? void 0 : _1.phone]
                     .filter(Boolean)
                     .map(item => database_js_1.default.escape(item))
                     .join(',')})
-              AND order_status <> '-1'
+            AND order_status <> '-1'
         `;
                 const soldHistory = await database_js_1.default.query(`
-              SELECT *
-              FROM \`${this.app}\`.t_products_sold_history
-              WHERE product_id IN (${[...maxProductMap.keys()].join(',')})
-                AND order_id IN (${cartTokenSQL})
+            SELECT *
+            FROM \`${this.app}\`.t_products_sold_history
+            WHERE product_id IN (${[...maxProductMap.keys()].join(',')})
+              AND order_id IN (${cartTokenSQL})
           `, []);
                 const purchaseHistory = new Map();
                 for (const history of soldHistory) {
                     const pid = Number(history.product_id);
-                    purchaseHistory.set(pid, ((_1 = purchaseHistory.get(pid)) !== null && _1 !== void 0 ? _1 : 0) + history.count);
+                    purchaseHistory.set(pid, ((_2 = purchaseHistory.get(pid)) !== null && _2 !== void 0 ? _2 : 0) + history.count);
                 }
                 for (const item of data.line_items) {
                     if (maxProductMap.has(item.id)) {
@@ -556,13 +591,13 @@ class CheckoutEvent {
                 }
             }
             checkPoint('set max product');
-            carData.select_shipment_setting = ((_2 = data === null || data === void 0 ? void 0 : data.user_info) === null || _2 === void 0 ? void 0 : _2.shipment)
+            carData.select_shipment_setting = ((_3 = data === null || data === void 0 ? void 0 : data.user_info) === null || _3 === void 0 ? void 0 : _3.shipment)
                 ? await userClass.getConfigV2({
                     key: 'shipment_config_' + data.user_info.shipment,
                     user_id: 'manager',
                 })
                 : {};
-            const freeShipmnetNum = (_5 = (_4 = (_3 = carData.select_shipment_setting) === null || _3 === void 0 ? void 0 : _3.cartSetting) === null || _4 === void 0 ? void 0 : _4.freeShipmnetTarget) !== null && _5 !== void 0 ? _5 : 0;
+            const freeShipmnetNum = (_6 = (_5 = (_4 = carData.select_shipment_setting) === null || _4 === void 0 ? void 0 : _4.cartSetting) === null || _5 === void 0 ? void 0 : _5.freeShipmnetTarget) !== null && _6 !== void 0 ? _6 : 0;
             const isFreeShipment = freeShipmnetNum > 0 && carData.total >= freeShipmnetNum;
             carData.shipment_fee = isFreeShipment
                 ? 0
@@ -620,7 +655,7 @@ class CheckoutEvent {
                 await this.shopping.checkVoucher(carData);
                 checkPoint('check voucher');
                 let can_add_gift = [];
-                (_6 = carData.voucherList) === null || _6 === void 0 ? void 0 : _6.filter(dd => dd.reBackType === 'giveaway').forEach(dd => can_add_gift.push(dd.add_on_products));
+                (_7 = carData.voucherList) === null || _7 === void 0 ? void 0 : _7.filter(dd => dd.reBackType === 'giveaway').forEach(dd => can_add_gift.push(dd.add_on_products));
                 gift_product.forEach(dd => {
                     const max_count = can_add_gift.filter(d1 => d1.includes(dd.id)).length;
                     if (max_count) {
@@ -632,7 +667,7 @@ class CheckoutEvent {
                     }
                 });
                 for (const giveawayData of carData.voucherList.filter(dd => dd.reBackType === 'giveaway')) {
-                    if (!((_7 = giveawayData.add_on_products) === null || _7 === void 0 ? void 0 : _7.length))
+                    if (!((_8 = giveawayData.add_on_products) === null || _8 === void 0 ? void 0 : _8.length))
                         continue;
                     const productPromises = giveawayData.add_on_products
                         .map(async (id) => {
@@ -660,7 +695,7 @@ class CheckoutEvent {
                 appName: this.app,
                 key: 'glitter_finance',
             });
-            const keyData = (_8 = configData[0]) === null || _8 === void 0 ? void 0 : _8.value;
+            const keyData = (_9 = configData[0]) === null || _9 === void 0 ? void 0 : _9.value;
             if (keyData) {
                 carData.payment_info_custom = keyData.payment_info_custom;
             }
@@ -690,10 +725,10 @@ class CheckoutEvent {
                 }
             });
             checkPoint('set payment');
-            keyData.cash_on_delivery = (_9 = keyData.cash_on_delivery) !== null && _9 !== void 0 ? _9 : { shipmentSupport: [] };
+            keyData.cash_on_delivery = (_10 = keyData.cash_on_delivery) !== null && _10 !== void 0 ? _10 : { shipmentSupport: [] };
             carData.payment_info_line_pay = keyData.payment_info_line_pay;
             carData.payment_info_atm = keyData.payment_info_atm;
-            keyData.cash_on_delivery.shipmentSupport = (_10 = keyData.cash_on_delivery.shipmentSupport) !== null && _10 !== void 0 ? _10 : [];
+            keyData.cash_on_delivery.shipmentSupport = (_11 = keyData.cash_on_delivery.shipmentSupport) !== null && _11 !== void 0 ? _11 : [];
             await this.setPaymentSetting({ carData: carData, checkoutPayment: checkoutPayment, keyData: keyData });
             let subtotal = 0;
             carData.lineItems.map(item => {
@@ -715,7 +750,7 @@ class CheckoutEvent {
             const excludedValuesByTotal = new Set(['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C']);
             const excludedValuesByWeight = new Set(['normal', 'black_cat']);
             const logisticsGroupResult = await userClass.getConfig({ key: 'logistics_group', user_id: 'manager' });
-            const logisticsGroup = (_12 = (_11 = logisticsGroupResult[0]) === null || _11 === void 0 ? void 0 : _11.value) !== null && _12 !== void 0 ? _12 : [];
+            const logisticsGroup = (_13 = (_12 = logisticsGroupResult[0]) === null || _12 === void 0 ? void 0 : _12.value) !== null && _13 !== void 0 ? _13 : [];
             const isExcludedByTotal = (dd) => {
                 return carData.total > 20000 && excludedValuesByTotal.has(dd.value);
             };
@@ -822,7 +857,7 @@ class CheckoutEvent {
                 carData.discount = data.discount;
                 carData.voucherList = [tempVoucher];
                 carData.customer_info = data.customer_info;
-                carData.total = (_13 = data.total) !== null && _13 !== void 0 ? _13 : 0;
+                carData.total = (_14 = data.total) !== null && _14 !== void 0 ? _14 : 0;
                 carData.rebate = tempVoucher.rebate_total;
                 if (tempVoucher.reBackType == 'shipment_free' || type == 'split') {
                     carData.shipment_fee = 0;
@@ -867,7 +902,7 @@ class CheckoutEvent {
                 if (checkOutType === 'POS' && Array.isArray(data.voucherList)) {
                     const manualVoucher = data.voucherList.find((item) => item.id === 0);
                     if (manualVoucher) {
-                        manualVoucher.discount = (_14 = manualVoucher.discount_total) !== null && _14 !== void 0 ? _14 : 0;
+                        manualVoucher.discount = (_15 = manualVoucher.discount_total) !== null && _15 !== void 0 ? _15 : 0;
                         carData.total -= manualVoucher.discount;
                         carData.discount += manualVoucher.discount;
                         carData.voucherList.push(manualVoucher);
@@ -899,15 +934,15 @@ class CheckoutEvent {
                         console.error(e);
                     }
                 }
+                await trans.commit();
+                await trans.release();
+                await Promise.all(saveStockArray.map(dd => dd()));
                 await order_event_js_1.OrderEvent.insertOrder({
                     cartData: carData,
                     status: data.pay_status,
                     app: this.app,
                 });
-                await trans.commit();
-                await trans.release();
-                await Promise.all(saveStockArray.map(dd => dd()));
-                await this.shopping.releaseCheckout((_15 = data.pay_status) !== null && _15 !== void 0 ? _15 : 0, carData.orderID);
+                await this.shopping.releaseCheckout((_16 = data.pay_status) !== null && _16 !== void 0 ? _16 : 0, carData.orderID);
                 checkPoint('release pos checkout');
                 for (const email of new Set([carData.customer_info, carData.user_info].map(dd => {
                     return dd && dd.email;
@@ -961,7 +996,7 @@ class CheckoutEvent {
                     appName: this.app,
                     key: 'glitter_finance',
                 }))[0].value;
-                let kd = (_16 = keyData[carData.customer_info.payment_select]) !== null && _16 !== void 0 ? _16 : {
+                let kd = (_17 = keyData[carData.customer_info.payment_select]) !== null && _17 !== void 0 ? _17 : {
                     ReturnURL: '',
                     NotifyURL: '',
                 };