@aptos-scp/scp-component-store-selling-features-domain-model 1.0.8 → 1.0.9

package/lib/domain/UIBusinessEventTypes.d.ts

@@ -65,6 +65,9 @@ export declare const RESERVE_INVENTORY_EVENT: string;
 export declare const SEARCH_ORDERS_EVENT: string;
 export declare const LOG_OFF_EVENT: string;
 export declare const LOG_ON_EVENT: string;
+export declare const LOCK_USER_SESSION_EVENT: string;
+export declare const UNLOCK_USER_SESSION_EVENT: string;
+export declare const AUTO_LOG_OFF_OR_LOCK_EVENT: string;
 export declare const LOG_ON_UNATTENDED_USER_EVENT: string;
 export declare const LOOKUP_CUSTOMER_EVENT: string;
 export declare const MANUAL_DISCOUNT_VALIDATION_EVENT: string;
@@ -275,6 +278,7 @@ export declare const TAX_REFUND_VOID_EVENT: string;
 export declare const START_TAX_REFUND_DEFERRED_EVENT: string;
 export declare const TAX_REFUND_DEFERRED_EVENT: string;
 export declare const START_OPEN_CASH_DRAWER_EVENT: string;
+export declare const START_OPEN_TENDER_EXCHANGE_CASH_DRAWER_EVENT: string;
 export declare const CAPTURE_LOTTERY_CODE_EVENT: string;
 export declare const APPLY_ITEM_SUBSCRIPTION_EVENT: string;
 export declare const ADD_ITEM_SUBSCRIPTION_EVENT: string;

package/lib/domain/UIBusinessEventTypes.js

@@ -68,6 +68,9 @@ exports.RESERVE_INVENTORY_EVENT = "ReserveInventoryEvent";
 exports.SEARCH_ORDERS_EVENT = "SearchOrdersEvent";
 exports.LOG_OFF_EVENT = "LogOff";
 exports.LOG_ON_EVENT = "LogOn";
+exports.LOCK_USER_SESSION_EVENT = "LockUserSession";
+exports.UNLOCK_USER_SESSION_EVENT = "UnlockUserSession";
+exports.AUTO_LOG_OFF_OR_LOCK_EVENT = "AutoLogOffOrLock";
 exports.LOG_ON_UNATTENDED_USER_EVENT = "LogOnUnattendedUser";
 exports.LOOKUP_CUSTOMER_EVENT = "LookupCustomer";
 exports.MANUAL_DISCOUNT_VALIDATION_EVENT = "ManualDiscountValidationEvent";
@@ -282,6 +285,7 @@ exports.TAX_REFUND_VOID_EVENT = "TaxRefundVoid";
 exports.START_TAX_REFUND_DEFERRED_EVENT = "StartTaxRefundDeferred";
 exports.TAX_REFUND_DEFERRED_EVENT = "TaxRefundDeferred";
 exports.START_OPEN_CASH_DRAWER_EVENT = "StartOpenCashDrawer";
+exports.START_OPEN_TENDER_EXCHANGE_CASH_DRAWER_EVENT = "StartOpenTenderExchangeCashDrawer";
 exports.CAPTURE_LOTTERY_CODE_EVENT = "CaptureLotteryCode";
 exports.APPLY_ITEM_SUBSCRIPTION_EVENT = "ApplyItemSubscription";
 exports.ADD_ITEM_SUBSCRIPTION_EVENT = "AddItemSubscription";

package/lib/domain/model/Constants.d.ts

