Add establishment points

leonardoespinosa · leonardoespinosa · commit f01576552c73 · 2018-03-25T00:44:37.000-05:00
diff --git a/i4t_web/both/models/points/establishment-point.model.ts b/i4t_web/both/models/points/establishment-point.model.ts
@@ -4,8 +4,16 @@ import { CollectionObject } from '../collection-object.model';
  * EstablishmentPoints model
  */
 export interface EstablishmentPoint extends CollectionObject {
-    establishments_ids: string[];
+    establishments_ids: EstablishmentPointDistribution[];
     current_points: number;
     negative_balance: boolean;
     negative_advice_counter: number;
+}
+
+/**
+ * Establishment Point Distribution Model
+ */
+export interface EstablishmentPointDistribution {
+    establishment_id: string;
+    points: number;
 }
diff --git a/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.html b/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.html
@@ -54,6 +54,7 @@
                     </ul>
                     <p *ngIf="!establishment.isActive" class="establishment-inactive">{{'RESTAURANT.RESTAURANT_INACTIVE' | translate}}</p>
                     <p *ngIf="establishment.isActive" class="establishment-active">{{'RESTAURANT.RESTAURANT_ACTIVE' | translate}}</p>
+                    <p class="points">{{getEstablishmentPoints(establishment._id)}} {{'RESTAURANT.AVAILABLE_POINTS' | translate}}</p>
                 </mat-card-content>
             </mat-card>
         </div>
diff --git a/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.scss b/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.scss
@@ -25,4 +25,10 @@
     text-align: center;
     color: green;
     font-weight: 600;
+}
+
+.points{
+    text-align: center;
+    font-weight: 600;
+    color: #ef5350;
 }
diff --git a/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.ts b/i4t_web/client/imports/app/web/administrator/administration/establishment/establishment/establishment.component.ts
@@ -15,6 +15,8 @@ import { City } from '../../../../../../../../both/models/general/city.model';
 import { Cities } from '../../../../../../../../both/collections/general/city.collection';
 import { UserDetails } from '../../../../../../../../both/collections/auth/user-detail.collection';
 import { UserDetail } from '../../../../../../../../both/models/auth/user-detail.model';
+import { EstablishmentPoint } from '../../../../../../../../both/models/points/establishment-point.model';
+import { EstablishmentPoints } from '../../../../../../../../both/collections/points/establishment-points.collection';
 
 @Component({
     selector: 'establishment',
@@ -31,6 +33,7 @@ export class EstablishmentComponent implements OnInit, OnDestroy {
     private countriesSub: Subscription;
     private citiesSub: Subscription;
     private _usersDetailsSub: Subscription;
+    private _establishmentPointsSub: Subscription;
     private _ngUnsubscribe: Subject<void> = new Subject<void>();
 
     public _dialogRef: MatDialogRef<any>;
@@ -78,6 +81,7 @@ export class EstablishmentComponent implements OnInit, OnDestroy {
 
                     });
                 });
+                this._establishmentPointsSub = MeteorObservable.subscribe('getEstablishmentPointsByIds', _establishmentIds).takeUntil(this._ngUnsubscribe).subscribe();
             });
         });
         this.countriesSub = MeteorObservable.subscribe('countries').takeUntil(this._ngUnsubscribe).subscribe();
@@ -153,6 +157,19 @@ export class EstablishmentComponent implements OnInit, OnDestroy {
         }
     }
 
+    /**
+   * Get Establishment Points
+   * @param {string} _pEstablishmentId 
+   */
+    getEstablishmentPoints(_pEstablishmentId: string): number {
+        let _establishmentPoint: EstablishmentPoint = EstablishmentPoints.findOne({ 'establishments_ids.establishment_id': _pEstablishmentId });
+        if (_establishmentPoint) {
+            return _establishmentPoint.establishments_ids.find(est => est.establishment_id === _pEstablishmentId).points;
+        } else {
+            return 0;
+        }
+    }
+
     /**
      * ngOnDestroy implementation
      */
diff --git a/i4t_web/client/imports/app/web/administrator/administration/establishment/register/establishment-register.component.ts b/i4t_web/client/imports/app/web/administrator/administration/establishment/register/establishment-register.component.ts
@@ -33,7 +33,7 @@ import { PointValidity } from '../../../../../../../../both/models/general/point
 import { PointsValidity } from '../../../../../../../../both/collections/general/point-validity.collection';
 import { Parameter } from '../../../../../../../../both/models/general/parameter.model';
 import { Parameters } from '../../../../../../../../both/collections/general/parameter.collection';
