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

package/fesm2015/infrab4a-connect-angular.mjs

@@ -1062,29 +1062,28 @@ class CouponService {
     }
     calcDiscountShopping(coupon, checkout) {
         return __awaiter(this, void 0, void 0, function* () {
-            let discountInfo = null;
+            let discount = 0;
             if (checkout.user.isSubscriber && coupon.discount.subscriber.value) {
-                discountInfo = yield this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
+                discount = yield this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
             }
             else {
-                discountInfo = yield this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
+                discount = yield this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
             }
-            return { discount: discountInfo.discount, lineItems: discountInfo.lineItems };
+            return discount;
         });
     }
     calcDiscountByType(type, value, categories, checkout) {
         return __awaiter(this, void 0, void 0, function* () {
             let discount = 0;
-            let lineItensElegibleForDiscount = yield this.getLineItensEligebleForDiscount(categories, checkout);
-            const subTotal = this.calcCheckoutSubtotal(lineItensElegibleForDiscount, checkout.user);
+            let lineItensDiscount = yield 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;
         });
     }
     hasMinSubTotal(coupon, checkout) {
@@ -1092,7 +1091,7 @@ class CouponService {
             if (!coupon.minSubTotalValue)
                 return true;
             let lineItensDiscount = yield 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;
@@ -1171,7 +1170,7 @@ class CouponService {
             return lineItensDiscount;
         });
     }
-    calcCheckoutSubtotal(lineItens, user) {
+    calcCheckoutSubtotal(lineItens, user, shop) {
         return ((lineItens === null || lineItens === void 0 ? void 0 : lineItens.reduce((acc, curr) => {
             var _a;
             return (user === null || user === void 0 ? void 0 : user.isSubscriber) && curr.price.subscriberPrice
@@ -1216,26 +1215,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 Object.assign(Object.assign({}, 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 Object.assign(Object.assign({}, 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' });
@@ -1377,7 +1356,6 @@ class CartService {
                     weight: weight !== null && weight !== void 0 ? weight : product.weight,
                     quantity: (item.quantity || 0) + (quantity || 0),
                     pricePaid,
-                    discount: 0,
                     categories: (_f = product.categories) !== null && _f !== void 0 ? _f : [],
                     isGift: isGift !== null && isGift !== void 0 ? isGift : null,
                     costPrice: (_g = product.costPrice) !== null && _g !== void 0 ? _g : 0,
@@ -1935,7 +1913,7 @@ class WishlistService {
     getCategoryService() {
         return this.categoryService;
     }
-    create({ personId, title, description, userFullName, userPhoto, theme, bannerUrl, }) {
+    create({ personId, title, description, published, userFullName, userPhoto, theme, bannerUrl, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = {
                 slug: '',
@@ -1951,7 +1929,7 @@ class WishlistService {
                 personName: userFullName,
                 personPhoto: userPhoto,
                 brandCategory: false,
-                published: true,
+                published,
                 theme,
                 bannerUrl,
             };
@@ -1960,11 +1938,12 @@ class WishlistService {
             return Wishlist.toInstance(Object.assign(Object.assign({}, 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}`,