@infrab4a/connect-angular 3.4.0-beta.6 → 3.4.0-beta.8

package/bundles/infrab4a-connect-angular.umd.js

@@ -1228,7 +1228,7 @@
             this.apiUrl = apiUrl;
             this.homeService = homeService;
         }
-        ShippingService.prototype.getMensShippingMethods = function (shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
+        ShippingService.prototype.getShippingMethods = function (shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
             var _this = this;
             return rxjs.combineLatest([
                 this.homeService.getHomeData(),
@@ -1239,27 +1239,35 @@
                 var shippingMethods = shippingMethodsResponse.result;
                 if (!shippingMethods.length)
                     return [];
+                shippingMethods = shippingMethods.map(function (s) {
+                    if (s.ShippingCompanyName == 'Same Day EG')
+                        s.ShippingCompanyName = 'Same Day';
+                    else
+                        return s;
+                });
                 var datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
-                console.log('params que checgou', shop, zip, weightGrams, totalPrice, personId, subscriptionPlan);
-                console.log('shippingMethods', shippingMethods);
-                console.log('datas isHolidays', _this.isHolidays(datasSameDayNotAvaliable));
                 if (_this.isHolidays(datasSameDayNotAvaliable)) {
                     shippingMethods = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
                 }
-                if (totalPrice >= 200 || _this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                    return shippingMethods.map(function (s) {
+                if (totalPrice >= 200) {
+                    shippingMethods = shippingMethods.map(function (s) {
                         if (s.serviceName !== 'Same Day')
                             return Object.assign(Object.assign({}, s), { totalPrice: 0 });
                         else
                             return s;
                     });
                 }
-                if (_this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
-                    return shippingMethods.map(function (s) {
-                        if (s.serviceName !== 'Same Day')
+                if (_this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                    shippingMethods = shippingMethods.map(function (s) {
+                        if (s.serviceName == 'Same Day')
                             return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
                         else
-                            return s;
+                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
+                    });
+                }
+                if (_this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
+                    shippingMethods = shippingMethods.map(function (s) {
+                        return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
                     });
                 }
                 return shippingMethods;