@james_jayaraj/test-npm 1.3.8 → 1.4.0

package/fesm2015/james_jayaraj-test-npm.mjs

@@ -6180,7 +6180,7 @@ class RxComponent {
         var physicianDetails = this.commonServices.physicianDetails;
         var body = Object.assign(Object.assign({ userIdString: physicianDetails.userId, productId: this.commonServices.selectedFormulation.productId, productName: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation.productName) ? this.commonServices.selectedFormulation.productName : "", quantity: this.commonServices.quantityVal, repeats: this.commonServices.repeatsVal, restriction: !this.commonServices.isMedicineRestrict ? (this.commonServices.selectedFormulation.Restrictions != null && this.commonServices.selectedFormulation.Restrictions != ""
                 ? this.commonServices.selectedFormulation.pbsType + " (" + this.getRestrictions(this.commonServices.selectedFormulation.Restrictions) + ") "
-                : this.commonServices.selectedFormulation.pbsType) : "", genericName: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation.genericName) ? this.commonServices.selectedFormulation.genericName : "", pbsCode: !this.commonServices.IsNullOrEmpty((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsCode) ? (_b = this.commonServices.selectedFormulation) === null || _b === void 0 ? void 0 : _b.pbsCode : "", active: isAdding, restrictedMedicine: this.commonServices.isMedicineRestrict, dose: this.commonServices.doseSearchValue, frequency: this.commonServices.freqSearchValue, food: this.commonServices.foodSearchValue, instruction: this.commonServices.InstructionSearchValue, route: this.commonServices.routeSearchValue }, (!isAdding && { encryptedId: this.showFavouriteMed ? this.commonServices.favouriteEncryptedId : this.getCurrentFavEncryptedId() })), { productPackId: ((_c = this.commonServices.selectedFormulation) === null || _c === void 0 ? void 0 : _c.productPackId) ? this.commonServices.selectedFormulation.productPackId : '' });
+                : this.commonServices.selectedFormulation.pbsType) : "", genericName: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation.genericName) ? this.commonServices.selectedFormulation.genericName : "", pbsCode: !this.commonServices.IsNullOrEmpty((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsCode) ? (_b = this.commonServices.selectedFormulation) === null || _b === void 0 ? void 0 : _b.pbsCode : "", active: isAdding, restrictedMedicine: this.commonServices.isMedicineRestrict, dose: this.commonServices.doseSearchValue, frequency: this.commonServices.freqSearchValue, food: this.commonServices.foodSearchValue, instruction: this.commonServices.InstructionSearchValue, route: this.commonServices.routeSearchValue }, (!isAdding && { encryptedId: this.getCurrentFavEncryptedId() })), { productPackId: ((_c = this.commonServices.selectedFormulation) === null || _c === void 0 ? void 0 : _c.productPackId) ? this.commonServices.selectedFormulation.productPackId : '' });
         this.apiService.Post(body, config.PHYSICIAN.ADD_FAVOURITE_MEDICINE).subscribe((res) => {
             try {
                 if (this.commonServices.IsNullOrEmpty(res)) {
@@ -6408,7 +6408,7 @@ class RxComponent {
         }
         return favouritesList.some((favMed) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-            return favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
+            return favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() && favMed.productPackId.toString() === this.commonServices.selectedFormulation.productPackId.toString() &&
                 (!this.commonServices.IsNullOrEmpty(favMed.pbsCode) ? favMed.pbsCode : "") === (!this.commonServices.IsNullOrEmpty((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsCode) ? this.commonServices.selectedFormulation.pbsCode : "") &&
                 favMed.productName === this.commonServices.selectedFormulation.productName && ((_b = favMed.quantity) === null || _b === void 0 ? void 0 : _b.toString()) === ((_c = this.commonServices.quantityVal) === null || _c === void 0 ? void 0 : _c.toString()) && ((_d = favMed.repeats) === null || _d === void 0 ? void 0 : _d.toString()) === ((_e = this.commonServices.repeatsVal) === null || _e === void 0 ? void 0 : _e.toString()) &&
                 ((_f = favMed.dose) === null || _f === void 0 ? void 0 : _f.toString()) === ((_g = this.commonServices.doseSearchValue) === null || _g === void 0 ? void 0 : _g.toString()) && ((_h = favMed.frequency) === null || _h === void 0 ? void 0 : _h.toString()) === ((_j = this.commonServices.freqSearchValue) === null || _j === void 0 ? void 0 : _j.toString()) && ((_k = favMed.food) === null || _k === void 0 ? void 0 : _k.toString()) === ((_l = this.commonServices.foodSearchValue) === null || _l === void 0 ? void 0 : _l.toString()) &&
@@ -6452,10 +6452,10 @@ class RxComponent {
     }
     getCurrentFavEncryptedId() {
         var _a;
-        let favouritesList = this.showFavouriteMed ? this.commonServices.favouriteMedicineList : this.commonServices.originalFavouriteMedicineList;
+        let favouritesList = this.commonServices.originalFavouriteMedicineList;
         return ((_a = favouritesList.find((favMed) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-            return favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
+            return favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() && favMed.productPackId.toString() === this.commonServices.selectedFormulation.productPackId.toString() &&
                 (!this.commonServices.IsNullOrEmpty(favMed.pbsCode) ? favMed.pbsCode : "") === (!this.commonServices.IsNullOrEmpty((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsCode) ? this.commonServices.selectedFormulation.pbsCode : "") &&
                 favMed.productName === this.commonServices.selectedFormulation.productName && ((_b = favMed.quantity) === null || _b === void 0 ? void 0 : _b.toString()) === ((_c = this.commonServices.quantityVal) === null || _c === void 0 ? void 0 : _c.toString()) && ((_d = favMed.repeats) === null || _d === void 0 ? void 0 : _d.toString()) === ((_e = this.commonServices.repeatsVal) === null || _e === void 0 ? void 0 : _e.toString()) &&
                 ((_f = favMed.dose) === null || _f === void 0 ? void 0 : _f.toString()) === ((_g = this.commonServices.doseSearchValue) === null || _g === void 0 ? void 0 : _g.toString()) && ((_h = favMed.frequency) === null || _h === void 0 ? void 0 : _h.toString()) === ((_j = this.commonServices.freqSearchValue) === null || _j === void 0 ? void 0 : _j.toString()) && ((_k = favMed.food) === null || _k === void 0 ? void 0 : _k.toString()) === ((_l = this.commonServices.foodSearchValue) === null || _l === void 0 ? void 0 : _l.toString()) &&