@movvjs/svelte-schedule-view 0.2.2 → 0.2.3-revert-terminal

package/.svelte-kit/__package__/i18n/locales/en.json

@@ -20,7 +20,7 @@
     "file": "File",
     "fileUpload": "Upload file",
     "firstName": "First name",
-    "flight": "Flight Info",
+    "flight": "Flight",
     "guestName": "Guest Name",
     "hours": "{hour} hour(s)",
     "lastName": "Last name",
@@ -80,10 +80,8 @@
     "noFlightsWereFound": "No flights were found.",
     "pleaseEnterFlightNo": "Please enter flight No.",
     "pleaseSelectAFlightNo": "Please select a flight No.",
-    "pleaseSelectAnAirport": "Please select an airport.",
     "pleaseSelectDate": "Please select a date.",
     "selectFlightNo": "Select Flight No.",
-    "selectTerminal": "Please select a terminal.",
     "terminal": "Terminal {number}"
   },
   "placeholder": {

package/.svelte-kit/__package__/i18n/locales/ko.json

@@ -20,7 +20,7 @@
     "file": "파일",
     "fileUpload": "파일 업로드",
     "firstName": "이름",
-    "flight": "항공편 정보",
+    "flight": "항공편",
     "guestName": "사용자명",
     "hours": "{hour} 시간",
     "lastName": "성",
@@ -67,10 +67,8 @@
     "noFlightsWereFound": "항공편을 찾을 수 없습니다.",
     "pleaseEnterFlightNo": "항공편명을 입력해주세요.",
     "pleaseSelectAFlightNo": "항공편명을 선택해주세요.",
-    "pleaseSelectAnAirport": "공항을 선택해주세요.",
     "pleaseSelectDate": "날짜를 선택해주세요.",
     "selectFlightNo": "항공편명 선택",
-    "selectTerminal": "터미널을 선택해주세요.",
     "terminal": "터미널 {number}"
   },
   "placeholder": {

package/.svelte-kit/__package__/i18n/locales/vi.json

@@ -20,7 +20,7 @@
     "file": "Tệp",
     "fileUpload": "Cập nhật dử liệu",
     "firstName": "Tên đầu tiên",
-    "flight": "Thông tin chuyến bay",
+    "flight": "Mã chuyến bay",
     "guestName": "Tên khách",
     "hours": "{hour} giờ",
     "lastName": "Họ",
@@ -67,10 +67,8 @@
     "noFlightsWereFound": "Không tìm thấy chuyến bay.",
     "pleaseEnterFlightNo": "Vui lòng nhập số chuyến bay",
     "pleaseSelectAFlightNo": "Vui lòng chọn số chuyến bay",
-    "pleaseSelectAnAirport": "Vui lòng chọn một sân bay.",
     "pleaseSelectDate": "Vui lòng chọn một ngày.",
     "selectFlightNo": "Chọn số chuyến bay",
-    "selectTerminal": "Vui lòng chọn một thiết bị đầu cuối.",
     "terminal": "Nhà ga số 2"
   },
   "placeholder": {

package/.svelte-kit/__package__/i18n/locales/zh-cn.json

@@ -20,7 +20,7 @@
     "file": "档案",
     "fileUpload": "上传文件",
     "firstName": "名",
-    "flight": "航班信息",
+    "flight": "航班号",
     "guestName": "乘客姓名",
     "hours": "{hour} 小时",
     "lastName": "姓",
@@ -67,10 +67,8 @@
     "noFlightsWereFound": "未找到航班。",
     "pleaseEnterFlightNo": "请输入航班号",
     "pleaseSelectAFlightNo": "请选择航班号",
-    "pleaseSelectAnAirport": "请选择一个机场。",
     "pleaseSelectDate": "请选择日期。",
     "selectFlightNo": "选择航班号",
-    "selectTerminal": "请选择一个终端。",
     "terminal": "第{number}航站楼"
   },
   "placeholder": {

package/.svelte-kit/__package__/i18n/locales/zh-tw.json

@@ -20,7 +20,7 @@
     "file": "檔案",
     "fileUpload": "上傳文件",
     "firstName": "名",
-    "flight": "航班資訊",
+    "flight": "航班號",
     "guestName": "乘客姓名",
     "hours": "{hour} 小時",
     "lastName": "姓",
@@ -67,10 +67,8 @@
     "noFlightsWereFound": "未找到航班。",
     "pleaseEnterFlightNo": "請輸入航班號碼",
     "pleaseSelectAFlightNo": "請選擇航班號碼",
-    "pleaseSelectAnAirport": "請選擇機場。",
     "pleaseSelectDate": "請選擇日期。",
     "selectFlightNo": "選擇航班號碼",
-    "selectTerminal": "請選擇一個終端。",
     "terminal": "第{number}航廈"
   },
   "placeholder": {

package/.svelte-kit/__package__/schedule-view/BookingInfo.svelte

@@ -14,7 +14,7 @@ import FlightSearch from "./components/flight-search/FlightSearch.svelte";
 import PhoneNumberInput from "./PhoneNumberInput.svelte";
 import FileUploader from "./FileUploader.svelte";
 import CarSearch from "./CarSearch.svelte";
-const { stdt, fullName, pax, extraServices, files, plans, isFlightService } = originalBooking;
+const { stdt, fullName, pax, extraServices, files, plans } = originalBooking;
 const {
   withPreserveAndPreview,
   hour,
@@ -45,9 +45,9 @@ async function copyContents() {
   texts.push(`${$t("booking.startTime")} : ${dayjs($stdt).format("HH:mm")}`);
   texts.push(`${$t("booking.carInfo")} : ${getCarName($originalBooking.carInfo, { seat: true, seatPostfix: $t("booking.seater") })}`);
   texts.push(`${$t("booking.pax")} : ${$pax}`);
-  if ($isFlightService) {
-    texts.push(`${$t("booking.flight")} : ${[$originalBooking.flight?.name, getTerminalName($originalBooking.flight)].filter(Boolean).join(" / ")}`);
-  }
+  texts.push(
+    `${$t("booking.flight")} : ${$originalBooking.flight?.name || "- -"} ${$originalBooking.flight?.selectType === "AUTO" && $originalBooking.flight?.arrivalTerminal ? `/ ${$t("flight.terminal", { values: { number: $originalBooking.flight.arrivalTerminal } })}` : ""}`
+  );
   texts.push(`${$t("booking.guestName")} : ${$fullName}`);
   texts.push(`${$t("booking.telNo")} : ${$originalBooking.tel || "- -"}`);
   const extraServiceText = $originalBooking.extra?.length > 0 ? $originalBooking.extra.map((s) => $t(`extraServiceType.${s.type}`)).join(", ") : "- -";
@@ -104,46 +104,13 @@ async function toggleAutoPicket(e) {
 function openFlightSearch() {
   flightSearch$.open({
     dateTime: $copiedBooking.ymd,
-    airport: (() => {
-      if ($copiedBooking.serviceType === BookingServiceType.pickup) {
-        return {
-          iata: $copiedBooking.origin?.iata || null,
-          code: $copiedBooking.origin?.code || null
-        };
-      } else if ($copiedBooking.serviceType === BookingServiceType.sending) {
-        return {
-          iata: $copiedBooking.dest?.iata || null,
-          code: $copiedBooking.dest?.code || null
-        };
-      } else {
-        return null;
-      }
-    })(),
-    terminalOnly: $copiedBooking.serviceType === BookingServiceType.sending
+    iata: $copiedBooking.origin?.iata
   }).then((flight) => {
     $copiedBooking.flight = flight;
   }).catch((e) => {
     alert.open({ title: $t("alert.error"), text: e.message });
   });
 }
-function getTerminalName(flight) {
-  if (!flight.arrivalTerminal)
-    return null;
-  if (flight.selectType === "AUTO") {
-    switch (flight.arrivalTerminal) {
-      case "I":
-        return "International";
-      case "D":
-        return "Domestic";
-      default:
-        return `Terminal ${flight.arrivalTerminal}`;
-    }
-  } else if (flight.selectType === "MANUAL") {
-    return flight.arrivalTerminal;
-  } else {
-    return null;
-  }
-}
 </script>
 
 <Translation bind:this={translation$} />
@@ -201,17 +168,17 @@ function getTerminalName(flight) {
 					</td>
 				</tr>
 
-				{#if $isFlightService}
+				{#if $originalBooking.serviceType === BookingServiceType.pickup}
 					<tr>
 						<th>{$t('booking.flight')}</th>
 						<td>
 							{#if !$isEdit}
 								{#if $originalBooking.flight}
 									<p class="indie_value-text flight">
-										{@html [$originalBooking.flight.name, getTerminalName($originalBooking.flight)]
-											.map((value, i) => (value ? (i === 0 ? `<b>${value}</b>` : value) : null))
-											.filter(Boolean)
-											.join(' / ')}
+										<b>{$originalBooking.flight.name}</b>
+										{#if $originalBooking.flight.selectType === 'AUTO' && $originalBooking.flight.arrivalTerminal}
+											/ {$t('flight.terminal', { values: { number: $originalBooking.flight.arrivalTerminal } })}
+										{/if}
 									</p>
 									{#if $originalBooking.flight.selectType === 'MANUAL'}
 										<div class="indie_exclamation_mark_box sm black">
@@ -225,10 +192,10 @@ function getTerminalName(flight) {
 								<!--  -->
 								{#if $copiedBooking.flight}
 									<p class="indie_value-text flight">
-										{@html [$copiedBooking.flight.name, getTerminalName($copiedBooking.flight)]
-											.map((value, i) => (value ? (i === 0 ? `<b>${value}</b>` : value) : null))
-											.filter(Boolean)
-											.join(' / ')}
+										<b>{$copiedBooking.flight.name}</b>
+										{#if $copiedBooking.flight.selectType === 'AUTO' && $copiedBooking.flight.arrivalTerminal}
+											/ {$t('flight.terminal', { values: { number: $copiedBooking.flight.arrivalTerminal } })}
+										{/if}
 									</p>
 									<button type="button" class="indie_btn_squre only refresh_black mgl10" on:click={() => openFlightSearch()}>다시선택</button>
 									{#if $copiedBooking.flight.selectType !== 'AUTO'}

package/.svelte-kit/__package__/schedule-view/Schedule.svelte

@@ -21,10 +21,23 @@ import BookingInfo from "./BookingInfo.svelte";
 import { API_URL } from "../axios/constant";
 import QS from "qs";
 import Axios from "axios";
-const { stdt, price, isModifiable } = originalBooking;
-const { price: editPrice, availableDestZones, availableWaypointZones, fullName, selectedPrice, priceDifference } = copiedBooking;
+const { stdt, price, priceDifference, isModifiable } = originalBooking;
+const {
+  price: editPrice,
+  priceDifference: editPriceDifference,
+  availableDestZones,
+  availableWaypointZones,
+  fullName,
+  selectedPrice
+} = copiedBooking;
 let on = false;
 let resolver;
+$:
+  targetPrice = $isEdit ? $editPrice : $price;
+$:
+  forex = targetPrice?.new?.forex ?? "";
+$:
+  difference = $isEdit ? $editPriceDifference : $priceDifference;
 export function init(options) {
   const { target, isDev, token, locale, viewOnly = false } = options;
   if (!target)
@@ -184,27 +197,22 @@ async function save() {
 								<dl class="priceAll">
 									<dt>{$t('booking.totalPrice')}</dt>
 									<dd>
-										{#if !$isEdit}
-											<!-- * 수정중이 아닌 경우엔 검정색으로 금액 표현 -->
-											<strong>{comma($price.before.amount)} {$price.before.forex}</strong>
+										<!-- * 차액 발생시 -->
+										{#if difference > 0 || difference < 0}
+											<!-- 검정 표현 -->
+											<strong>{comma(targetPrice.before.amount)} {forex}</strong>
+
+											<!--  빨간색 표현 -->
+											<span>
+												{difference > 0 ? ' + ' : ' - '}
+												{comma(Math.abs(difference))}
+												{forex}
+												= {comma(targetPrice.new.amount)}
+												{forex}
+											</span>
 										{:else}
-											{@const forex = $price.new.forex}
-											<!-- * 수정중일때, 차액 발생시 -->
-											{#if $priceDifference > 0 || $priceDifference < 0}
-												<!--  앞부분은 확정된 금액이니 검은색 표현 -->
-												<strong>{comma($editPrice.before.amount)} {forex}</strong>
-												<!-- 뒷부분은 빨간색 표현 -->
-												<span>
-													{$priceDifference > 0 ? ' + ' : ' - '}
-													{comma(Math.abs($priceDifference))}
-													{forex}
-													= {comma($editPrice.new.amount)}
-													{forex}
-												</span>
-											{:else}
-												<!-- * 차액 미 발생시 검정색 표현-->
-												<strong>{comma($editPrice.new.amount)} {forex}</strong>
-											{/if}
+											<!-- * 차액 미 발생시 검정색 표현-->
+											<strong>{comma(targetPrice.new.amount)} {forex}</strong>
 										{/if}
 									</dd>
 								</dl>

package/.svelte-kit/__package__/schedule-view/api/common/index.d.ts

@@ -15,5 +15,4 @@ export declare class CommonAPI {
         url: string;
     }>;
     static searchPlace(keyword: string): Promise<BookingLocation[]>;
-    static getPoiTerminals(code: string): Promise<string[]>;
 }

package/.svelte-kit/__package__/schedule-view/api/common/index.js

@@ -114,13 +114,4 @@ export class CommonAPI {
             throw Error('Invalid target');
         }
     }
-    static async getPoiTerminals(code) {
-        const { data } = await axios.get(`/common/poiTerminal/list/${code}`);
-        if (data.mode === false) {
-            throw new Error(data.msg);
-        }
-        else {
-            return data.list;
-        }
-    }
 }

package/.svelte-kit/__package__/schedule-view/assets/scss/indie_booking.scss

@@ -3038,9 +3038,8 @@
 
         .map_box{
             flex-grow: 1;
-            background-color: royalblue;
+            background-color: Azure;
             position: relative;
-            overflow: hidden;
 
             .indie_ic_map_loca{
                 position: relative;
@@ -4612,61 +4611,5 @@
         }
     }
 
-
-
-    
-    //마진 값
-    .mg{
-        @for $i from 0 through 40{
-            @if(($i % 5) == 0){
-                &t#{$i}{margin-top: #{$i}px;}
-                &l#{$i}{margin-left: #{$i}px;}
-                &r#{$i}{margin-right: #{$i}px;}
-                &b#{$i}{margin-bottom: #{$i}px;}
-            }
-        }
-
-        &TMinus{
-            margin-top: -1px;
-        }
-
-        &-l-auto{
-            margin-left: auto;
-        }
-        &-r-auto{
-            margin-right: auto;
-        }
-    }
-
-    //패딩 값
-    .pd{
-        @for $i from 0 through 40{
-            @if(($i % 5) == 0){
-                &t#{$i}{padding-top: #{$i}px;}
-                &l#{$i}{padding-left: #{$i}px;}
-                &r#{$i}{padding-right: #{$i}px;}
-                &b#{$i}{padding-bottom: #{$i}px;}
-            }
-        }
-    }
-
-    // 넓이 값 - 퍼센트
-    .w{
-        @for $i from 0 through 100{
-            @if(($i % 5) == 0){
-                &#{$i}{width: #{$i + '%'};}
-            }
-        }
-    }
-
-    // 넓이 값 - 픽셀
-    .w{
-        @for $i from 0 through 500{
-            @if(($i % 10) == 0){
-                &#{$i}px{width: #{$i + 'px'};}
-            }
-        }
-    }
-
 }