@pisell/pisellos 0.10.38 → 0.10.39

package/dist/server/utils/small-ticket.js

@@ -1620,15 +1620,18 @@ function formatVoucherValidityRange(startValue, endValue, locale) {
   var times = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var start = combineVoucherDateAndTime(startValue, times.startTime);
   var end = combineVoucherDateAndTime(endValue, times.endTime);
-  var startText = formatVoucherValidityDate(start, locale);
-  var endText = formatVoucherValidityDate(end, locale);
-  if (startText && endText) {
+  var startPart = formatVoucherValidityDate(start, locale);
+  var endPart = formatVoucherValidityDate(end, locale);
+  if (startPart.text && endPart.text) {
     var parsedStart = dayjs(start);
     var parsedEnd = dayjs(end);
     var sameDay = parsedStart.isValid() && parsedEnd.isValid() && parsedStart.isSame(parsedEnd, 'day');
-    return "".concat(startText, " - ").concat(sameDay && /\d{1,2}:\d{2}/.test(stringify(end)) ? parsedEnd.format('HH:mm') : endText);
+    if (sameDay && startPart.time && endPart.time) {
+      return "".concat(startPart.time, " - ").concat(endPart.time, " ").concat(startPart.date);
+    }
+    return "".concat(startPart.text, " - ").concat(endPart.text);
   }
-  return startText || endText;
+  return startPart.text || endPart.text;
 }
 function combineVoucherDateAndTime(dateValue, timeValue) {
   if (!isPresentId(dateValue) || !isPresentId(timeValue)) return dateValue;
@@ -1637,13 +1640,26 @@ function combineVoucherDateAndTime(dateValue, timeValue) {
   return "".concat(dateText, " ").concat(stringify(timeValue).trim());
 }
 function formatVoucherValidityDate(value, locale) {
-  if (!isPresentId(value)) return '';
+  if (!isPresentId(value)) return {
+    date: '',
+    time: '',
+    text: ''
+  };
   var source = stringify(value).trim();
   var parsed = dayjs(source);
-  if (!parsed.isValid()) return source;
+  if (!parsed.isValid()) return {
+    date: '',
+    time: '',
+    text: source
+  };
   var hasTime = /\d{1,2}:\d{2}/.test(source);
-  if (locale === 'en') return parsed.format(hasTime ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY');
-  return parsed.format(hasTime ? 'YYYY/MM/DD HH:mm' : 'YYYY/MM/DD');
+  var date = parsed.format(locale === 'en' ? 'DD/MM/YYYY' : 'YYYY/MM/DD');
+  var time = hasTime ? parsed.format(/\d{1,2}:\d{2}:\d{2}/.test(source) ? 'HH:mm:ss' : 'HH:mm') : '';
+  return {
+    date: date,
+    time: time,
+    text: time ? "".concat(time, " ").concat(date) : date
+  };
 }
 function getVoucherAssetKey(voucher, index) {
   var identity = firstPresentValue(voucher.voucher_id, voucher.id, voucher.code, voucher.encoded);

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/server/utils/small-ticket.js

@@ -1503,15 +1503,18 @@ function formatVoucherAvailableTime(value, locale) {
 function formatVoucherValidityRange(startValue, endValue, locale, times = {}) {
   const start = combineVoucherDateAndTime(startValue, times.startTime);
   const end = combineVoucherDateAndTime(endValue, times.endTime);
-  const startText = formatVoucherValidityDate(start, locale);
-  const endText = formatVoucherValidityDate(end, locale);
-  if (startText && endText) {
+  const startPart = formatVoucherValidityDate(start, locale);
+  const endPart = formatVoucherValidityDate(end, locale);
+  if (startPart.text && endPart.text) {
     const parsedStart = (0, _dayjs.default)(start);
     const parsedEnd = (0, _dayjs.default)(end);
     const sameDay = parsedStart.isValid() && parsedEnd.isValid() && parsedStart.isSame(parsedEnd, 'day');
-    return `${startText} - ${sameDay && /\d{1,2}:\d{2}/.test(stringify(end)) ? parsedEnd.format('HH:mm') : endText}`;
+    if (sameDay && startPart.time && endPart.time) {
+      return `${startPart.time} - ${endPart.time} ${startPart.date}`;
+    }
+    return `${startPart.text} - ${endPart.text}`;
   }
-  return startText || endText;
+  return startPart.text || endPart.text;
 }
 function combineVoucherDateAndTime(dateValue, timeValue) {
   if (!isPresentId(dateValue) || !isPresentId(timeValue)) return dateValue;
@@ -1520,13 +1523,26 @@ function combineVoucherDateAndTime(dateValue, timeValue) {
   return `${dateText} ${stringify(timeValue).trim()}`;
 }
 function formatVoucherValidityDate(value, locale) {
-  if (!isPresentId(value)) return '';
+  if (!isPresentId(value)) return {
+    date: '',
+    time: '',
+    text: ''
+  };
   const source = stringify(value).trim();
   const parsed = (0, _dayjs.default)(source);
-  if (!parsed.isValid()) return source;
+  if (!parsed.isValid()) return {
+    date: '',
+    time: '',
+    text: source
+  };
   const hasTime = /\d{1,2}:\d{2}/.test(source);
-  if (locale === 'en') return parsed.format(hasTime ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY');
-  return parsed.format(hasTime ? 'YYYY/MM/DD HH:mm' : 'YYYY/MM/DD');
+  const date = parsed.format(locale === 'en' ? 'DD/MM/YYYY' : 'YYYY/MM/DD');
+  const time = hasTime ? parsed.format(/\d{1,2}:\d{2}:\d{2}/.test(source) ? 'HH:mm:ss' : 'HH:mm') : '';
+  return {
+    date,
+    time,
+    text: time ? `${time} ${date}` : date
+  };
 }
 function getVoucherAssetKey(voucher, index) {
   const identity = firstPresentValue(voucher.voucher_id, voucher.id, voucher.code, voucher.encoded);

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.38",
+  "version": "0.10.39",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",