-import { EstablishmentPoint } from '../../../../../../../../both/models/points/establishment-point.model';
+import { EstablishmentPoint, EstablishmentPointDistribution } from '../../../../../../../../both/models/points/establishment-point.model';
 import { EstablishmentPoints } from '../../../../../../../../both/collections/points/establishment-points.collection';
 import { BagPlan } from '../../../../../../../../both/models/points/bag-plan.model';
 import { BagPlans } from '../../../../../../../../both/collections/points/bag-plans.collection';
@@ -344,16 +344,16 @@ export class EstablishmentRegisterComponent implements OnInit, OnDestroy {
                 }
                 //Insert establishment points
                 let _lBagPlan: BagPlan = BagPlans.findOne({ _id: "100" });
-                if (_lBagPlan) {
-                    _lNewEstablishmentPoint = EstablishmentPoints.collection.insert({
-                        establishments_ids: [_lNewEstablishment],
-                        current_points: _lBagPlan.value_points,
-                        negative_balance: false,
-                        negative_advice_counter: 0,
-                        creation_user: this._user,
-                        creation_date: new Date()
-                    });
-                }
+
+                let _pointDistribution: EstablishmentPointDistribution = { establishment_id: _lNewEstablishment, points: _lBagPlan.value_points };
+                _lNewEstablishmentPoint = EstablishmentPoints.collection.insert({
+                    establishments_ids: [_pointDistribution],
+                    current_points: _lBagPlan.value_points,
+                    negative_balance: false,
+                    negative_advice_counter: 0,
+                    creation_user: this._user,
+                    creation_date: new Date()
+                });
 
                 let pricePoints: PricePoints = {
                     country_id: _lBagPlan.price.country_id,
diff --git a/i4t_web/client/imports/app/web/administrator/dashboard/dashboard.component.html b/i4t_web/client/imports/app/web/administrator/dashboard/dashboard.component.html
@@ -2,7 +2,7 @@
     <mat-card-header>
         <img mat-card-avatar *ngIf="establishment.image" src="{{establishment.image.url }}">
         <img mat-card-avatar *ngIf="!establishment.image" src="/images/default-restaurant.png">
-        <mat-card-title>{{establishment.name}}</mat-card-title>
+        <mat-card-title>{{establishment.name}} - {{getEstablishmentPoints(establishment._id)}} {{'ADMIN_DASHBOARD.AVAILABLE_POINTS' | translate}}</mat-card-title>
         <mat-card-subtitle>{{establishment.address}}</mat-card-subtitle>
     </mat-card-header>
 
diff --git a/i4t_web/client/imports/app/web/administrator/dashboard/dashboard.component.ts b/i4t_web/client/imports/app/web/administrator/dashboard/dashboard.component.ts
@@ -122,6 +122,19 @@ export class DashboardComponent implements OnInit, OnDestroy {
     return Tables.collection.find({ establishment_id: _pEstablishmentId, status: 'BUSY' }).count();
   }
 
+  /**
+   * Get Establishment Points
+   * @param {string} _pEstablishmentId 
+   */
+  getEstablishmentPoints(_pEstablishmentId: string): number {
+    let _establishmentPoint: EstablishmentPoint = EstablishmentPoints.findOne({ 'establishments_ids.establishment_id': _pEstablishmentId });
+    if (_establishmentPoint) {
+      return _establishmentPoint.establishments_ids.find(est => est.establishment_id === _pEstablishmentId).points;
+    } else {
+      return 0;
+    }
+  }
+
   /**
    * Get available items
    * @param {string} _pEstablishmentId 
diff --git a/i4t_web/client/imports/app/web/administrator/menu/items/creation/item-creation.component.html b/i4t_web/client/imports/app/web/administrator/menu/items/creation/item-creation.component.html
@@ -86,7 +86,7 @@ <h3 *ngIf="_showEstablishments">{{'ITEMS.RESTAURANTS_MSG' | translate}}</h3>
                         <p *ngIf="!_showCurrencies">{{'ITEMS.NO_RESTAURANTS_SELECTED' | translate}}</p>
                         <p *ngIf="_showCurrencies">{{'ITEMS.ENTER_PRICE' | translate}}</p>
                         <p *ngIf="_showTaxes">{{'ITEMS.ENTER_TAX' | translate}}</p>
-                        <span *ngFor="let currency of _currencies | async">
+                        <div *ngFor="let currency of _currencies | async">
                             <div *ngIf="_showCurrencies" formGroupName="currencies" class="currencies">
                                 <div *ngFor="let cur of _establishmentCurrencies">
                                     <mat-form-field *ngIf="currency._id === cur" class="currency">
@@ -105,7 +105,7 @@ <h3 *ngIf="_showEstablishments">{{'ITEMS.RESTAURANTS_MSG' | translate}}</h3>
                                     </mat-form-field>
                                 </div>
                             </div>
-                        </span>
+                        </div>
                     </div>
                     <p *ngIf="_showGeneralError" style="color:red">{{'ITEMS.RESTAURANTS_ITEMS_ERROR' | translate}}</p>
                 </mat-card-content>
diff --git a/i4t_web/client/imports/app/web/administrator/menu/items/creation/item-creation.component.ts b/i4t_web/client/imports/app/web/administrator/menu/items/creation/item-creation.component.ts
@@ -142,6 +142,7 @@ export class ItemCreationComponent implements OnInit, OnDestroy {
     ngOnInit() {
         this.removeSubscriptions();
         let _establishmentsId: string[] = [];
+        let _currenciesIds: string[] = [];
         let _optionIds: string[] = [];
 
         this._sectionsFormGroup = new FormGroup({
@@ -181,11 +182,12 @@ export class ItemCreationComponent implements OnInit, OnDestroy {
             this._ngZone.run(() => {
                 Establishments.collection.find({}).fetch().forEach((res) => {
                     _establishmentsId.push(res._id);
+                    _currenciesIds.push(res.currencyId);
                 });
                 this._countriesSub = MeteorObservable.subscribe('getCountriesByEstablishmentsId', _establishmentsId).takeUntil(this._ngUnsubscribe).subscribe();
                 this._currenciesSub = MeteorObservable.subscribe('getCurrenciesByEstablishmentsId', _establishmentsId).takeUntil(this._ngUnsubscribe).subscribe(() => {
                     this._ngZone.run(() => {
-                        this._currencies = Currencies.find({}).zone();
+                        this._currencies = Currencies.find({ _id: { $in: _currenciesIds } }).zone();
                     });
                 });
                 this._optionSub = MeteorObservable.subscribe('optionsByEstablishment', _establishmentsId).takeUntil(this._ngUnsubscribe).subscribe(() => {
diff --git a/i4t_web/client/imports/app/web/administrator/menu/items/edition/item-edition.component.html b/i4t_web/client/imports/app/web/administrator/menu/items/edition/item-edition.component.html
@@ -92,7 +92,7 @@ <h3 *ngIf="_showEstablishments">{{'ITEMS.RESTAURANTS_MSG' | translate}}</h3>
                     <p *ngIf="!_showCurrencies">{{'ITEMS.NO_RESTAURANTS_SELECTED' | translate}}</p>
                     <p *ngIf="_showCurrencies">{{'ITEMS.ENTER_PRICE' | translate}}</p>
                     <p *ngIf="_showTaxes">{{'ITEMS.ENTER_TAX' | translate}}</p>
-                    <span *ngFor="let currency of _currencies | async">
+                    <div *ngFor="let currency of _currencies | async">
                         <div *ngIf="_showCurrencies" formGroupName="editCurrencies" class="currencies">
                             <div *ngFor="let cur of _establishmentCurrencies">
                                 <mat-form-field *ngIf="currency._id === cur" class="currency">
@@ -111,7 +111,7 @@ <h3 *ngIf="_showEstablishments">{{'ITEMS.RESTAURANTS_MSG' | translate}}</h3>
                                 </mat-form-field>
                             </div>
                         </div>
-                    </span>
+                    </div>
                 </div>
                 <p *ngIf="_showGeneralError" style="color:red">{{'ITEMS.RESTAURANTS_ITEMS_ERROR' | translate}}</p>
             </mat-card>
diff --git a/i4t_web/public/i18n/en.json b/i4t_web/public/i18n/en.json
@@ -574,7 +574,8 @@
         "FACEBOOK_LINK": "Link to your page on Facebook",
         "RESTAURANT_INACTIVE": "Inactive Restaurant",
         "RESTAURANT_ACTIVE": "Active Restaurant",
-        "WAITERS_ERROR": "There are restaurants that don't have waiters/waitress. please check the collaborators option"
+        "WAITERS_ERROR": "There are restaurants that don't have waiters/waitress. please check the collaborators option",
+        "AVAILABLE_POINTS": "Available Points"
     },
     "TABLES": {
         "TABLES_CREATION": "Create tables",
@@ -1402,7 +1403,8 @@
         "MESSAGE": "Register one to enable this option",
         "REWARDS": "Rewards redeemed today",
         "ITEMS_HISTORY": "Items ordered historically",
-        "REWARDS_HISTORY": "Rewards redeemed historically"
+        "REWARDS_HISTORY": "Rewards redeemed historically",
+        "AVAILABLE_POINTS": "Available Points"
     },
     "ITEM_UNIT_CHART": {
         "TODAY": "Today",
diff --git a/i4t_web/public/i18n/es.json b/i4t_web/public/i18n/es.json
@@ -574,7 +574,8 @@
         "FACEBOOK_LINK": "Link de tu página en Facebook",
         "RESTAURANT_INACTIVE": "Restaurante inactivo",
         "RESTAURANT_ACTIVE": "Restaurante activo",
-        "WAITERS_ERROR": "Hay restaurantes que no cuentan con meseros. Por favor verifica en la opción de colaboradores"
+        "WAITERS_ERROR": "Hay restaurantes que no cuentan con meseros. Por favor verifica en la opción de colaboradores",
+        "AVAILABLE_POINTS": "Puntos Disponibles"
     },
     "TABLES": {
         "TABLES_CREATION": "Creación de mesas",
@@ -1402,7 +1403,8 @@
         "MESSAGE": "Regístra uno para habilitar esta opción",
         "REWARDS": "Recompensas redimidas hoy",
         "ITEMS_HISTORY": "Items ordenados históricamente",
-        "REWARDS_HISTORY": "Recompensas redimidas históricamente"
+        "REWARDS_HISTORY": "Recompensas redimidas históricamente",
+        "AVAILABLE_POINTS": "Puntos Disponibles"
     },
     "ITEM_UNIT_CHART": {
         "TODAY": "Hoy",
diff --git a/i4t_web/server/imports/fixtures/auth/menus.ts b/i4t_web/server/imports/fixtures/auth/menus.ts
@@ -170,7 +170,7 @@ export function loadMenus() {
                 is_active: true,
                 name: "MENUS.ADMINISTRATION.ORDERS_TODAY",
                 url: "/app/orders-today",
-                icon_name: "list",
+                icon_name: "assignment",
                 order: 1300
             },
             {
@@ -337,7 +337,7 @@ export function loadMenus() {
                 is_active: true,
                 name: "MENUS.ADMINISTRATION.ORDERS_TODAY",
                 url: "/app/cashier-orders-today",
-                icon_name: "list",
+                icon_name: "assignment",
                 order: 13000
             }
         ];
diff --git a/i4t_web/server/imports/publications/points/establishment_points.ts b/i4t_web/server/imports/publications/points/establishment_points.ts
@@ -7,5 +7,5 @@ import { EstablishmentPoints } from '../../../../both/collections/points/establi
  * @param {string[]} _pIds
  */
 Meteor.publish('getEstablishmentPointsByIds', function (_pIds: string[]) {
-    return EstablishmentPoints.find({ establishments_ids: { $in: _pIds } });
+    return EstablishmentPoints.find({ 'establishments_ids.establishment_id': { $in: _pIds } });
 });
diff --git a/i4t_web/server/main.ts b/i4t_web/server/main.ts
@@ -38,6 +38,7 @@ import './imports/publications/establishment/reward';
 import './imports/publications/establishment/reward-point';
 import './imports/publications/establishment/order-history';
 import './imports/publications/points/bag_plans'
+import './imports/publications/points/establishment_points'
 
 import '../both/methods/menu/item.methods';
 import '../both/methods/auth/collaborators.methods';