@@ -98,6 +98,7 @@ export declare enum UiInputKey {
     ASSIGN_TO_TRANSACTION = "input_assignToTransaction",
     AUTHORIZATION_DEVICE_ID = "input_authorizationDeviceId",
     BUSINESS_DAY_DATE = "input_businessDayDate",
+    SAME_AS_BILLTO = "input_sameAsBillTo",
     BILLING = "input_billing",
     CASH_DRAWER_STATUS = "input_cashDrawerStatus",
     COMPLETE_RESUME_EVENT = "input_resumeCompleteEvent",
@@ -303,6 +304,8 @@ export declare enum UiInputKey {
     ALTERNATE_KEY_ADD = "input_alternateKeyAdd",
     ALTERNATE_KEY_SWAP = "input_alternateKeySwap",
     ALTERNATE_KEY_REMOVE = "input_alternateKeyRemove",
+    EMAIL_OR_PHONE = "input_emailOrPhone",
+    EMAIL_ADDRESS = "emailAddress",
     TILL_KEY = "input_tillKey",
     TILL_ACTUAL_AMOUNT = "input_tillActualAmount",
     TILL_TRANSFER_AMOUNT = "input_tillTransferAmount",
@@ -425,6 +428,7 @@ export declare enum CollectedDataKey {
     AutoApplied = "AutoApplied",
     BalanceInquiry = "BalanceInquiry",
     Billing = "Billing",
+    SameAsBillTo = "SameAsBillTo",
     BalanceInquiryResponse = "BalanceInquiryResponse",
     ExchangeRateValue = "exchangeRateValue",
     FeesByFulfillmentGroup = "FeesByFulfillmentGroup",

package/lib/domain/model/Constants.js

@@ -101,6 +101,7 @@ var UiInputKey;
     UiInputKey["ASSIGN_TO_TRANSACTION"] = "input_assignToTransaction";
     UiInputKey["AUTHORIZATION_DEVICE_ID"] = "input_authorizationDeviceId";
     UiInputKey["BUSINESS_DAY_DATE"] = "input_businessDayDate";
+    UiInputKey["SAME_AS_BILLTO"] = "input_sameAsBillTo";
     UiInputKey["BILLING"] = "input_billing";
     UiInputKey["CASH_DRAWER_STATUS"] = "input_cashDrawerStatus";
     UiInputKey["COMPLETE_RESUME_EVENT"] = "input_resumeCompleteEvent";
@@ -306,6 +307,8 @@ var UiInputKey;
     UiInputKey["ALTERNATE_KEY_ADD"] = "input_alternateKeyAdd";
     UiInputKey["ALTERNATE_KEY_SWAP"] = "input_alternateKeySwap";
     UiInputKey["ALTERNATE_KEY_REMOVE"] = "input_alternateKeyRemove";
+    UiInputKey["EMAIL_OR_PHONE"] = "input_emailOrPhone";
+    UiInputKey["EMAIL_ADDRESS"] = "emailAddress";
     UiInputKey["TILL_KEY"] = "input_tillKey";
     UiInputKey["TILL_ACTUAL_AMOUNT"] = "input_tillActualAmount";
     UiInputKey["TILL_TRANSFER_AMOUNT"] = "input_tillTransferAmount";
@@ -434,6 +437,7 @@ var CollectedDataKey;
     CollectedDataKey["AutoApplied"] = "AutoApplied";
     CollectedDataKey["BalanceInquiry"] = "BalanceInquiry";
     CollectedDataKey["Billing"] = "Billing";
+    CollectedDataKey["SameAsBillTo"] = "SameAsBillTo";
     CollectedDataKey["BalanceInquiryResponse"] = "BalanceInquiryResponse";
     CollectedDataKey["ExchangeRateValue"] = "exchangeRateValue";
     CollectedDataKey["FeesByFulfillmentGroup"] = "FeesByFulfillmentGroup";

package/lib/domain/model/Customer.d.ts

@@ -124,6 +124,7 @@ export interface ICustomerSearch {
     lastName?: string;
     alternateKey1?: string;
     alternateKey2?: string;
+    emailOrPhone?: string;
     limit?: number;
     offset?: number;
     fields?: string[];

package/lib/domain/model/MerchandiseTransaction.d.ts

@@ -129,6 +129,7 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
     private _taxLotteryNumber?;
     private _denominationRounding?;
     private _order?;
+    private _sameAsBillTo?;
     private _orderReferenceSequenceNumber?;
     private _orderReferenceSequenceNumberGenerator?;
     private _taxLotteryCustomerCode?;
@@ -230,6 +231,7 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
     get invoiceSequenceNumber(): number;
     get invoiceSequenceNumberGenerator(): string;
     get orderReferenceSequenceNumber(): number;
+    get sameAsBillTo(): boolean;
     get orderReferenceSequenceNumberGenerator(): string;
     get transactionTaxExemptAmount(): Money;
     get transactionTaxAdjustmentAmount(): Money;

package/lib/domain/model/MerchandiseTransaction.js

@@ -194,6 +194,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             transaction._taxLotteryNumber = this._taxLotteryNumber;
             transaction._denominationRounding = this._denominationRounding;
             transaction._order = this._order;
+            transaction._sameAsBillTo = this._sameAsBillTo;
             transaction._orderReferenceSequenceNumber = this._orderReferenceSequenceNumber;
             transaction._orderReferenceSequenceNumberGenerator = this._orderReferenceSequenceNumberGenerator;
             transaction._taxLotteryCustomerCode = this._taxLotteryCustomerCode;
@@ -461,6 +462,9 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
     get orderReferenceSequenceNumber() {
         return this._orderReferenceSequenceNumber;
     }
+    get sameAsBillTo() {
+        return this._sameAsBillTo;
+    }
     get orderReferenceSequenceNumberGenerator() {
         return this._orderReferenceSequenceNumberGenerator;
     }
@@ -846,6 +850,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             ["transaction.taxLotteryNumber", this._taxLotteryNumber],
             ["transaction.denominationRounding", this.denominationRounding],
             ["transaction.order", this._order],
+            ["transaction.sameAsBillTo", this._sameAsBillTo],
             ["transaction.taxLotteryCustomerCode", this._taxLotteryCustomerCode],
             ["transaction.taxScanCodeData", this._taxScanCodeData],
             ["transaction.inventoryReservationStatus", this.inventoryReservationStatus],
@@ -967,6 +972,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             _taxLotteryNumber: this._taxLotteryNumber,
             _denominationRounding: this._denominationRounding,
             _order: this.order,
+            _sameAsBillTo: this._sameAsBillTo,
             _orderReferenceSequenceNumber: this._orderReferenceSequenceNumber,
             _orderReferenceSequenceNumberGenerator: this._orderReferenceSequenceNumberGenerator,
             _taxLotteryCustomerCode: this._taxLotteryCustomerCode,
@@ -1109,6 +1115,7 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             transactionJsonObj._denominationRounding && new scp_component_business_core_1.Money(transactionJsonObj._denominationRounding);
         this._order = Order_1.Order.createFromJsonObject(transactionJsonObj._order);
         this._invoiceSequenceNumberGenerator = transactionJsonObj._invoiceSequenceNumberGenerator;
+        this._sameAsBillTo = transactionJsonObj._sameAsBillTo;
         this._orderReferenceSequenceNumber = transactionJsonObj._orderReferenceSequenceNumber;
         this._orderReferenceSequenceNumberGenerator = transactionJsonObj._orderReferenceSequenceNumberGenerator;
         this._taxLotteryCustomerCode = transactionJsonObj._taxLotteryCustomerCode;

package/lib/domain/model/Order.d.ts

@@ -27,6 +27,7 @@ export declare class Order extends BaseOrder implements IOrder {
     get totals(): OrderTotals;
     get billing(): IBilling;
     get customerContactVerificationStatus(): ContactVerificationStatus;
+    get sameAsBillTo(): boolean;
     private _orderReferenceId;
     private readonly _fulfillmentGroups;
     private readonly _mixedBasketEnabled;
@@ -35,6 +36,7 @@ export declare class Order extends BaseOrder implements IOrder {
     private _totals;
     private _billing;
     private _contactVerificationStatus;
+    private _sameAsBillTo;
     static create(orderReferenceId: string, mixedBasketEnabled: boolean, fulfillmentGroupId: number, fulfillmentType: FulfillmentType, address: IAddress, retailLocationId: string, storeName?: string, contact?: ICustomer | IPerson, orderType?: OrderType, deliveryInterval?: ITimeInterval, deliveryCode?: string, fulfillmentGroupDescription?: string, totals?: OrderTotals, billing?: IBilling): Order;
     static createFromJsonObject(orderFromJson: any): Order;
     static getFulfillmentGroupByType(order: Order, fulfillmentType: FulfillmentType): FulfillmentGroup;
@@ -50,11 +52,12 @@ export declare class Order extends BaseOrder implements IOrder {
      * @param mixedBasketEnabled A flag for setting whether or not mixed basket is enabled
      * @param totals order related totals.
      */
-    constructor(orderReferenceId: string, fulfillmentGroups: FulfillmentGroup[], mixedBasketEnabled: boolean, orderType: OrderType, voided?: boolean, totals?: OrderTotals, billing?: IBilling, contactVerificationStatus?: ContactVerificationStatus);
+    constructor(orderReferenceId: string, fulfillmentGroups: FulfillmentGroup[], mixedBasketEnabled: boolean, orderType: OrderType, voided?: boolean, totals?: OrderTotals, billing?: IBilling, contactVerificationStatus?: ContactVerificationStatus, sameAsBillTo?: boolean);
     clone(): IOrder;
     void(): Order;
     updateContact(fulfillmentGroupId: number, contact: ICustomer): Order;
     updateCustomerContactVerificationStatus(status: ContactVerificationStatus): Order;
+    updateSameAsBillTo(value: boolean): Order;
     updateBilling(billing: IBilling): Order;
     updateOrderTotals(totals: OrderTotals): Order;
     removeFulfillmentGroup(fulfillmentGroupId: number): Order;

package/lib/domain/model/Order.js

@@ -33,7 +33,7 @@ class Order extends BaseOrder {
      * @param mixedBasketEnabled A flag for setting whether or not mixed basket is enabled
      * @param totals order related totals.
      */
-    constructor(orderReferenceId, fulfillmentGroups, mixedBasketEnabled, orderType, voided = false, totals, billing, contactVerificationStatus = ContactVerificationStatus.NotVerified) {
+    constructor(orderReferenceId, fulfillmentGroups, mixedBasketEnabled, orderType, voided = false, totals, billing, contactVerificationStatus = ContactVerificationStatus.NotVerified, sameAsBillTo) {
         super();
         this._fulfillmentGroups = fulfillmentGroups;
         this._orderReferenceId = orderReferenceId;
@@ -43,6 +43,7 @@ class Order extends BaseOrder {
         this._totals = totals;
         this._billing = billing;
         this._contactVerificationStatus = contactVerificationStatus;
+        this._sameAsBillTo = sameAsBillTo;
     }
     get orderReferenceId() {
         return this._orderReferenceId;
@@ -68,6 +69,9 @@ class Order extends BaseOrder {
     get customerContactVerificationStatus() {
         return this._contactVerificationStatus;
     }
+    get sameAsBillTo() {
+        return this._sameAsBillTo;
+    }
     static create(orderReferenceId, mixedBasketEnabled, fulfillmentGroupId, fulfillmentType, address, retailLocationId, storeName, contact, orderType = scp_types_commerce_transaction_1.OrderType.Regular, deliveryInterval, deliveryCode, fulfillmentGroupDescription, totals, billing) {
         const fulfillmentGroups = [];
         const fulfillmentGroup = FulfillmentGroup_1.FulfillmentGroup.create(fulfillmentGroupId, fulfillmentType, address, retailLocationId, storeName, contact, deliveryInterval, deliveryCode, fulfillmentGroupDescription);
@@ -97,11 +101,11 @@ class Order extends BaseOrder {
         return Order.getFulfillmentGroup(order);
     }
     clone() {
-        const newOrder = new Order(this.orderReferenceId, this.fulfillmentGroups, this.mixedBasketEnabled, this.orderType, this.voided, this.totals, this.billing, this.customerContactVerificationStatus);
+        const newOrder = new Order(this.orderReferenceId, this.fulfillmentGroups, this.mixedBasketEnabled, this.orderType, this.voided, this.totals, this.billing, this.customerContactVerificationStatus, this.sameAsBillTo);
         return newOrder;
     }
     void() {
-        const newOrder = new Order(this.orderReferenceId, this.fulfillmentGroups, this.mixedBasketEnabled, this.orderType, true, this.totals, this.billing, this.customerContactVerificationStatus);
+        const newOrder = new Order(this.orderReferenceId, this.fulfillmentGroups, this.mixedBasketEnabled, this.orderType, true, this.totals, this.billing, this.customerContactVerificationStatus, this.sameAsBillTo);
         return newOrder;
     }
     updateContact(fulfillmentGroupId, contact) {
@@ -121,11 +125,14 @@ class Order extends BaseOrder {
         newOrder._contactVerificationStatus = status;
         return newOrder;
     }
+    updateSameAsBillTo(value) {
+        const newOrder = this.clone();
+        newOrder._sameAsBillTo = value;
+        return newOrder;
+    }
     updateBilling(billing) {
         const newOrder = this.clone();
-        if (billing) {
-            newOrder._billing = billing;
-        }
+        newOrder._billing = billing;
         return newOrder;
     }
     updateOrderTotals(totals) {

package/lib/domain/model/configuration/IAutomaticTimeoutConfig.d.ts

@@ -0,0 +1,8 @@
+export interface IAutomaticTimeoutConfig {
+    enabled: boolean;
+    timeoutSeconds?: number;
+    securityPolicies?: ISecurityPolicies;
+}
+export interface ISecurityPolicies {
+    managerUnlock: string;
+}

package/lib/domain/model/configuration/IAutomaticTimeoutConfig.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IAutomaticTimeoutConfig.js.map

package/lib/domain/model/configuration/IFeatureAccessConfig.d.ts

@@ -57,6 +57,7 @@ export interface IFeatureAccessConfig {
     subscriptionPaymentFlow?: SubscriptionFlowOptions;
     preconfiguredOverrides?: PreconfiguredDiscountOverrides;
     byFeeType?: IFeeType;
+    defaultSelection?: IDefaultSelectionForManualDiscount;
 }
 export interface ITranslatableMessage {
     [locale: string]: string;
@@ -184,3 +185,7 @@ export interface IFeeChange {
     reasonCodeListType?: string;
     limits?: IThreshold;
 }
+export declare enum IDefaultSelectionForManualDiscount {
+    Amount = "Amount",
+    Percent = "Percent"
+}

package/lib/domain/model/configuration/IFeatureAccessConfig.js

@@ -48,4 +48,10 @@ var SubscriptionFlowOptions;
     SubscriptionFlowOptions["TokenBeforePayment"] = "TokenBeforePayment";
     SubscriptionFlowOptions["PaymentBeforeToken"] = "PaymentBeforeToken";
 })(SubscriptionFlowOptions = exports.SubscriptionFlowOptions || (exports.SubscriptionFlowOptions = {}));
+// The Default selection for manual discount screens that have amount and percentage options.
+var IDefaultSelectionForManualDiscount;
+(function (IDefaultSelectionForManualDiscount) {
+    IDefaultSelectionForManualDiscount["Amount"] = "Amount";
+    IDefaultSelectionForManualDiscount["Percent"] = "Percent";
+})(IDefaultSelectionForManualDiscount = exports.IDefaultSelectionForManualDiscount || (exports.IDefaultSelectionForManualDiscount = {}));
 //# sourceMappingURL=IFeatureAccessConfig.js.map

package/lib/domain/model/configuration/index.d.ts

@@ -28,3 +28,4 @@ export * from "./Ii18n";
 export * from "./IProductInquiryBehaviorsConfig";
 export * from "./IFeesConfig";
 export * from "./DataEntryRule";
+export * from "./IAutomaticTimeoutConfig";

package/lib/domain/model/index.d.ts

@@ -56,7 +56,7 @@ export * from "./Organization";
 export * from "./geoLocation";
 export * from "./giftCard/";
 export * from "./fee/";
-export * from "./fiscalDevice";
+export * from "./fiscalDevice/";
 export * from "./donation/";
 export * from "./employeeCustomer/";
 export * from "./shipping/";

package/lib/domain/model/index.js

@@ -56,7 +56,7 @@ __export(require("./UserTransaction"));
 __export(require("./VoidInterfaces"));
 __export(require("./giftCard/"));
 __export(require("./fee/"));
-__export(require("./fiscalDevice"));
+__export(require("./fiscalDevice/"));
 __export(require("./donation/"));
 __export(require("./employeeCustomer/"));
 __export(require("./shipping/"));

package/lib/domain/model/user/UserLine.d.ts

@@ -4,6 +4,8 @@ import { BaseTransactionLine } from "../BaseTransactionLine";
 import { IServiceResultLine } from "../IServiceResultLine";
 export declare const LOG_ON_LINE_TYPE = "LogOn";
 export declare const LOG_OFF_LINE_TYPE = "LogOff";
+export declare const LOCK_LINE_TYPE = "Lock";
+export declare const UNLOCK_LINE_TYPE = "Unlock";
 export declare const PASSWORD_CHANGED_LINE_TYPE = "PasswordChanged";
 export declare const UPDATED_USER_PREFERENCES_LINE_TYPE = "UpdatedUserPreferences";
 export declare class UserLine extends BaseTransactionLine implements IServiceResultLine {

package/lib/domain/model/user/UserLine.js

@@ -5,6 +5,8 @@ const BaseTransactionLine_1 = require("../BaseTransactionLine");
 const User_1 = require("../User");
 exports.LOG_ON_LINE_TYPE = "LogOn";
 exports.LOG_OFF_LINE_TYPE = "LogOff";
+exports.LOCK_LINE_TYPE = "Lock";
+exports.UNLOCK_LINE_TYPE = "Unlock";
 exports.PASSWORD_CHANGED_LINE_TYPE = "PasswordChanged";
 exports.UPDATED_USER_PREFERENCES_LINE_TYPE = "UpdatedUserPreferences";
 class UserLine extends BaseTransactionLine_1.BaseTransactionLine {
@@ -38,7 +40,8 @@ class UserLine extends BaseTransactionLine_1.BaseTransactionLine {
         const lineType = BaseTransactionLine_1.BaseTransactionLine.lineTypeFromJsonObject(transactionLineJsonObj);
         const user = User_1.User.createFromJsonObject(transactionLineJsonObj._user);
         const autoLogoff = transactionLineJsonObj._autoLogoff;
-        const userLine = new UserLine(lineNumber, lineType, user, autoLogoff);
+        const serviceResult = transactionLineJsonObj._serviceResult;
+        const userLine = new UserLine(lineNumber, lineType, user, autoLogoff, serviceResult);
         userLine.loadFromJsonObject(transactionLineJsonObj);
         return userLine;
     }
@@ -74,6 +77,8 @@ function isUserLine(transactionLine) {
     return (transactionLine instanceof UserLine ||
         ((transactionLine.lineType === exports.LOG_ON_LINE_TYPE ||
             transactionLine.lineType === exports.LOG_OFF_LINE_TYPE ||
+            transactionLine.lineType === exports.LOCK_LINE_TYPE ||
+            transactionLine.lineType === exports.UNLOCK_LINE_TYPE ||
             transactionLine.lineType === exports.PASSWORD_CHANGED_LINE_TYPE ||
             transactionLine.lineType === exports.UPDATED_USER_PREFERENCES_LINE_TYPE ||
             transactionLine.lineType === User_1.EXIT_ATTENDANT_MODE_LINE_TYPE ||

package/lib/domain/utility/utils.js

@@ -112,6 +112,7 @@ function mapStartTillEventTypeToLineType() {
         [UIBusinessEventTypes_1.START_SAFE_TO_TILL_EVENT, model_1.START_SAFE_TO_TILL_LINE_TYPE],
         [UIBusinessEventTypes_1.START_TILL_TO_SAFE_EVENT, model_1.START_TILL_TO_SAFE_LINE_TYPE],
         [UIBusinessEventTypes_1.START_OPEN_CASH_DRAWER_EVENT, model_1.START_OPEN_CASH_DRAWER_LINE_TYPE],
+        [UIBusinessEventTypes_1.START_OPEN_TENDER_EXCHANGE_CASH_DRAWER_EVENT, model_1.START_OPEN_CASH_DRAWER_LINE_TYPE],
     ]);
 }
 exports.mapStartTillEventTypeToLineType = mapStartTillEventTypeToLineType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "This component library provides the common components to handle the coordination of processing the business events from the UI.",
   "private": false,
   "license": "SEE LICENSE IN LICENSE.md",