@etsoo/appscript 1.4.64 → 1.4.66

package/lib/cjs/business/ShoppingCart.d.ts

@@ -138,13 +138,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @returns Result
      */
     static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner(): ShoppingCartOwner | undefined;
-    set owner(value: ShoppingCartOwner | undefined);
+    owner?: ShoppingCartOwner;
     _currency: Currency;
     /**
      * ISO currency id
@@ -251,6 +249,7 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Data storage
      */
     constructor(key: string, state: ShoppingCartData<T>, storage?: IStorage);
+    private getCartData;
     private setCartData;
     private doChange;
     /**

package/lib/cjs/business/ShoppingCart.js

@@ -50,24 +50,6 @@ class ShoppingCart {
             console.log('ShoppingCart constructor', error);
         }
     }
-    /**
-     * Owner data
-     * 所有者信息
-     */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        var _a;
-        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
-            return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData(this.storage, this.identifier);
-            if (data)
-                this.setCartData(data);
-        }
-    }
     /**
      * ISO currency id
      * 标准货币编号
@@ -176,7 +158,6 @@ class ShoppingCart {
      * @param storage Data storage
      */
     constructor(key, currencyOrState, storage = new shared_1.WindowStorage()) {
-        var _a;
         this.storage = storage;
         this._items = [];
         this._promotions = [];
@@ -187,9 +168,7 @@ class ShoppingCart {
         this.prices = {};
         this.key = key;
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
-            this.setCartData((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+            this.reset(currencyOrState[0], currencyOrState[1]);
         }
         else {
             this.setCartData(currencyOrState);
@@ -197,6 +176,10 @@ class ShoppingCart {
             this.changeCulture(currencyOrState.culture);
         }
     }
+    getCartData() {
+        var _a;
+        return ((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+    }
     setCartData(state) {
         const { owner, items = [], promotions = [], formData, cache } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
@@ -258,6 +241,7 @@ class ShoppingCart {
         this.items.length = 0;
         this.promotions.length = 0;
         this.prices = {};
+        this.cache = undefined;
         if (keepOwner) {
             this.save();
         }
@@ -309,9 +293,9 @@ class ShoppingCart {
      * @param culture New culture
      */
     reset(currency, culture) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
     /**
      * Remove item from the index

package/lib/mjs/business/ShoppingCart.d.ts

@@ -138,13 +138,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @returns Result
      */
     static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner(): ShoppingCartOwner | undefined;
-    set owner(value: ShoppingCartOwner | undefined);
+    owner?: ShoppingCartOwner;
     _currency: Currency;
     /**
      * ISO currency id
@@ -251,6 +249,7 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Data storage
      */
     constructor(key: string, state: ShoppingCartData<T>, storage?: IStorage);
+    private getCartData;
     private setCartData;
     private doChange;
     /**

package/lib/mjs/business/ShoppingCart.js

@@ -47,24 +47,6 @@ export class ShoppingCart {
             console.log('ShoppingCart constructor', error);
         }
     }
-    /**
-     * Owner data
-     * 所有者信息
-     */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        var _a;
-        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
-            return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData(this.storage, this.identifier);
-            if (data)
-                this.setCartData(data);
-        }
-    }
     /**
      * ISO currency id
      * 标准货币编号
@@ -173,7 +155,6 @@ export class ShoppingCart {
      * @param storage Data storage
      */
     constructor(key, currencyOrState, storage = new WindowStorage()) {
-        var _a;
         this.storage = storage;
         this._items = [];
         this._promotions = [];
@@ -184,9 +165,7 @@ export class ShoppingCart {
         this.prices = {};
         this.key = key;
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
-            this.setCartData((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+            this.reset(currencyOrState[0], currencyOrState[1]);
         }
         else {
             this.setCartData(currencyOrState);
@@ -194,6 +173,10 @@ export class ShoppingCart {
             this.changeCulture(currencyOrState.culture);
         }
     }
+    getCartData() {
+        var _a;
+        return ((_a = this.storage.getPersistedObject(this.identifier)) !== null && _a !== void 0 ? _a : this.storage.getObject(this.identifier));
+    }
     setCartData(state) {
         const { owner, items = [], promotions = [], formData, cache } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
@@ -255,6 +238,7 @@ export class ShoppingCart {
         this.items.length = 0;
         this.promotions.length = 0;
         this.prices = {};
+        this.cache = undefined;
         if (keepOwner) {
             this.save();
         }
@@ -306,9 +290,9 @@ export class ShoppingCart {
      * @param culture New culture
      */
     reset(currency, culture) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
     /**
      * Remove item from the index

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.64",
+    "version": "1.4.66",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/business/ShoppingCart.ts

@@ -185,25 +185,11 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         }
     }
 
-    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    get owner() {
-        return this._owner;
-    }
-    set owner(value) {
-        if (this._owner?.id === value?.id) return;
-        this._owner = value;
-        if (value) {
-            const data = ShoppingCart.getCartData<T>(
-                this.storage,
-                this.identifier
-            );
-            if (data) this.setCartData(data);
-        }
-    }
+    owner?: ShoppingCartOwner;
 
     _currency!: Currency;
 
@@ -390,19 +376,19 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         this.key = key;
 
         if (Array.isArray(currencyOrState)) {
-            this.changeCurrency(currencyOrState[0]);
-            this.changeCulture(currencyOrState[1]);
-
-            this.setCartData(
-                this.storage.getPersistedObject(this.identifier) ??
-                    this.storage.getObject(this.identifier)
-            );
+            this.reset(currencyOrState[0], currencyOrState[1]);
         } else {
             this.setCartData(currencyOrState);
             this.changeCurrency(currencyOrState.currency);
             this.changeCulture(currencyOrState.culture);
         }
     }
+    private getCartData(): ShoppingCartData<T> | undefined {
+        return (
+            this.storage.getPersistedObject(this.identifier) ??
+            this.storage.getObject(this.identifier)
+        );
+    }
 
     private setCartData(state: ShoppingCartData<T> | undefined) {
         const {
@@ -477,6 +463,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         this.items.length = 0;
         this.promotions.length = 0;
         this.prices = <Record<T['id'], number>>{};
+        this.cache = undefined;
 
         if (keepOwner) {
             this.save();
@@ -533,9 +520,9 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * @param culture New culture
      */
     reset(currency: Currency, culture: string) {
-        this.clear(true);
         this.changeCurrency(currency);
         this.changeCulture(culture);
+        this.setCartData(this.getCartData());
     }
 
     /**