npm - @infrab4a/connect-angular - Versions diffs - 3.4.0-beta.7 → 3.4.0-beta.8 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/bundles/infrab4a-connect-angular.umd.js +17 -6
package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
package/esm2015/services/shipping.service.js +18 -7
package/fesm2015/infrab4a-connect-angular.js +17 -6
package/fesm2015/infrab4a-connect-angular.js.map +1 -1
package/package.json +1 -1

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

@@ -1239,24 +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;
                 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;