changed logic implementation for load currencies correctly

Author: ingleo

i4t_web/client/imports/app/web/administrator/administration/establishment/monthly-config/establishment-list/establishment-list.component.ts

@@ -69,16 +69,25 @@ export class EstablishmentListComponent implements OnInit, OnDestroy {
                 this._establishments = Establishments.find({}).zone();
                 this.countEstablishments();
                 this._establishments.subscribe(() => { this.countEstablishments(); });
+
+                this._currencySub = MeteorObservable.subscribe('getCurrenciesByUserId', Meteor.userId()).takeUntil(this._ngUnsubscribe).subscribe(() => {
+                    this._ngZone.run(() => {
+                        let _currenciesIds: string[] = [];
+                        Establishments.collection.find({ creation_user: Meteor.userId() }).forEach(function <Establishment>(establishment, index, args) {
+                            _currenciesIds.push(establishment.currencyId);
+                        });
+                        this._currencies = Currencies.find({ _id: { $in: _currenciesIds } }).zone();
+                    });
+                });
             });
         });
         this._tableSub = MeteorObservable.subscribe('tables', Meteor.userId()).takeUntil(this._ngUnsubscribe).subscribe(() => {
-            this._tables = this._tables = Tables.find({}).zone();
-        });
-        this._currencySub = MeteorObservable.subscribe('getCurrenciesByUserId').takeUntil(this._ngUnsubscribe).subscribe(() => {
-            this._currencies = Currencies.find({}).zone();
+            this._ngZone.run(() => {
+                this._tables = this._tables = Tables.find({}).zone();
+            });
         });
-        this._countrySub = MeteorObservable.subscribe('countries').takeUntil(this._ngUnsubscribe).subscribe();
 
+        this._countrySub = MeteorObservable.subscribe('countries').takeUntil(this._ngUnsubscribe).subscribe();
         this._paymentHistorySub = MeteorObservable.subscribe('getHistoryPaymentsByUser', Meteor.userId()).takeUntil(this._ngUnsubscribe).subscribe();
     }
 
@@ -93,8 +102,15 @@ export class EstablishmentListComponent implements OnInit, OnDestroy {
      * Remove all subscriptions
      */
     removeSubscription(): void {
+        /**
         this._ngUnsubscribe.next();
         this._ngUnsubscribe.complete();
+         */
+        if (this._establishmentSub) { this._establishmentSub.unsubscribe(); }
+        if (this._tableSub) { this._tableSub.unsubscribe(); }
+        if (this._currencySub) { this._currencySub.unsubscribe(); }
+        if (this._countrySub) { this._countrySub.unsubscribe(); }
+        if (this._paymentHistorySub) { this._paymentHistorySub.unsubscribe(); }
     }
 
     /**

i4t_web/client/imports/app/web/administrator/payment/bags-payment/bags-payment.component.html

@@ -1,4 +1,15 @@
 <mat-card>
-    <mat-card-title>{{'BAGS_PAYMENT.TITLE' | translate }}</mat-card-title>
+    <mat-card-header>
+        <mat-card-title>{{'BAGS_PAYMENT.TITLE' | translate }}</mat-card-title>
+        <mat-card-subtitle>{{'BAGS_PAYMENT.SUBTITLE' | translate}}</mat-card-subtitle>
+    </mat-card-header>
 
+    <mat-card-content style="background: #FFF">
+        
+
+    </mat-card-content>
+
+    <mat-card-actions>
+        <button mat-button>PAGAR</button>
+    </mat-card-actions>
 </mat-card>

i4t_web/client/imports/app/web/administrator/payment/bags-payment/bags-payment.component.ts

@@ -6,7 +6,10 @@ import { MeteorObservable } from 'meteor-rxjs';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, Subscription, Subject } from 'rxjs';
 import { UserLanguageService } from '../../../services/general/user-language.service';
-
+import { Establishment } from '../../../../../../../both/models/establishment/establishment.model';
+import { Establishments } from '../../../../../../../both/collections/establishment/establishment.collection';
+import { Currency } from '../../../../../../../both/models/general/currency.model';
+import { Currencies } from '../../../../../../../both/collections/general/currency.collection';
 
 @Component({
     selector: 'bags-payment',
@@ -16,10 +19,19 @@ import { UserLanguageService } from '../../../services/general/user-language.ser
 
 export class BagsPaymentComponent implements OnInit, OnDestroy {
 
+    private _user = Meteor.userId();
+    private _establishments: Observable<Establishment[]>;
+    private _currencies: Observable<Currency[]>;
+
+    private _establishmentSub: Subscription;
+    private _currencySub: Subscription;
+
+    private _ngUnsubscribe: Subject<void> = new Subject<void>();
+
     /**
      * MonthlyPaymentComponent Constructor
-     * @param {Router} router 
-     * @param {FormBuilder} _formBuilder 
+     * @param {Router} router
+     * @param {NgZone} _ngZone
      * @param {TranslateService} translate 
      * @param {UserLanguageService} _userLanguageService 
      */
@@ -32,6 +44,21 @@ export class BagsPaymentComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit() {
-        
+        this.removeSubscriptions();
+
+        this._establishmentSub = MeteorObservable.subscribe('establishments', this._user).takeUntil(this._ngUnsubscribe).subscribe(() => {
+            this._establishments = Establishments.find({ creation_user: this._user }).zone();
+        });
+
+        this._currencySub = MeteorObservable.subscribe('getCurrenciesByUserId').takeUntil(this._ngUnsubscribe).subscribe(() => {
+            this._currencies = Currencies.find({}).zone();
+        });
+    }
+
+    /**
+     * Remove all subscriptions
+     */
+    removeSubscriptions(): void {
+
     }
 }

i4t_web/public/i18n/en.json

@@ -1840,6 +1840,7 @@
         "LARGE": "A LA CARTÉ"
     },
     "BAGS_PAYMENT": {
-        "TITLE": "Purchase of bags"
+        "TITLE": "Purchase of bags",
+        "SUBTITLE": "Here you can to purchase the bag of points by restaurant that you want"
     }
 }

i4t_web/public/i18n/es.json

@@ -1840,6 +1840,7 @@
         "LARGE": "A LA CARTA"
     },
     "BAGS_PAYMENT": {
-        "TITLE": "Compra de bolsas"
+        "TITLE": "Compra de bolsas",
+        "SUBTITLE": "Aquí puedes comprar la bolsa de puntos por restaurante que desees"
     }
 }

i4t_web/server/imports/publications/general/currency.ts

@@ -23,12 +23,14 @@ Meteor.publish('getCurrenciesByEstablishmentsId', function (_establishmentsId: s
 /**
  * Meteor publication return currencies by  userId
  */
-Meteor.publish('getCurrenciesByUserId', function () {
+Meteor.publish('getCurrenciesByUserId', function (_userId: string) {
     let _currenciesIds: string[] = [];
-    Establishments.collection.find({ creation_user: this.userId }).forEach(function <Establishment>(establishment, index, args) {
+    Establishments.collection.find({ creation_user: _userId }).forEach(function <Establishment>(establishment, index, args) {
         _currenciesIds.push(establishment.currencyId);
     });
 
+    console.log('------------------------------');
+    console.log(_currenciesIds);
     return Currencies.find({ _id: { $in: _currenciesIds } });
 });