@infrab4a/connect-angular 4.4.2-beta.2 → 4.4.3-beta.0

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1054,33 +1054,32 @@ class CouponService {
         return of(discount);
     }
     async calcDiscountShopping(coupon, checkout) {
-        let discountInfo = null;
+        let discount = 0;
         if (checkout.user.isSubscriber && coupon.discount.subscriber.value) {
-            discountInfo = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
+            discount = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
         }
         else {
-            discountInfo = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
+            discount = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
         }
-        return { discount: discountInfo.discount, lineItems: discountInfo.lineItems };
+        return discount;
     }
     async calcDiscountByType(type, value, categories, checkout) {
         let discount = 0;
-        let lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
-        const subTotal = this.calcCheckoutSubtotal(lineItensElegibleForDiscount, checkout.user);
+        let lineItensDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
+        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user, checkout.shop);
         if (type == CouponTypes.ABSOLUTE) {
             discount = value > subTotal ? subTotal : value;
         }
         else {
             discount = subTotal * (value / 100);
         }
-        const lineItems = this.calcLineItenDiscount(type, lineItensElegibleForDiscount, value, subTotal);
-        return { discount, lineItems };
+        return discount;
     }
     async hasMinSubTotal(coupon, checkout) {
         if (!coupon.minSubTotalValue)
             return true;
         let lineItensDiscount = await this.getLineItensEligebleForDiscount(coupon.productsCategories, checkout);
-        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user);
+        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user, checkout.shop);
         if (coupon.minSubTotalValue <= subTotal)
             return true;
         return false;
@@ -1148,7 +1147,7 @@ class CouponService {
         }
         return lineItensDiscount;
     }
-    calcCheckoutSubtotal(lineItens, user) {
+    calcCheckoutSubtotal(lineItens, user, shop) {
         return (lineItens?.reduce((acc, curr) => user?.isSubscriber && curr.price.subscriberPrice
             ? acc + curr.price?.subscriberPrice * curr.quantity
             : acc + curr.pricePaid * curr.quantity, 0) || 0);
@@ -1186,32 +1185,6 @@ class CouponService {
         }
         return couponUseLimits;
     }
-    calcLineItenDiscount(type, lineItems, couponDiscount, subTotal) {
-        let lineItemsDiscount = [];
-        if (type === CouponTypes.ABSOLUTE) {
-            const couponDiscountMax = couponDiscount > subTotal ? subTotal : couponDiscount;
-            lineItemsDiscount = lineItems.map((item) => {
-                const totalItemPercentage = item.pricePaid / subTotal;
-                const discountItem = couponDiscountMax * totalItemPercentage;
-                console.log(item.name, item.pricePaid, subTotal, 'absolute', couponDiscountMax, totalItemPercentage, discountItem);
-                return {
-                    ...item,
-                    discount: Number(discountItem.toFixed(2)),
-                };
-            });
-        }
-        else {
-            lineItemsDiscount = lineItems.map((item) => {
-                const discountItem = item.pricePaid * (couponDiscount / 100);
-                console.log(item.name, item.pricePaid, 'percentage', couponDiscount, discountItem);
-                return {
-                    ...item,
-                    discount: Number(discountItem.toFixed(2)),
-                };
-            });
-        }
-        return lineItemsDiscount;
-    }
 }
 CouponService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CouponService, deps: [{ token: 'CouponRepository' }, { token: DEFAULT_SHOP }, { token: 'OrderRepository' }, { token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
 CouponService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CouponService, providedIn: 'root' });
@@ -1352,7 +1325,6 @@ class CartService {
                     weight: weight ?? product.weight,
                     quantity: (item.quantity || 0) + (quantity || 0),
                     pricePaid,
-                    discount: 0,
                     categories: product.categories ?? [],
                     isGift: isGift ?? null,
                     costPrice: product.costPrice ?? 0,
@@ -1891,7 +1863,7 @@ class WishlistService {
     getCategoryService() {
         return this.categoryService;
     }
-    async create({ personId, title, description, userFullName, userPhoto, theme, bannerUrl, }) {
+    async create({ personId, title, description, published, userFullName, userPhoto, theme, bannerUrl, }) {
         const data = {
             slug: '',
             name: title,
@@ -1906,7 +1878,7 @@ class WishlistService {
             personName: userFullName,
             personPhoto: userPhoto,
             brandCategory: false,
-            published: true,
+            published,
             theme,
             bannerUrl,
         };
@@ -1914,11 +1886,12 @@ class WishlistService {
         await this.wishlistRepository.update({ id: newWishlist.id, slug: newWishlist.id });
         return Wishlist.toInstance({ ...newWishlist.toPlain(), slug: newWishlist.id });
     }
-    update({ id, title, description, userFullName, userPhoto, theme, bannerUrl, }) {
+    update({ id, title, description, published, userFullName, userPhoto, theme, bannerUrl, }) {
         const data = {
             id,
             name: title,
             description,
+            published,
             metadata: {
                 title: `${userFullName} - ${title}`,
                 description: `${userFullName} - ${description}`,