@infrab4a/connect-angular 5.0.0-beta.56 → 5.0.0-beta.58

package/fesm2022/infrab4a-connect-angular.mjs

@@ -5,7 +5,7 @@ import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
 import * as i1$2 from '@infrab4a/connect';
-import { ProductsIndex, AxiosAdapter, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ConnectFirestoreService, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, SubscriptionMaterializationFirestoreRepository, SubscriptionSummaryFirestoreRepository, ProductVariantFirestoreRepository, OrderBlockedFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, PersonTypes, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } from '@infrab4a/connect';
+import { ProductsIndex, AxiosAdapter, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ConnectFirestoreService, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, SubscriptionMaterializationFirestoreRepository, SubscriptionSummaryFirestoreRepository, ProductVariantFirestoreRepository, OrderBlockedFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, OrderStatus, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, PersonTypes, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } from '@infrab4a/connect';
 import * as i1 from '@angular/fire/auth';
 import { Auth, provideAuth, getAuth, getIdToken, authState } from '@angular/fire/auth';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
@@ -1048,11 +1048,11 @@ class CouponService {
                 throw 'Limite de uso atingido';
         }
         if (!couponUseLimits.unlimited || couponUseLimits.limitedPerUser) {
-            const orders = await this.getOrdersWithCoupon(coupon);
-            if (!couponUseLimits.unlimited && couponUseLimits.total && orders.length >= couponUseLimits.total)
+            const ordersCoupon = await this.getOrdersWithCoupon(coupon);
+            if (!couponUseLimits.unlimited && couponUseLimits.total && ordersCoupon.length >= couponUseLimits.total)
                 throw 'Limite de uso atingido.';
             if (couponUseLimits.limitedPerUser) {
-                const ordersWithUser = this.countOrdersWithUser(orders, checkout.user.email);
+                const ordersWithUser = this.countOrdersWithUser(ordersCoupon, checkout.user.email);
                 if (ordersWithUser > 0)
                     throw 'Limite de uso por usuário atingido.';
             }
@@ -1178,7 +1178,7 @@ class CouponService {
             .find({
             filters: {
                 coupon: { id: coupon.id },
-                payment: { status: 'paid' },
+                status: { operator: Where.NOTEQUALS, value: OrderStatus.CANCELADO },
             },
         })
             .then((result) => result.data);
@@ -1188,7 +1188,7 @@ class CouponService {
             .find({
             filters: {
                 user: { email: { operator: Where.EQUALS, value: email } },
-                payment: { status: 'paid' },
+                status: { operator: Where.NOTEQUALS, value: OrderStatus.CANCELADO },
             },
         })
             .then((result) => result.data);
@@ -1199,7 +1199,12 @@ class CouponService {
     getCouponUseLimits(coupon, checkoutType, user) {
         let couponUseLimits;
         if (checkoutType == CheckoutTypes.ECOMMERCE || checkoutType == CheckoutTypes.ALL) {
-            couponUseLimits = user && user.isSubscriber ? coupon.useLimits.subscriber : coupon.useLimits.non_subscriber;
+            if (coupon.exclusivityType.length === 1 &&
+                (coupon.exclusivityType.at(0) === Exclusivities.SPECIFIC_USER ||
+                    coupon.exclusivityType.at(0) === Exclusivities.COLLABORATORS))
+                couponUseLimits = coupon.useLimits.non_subscriber;
+            else
+                couponUseLimits = user && user.isSubscriber ? coupon.useLimits.subscriber : coupon.useLimits.non_subscriber;
         }
         else {
             couponUseLimits = coupon.useLimits.subscription;
@@ -1327,6 +1332,7 @@ class CartService {
             if (index > -1) {
                 checkoutLoaded.lineItems[index].quantity += quantity;
                 checkoutLoaded.lineItems[index].pricePaid = lineItem.pricePaid;
+                checkoutLoaded.lineItems[index].price = lineItem.price;
             }
             else
                 checkoutLoaded.lineItems = items.concat(checkoutLoaded.lineItems ? checkoutLoaded.lineItems.concat([lineItem]) : [lineItem]);
@@ -1347,14 +1353,15 @@ class CartService {
             if (this.checkMaxStock(product.stock.quantity, item.quantity || 0, quantity || 0))
                 throw new Error('Desculpe! Temos apenas ' + product.stock?.quantity + ' em estoque.');
             const image = item.image || item.images?.shift();
-            const { id, name, EAN, slug, stock, price, weight, sku, type } = item;
+            const { id, name, EAN, slug, weight, sku, type } = item;
             const isGift = item.isGift || null;
             const pricePaid = this.getProductPrice({
-                product: item,
+                product: LineItem.toInstance(product),
                 shop: checkout.shop || this.defaultShop,
                 isSubscriber: checkout.user?.isSubscriber,
             });
             RoundProductPricesHelper.roundProductPrices(item);
+            RoundProductPricesHelper.roundProductPrices(product);
             return {
                 checkout,
                 lineItem: LineItem.toInstance({
@@ -1364,8 +1371,8 @@ class CartService {
                     brand: product.brand,
                     slug: slug ?? product.slug,
                     sku: sku ?? product.sku,
-                    stock,
-                    price: this.roundPrice(price),
+                    stock: product.stock,
+                    price: this.roundPrice(product.price),
                     image,
                     weight: weight ?? product.weight,
                     quantity: (item.quantity || 0) + (quantity || 0),
@@ -1780,15 +1787,20 @@ class CatalogService {
                 id: { operator: Where.IN, value: mostRelevantProductsIds },
                 ...this.buildFilterQuery(options?.filters || {}),
             },
-            orderBy: this.buildSortQuery('news'),
+            orderBy: this.buildSortQuery('best-sellers'),
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
                 distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
-        const firstProducts = totalResult.data.filter((product) => mostRelevants.includes(product.id));
-        const lastProducts = totalResult.data.filter((product) => !mostRelevants.includes(product.id));
+        const mostRelevantWithouyStock = totalResult.data.filter((product) => mostRelevants.includes(product.id) && product.stock.quantity <= 0);
+        const firstProducts = totalResult.data
+            .filter((product) => mostRelevants.includes(product.id) && product.stock.quantity > 0)
+            .sort((a, b) => mostRelevants.indexOf(a.id) - mostRelevants.indexOf(b.id));
+        const lastProducts = totalResult.data
+            .filter((product) => !mostRelevants.includes(product.id))
+            .concat(mostRelevantWithouyStock);
         const categoryMostRelevants = firstProducts.concat(lastProducts);
         const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
         return {