Merge pull request #10198 from msalcala11/uk-gift-cards

UK Gift Cards

Author: cmgustavo

src/assets/img/gift-cards/gift-cards-gbp.png

@@ -6,6 +6,7 @@ import { BuyCardPage } from '../buy-card/buy-card';
 import { TranslateService } from '@ngx-translate/core';
 import { ActionSheetProvider, PlatformProvider } from '../../../../providers';
 import {
+  getDisplayNameSortValue,
   GiftCardProvider,
   hasVisibleDiscount
 } from '../../../../providers/gift-card/gift-card';
@@ -46,7 +47,7 @@ export class CardCatalogPage extends WideHeaderPage {
       .getAvailableCards()
       .then(allCards => {
         this.cardConfigMap = allCards
-          .sort((a, b) => (a.featured && !b.featured ? -1 : 1))
+          .sort(sortByFeaturedAndAlphabetically)
           .reduce(
             (map, cardConfig) => ({ ...map, [cardConfig.name]: cardConfig }),
             {}
@@ -126,3 +127,13 @@ export function isCardInSearchResults(c: CardConfig, search: string = '') {
 export function stripPunctuation(text: string) {
   return text.replace(/[^\w\s]|_/g, '');
 }
+
+export function sortByFeaturedAndAlphabetically(a: CardConfig, b: CardConfig) {
+  return getCatalogSortValue(a) > getCatalogSortValue(b) ? 1 : -1;
+}
+
+export function getCatalogSortValue(cardConfig: CardConfig) {
+  return `${cardConfig.featured ? 'a' : 'b'}${getDisplayNameSortValue(
+    cardConfig.displayName
+  )}`;
+}

src/assets/img/gift-cards/gift-cards.png …assets/img/gift-cards/gift-cards-usd.pngsrc/assets/img/gift-cards/gift-cards.png renamed to src/assets/img/gift-cards/gift-cards-usd.png src/assets/img/gift-cards/gift-cards.png renamed to src/assets/img/gift-cards/gift-cards-usd.png

@@ -23,7 +23,7 @@
 </ion-list>
 <action-card *ngIf="!activeBrands?.length" (click)="buyGiftCards()" tappable>
   <div action-card-body>
-    <img class="gift-card-brands" src="assets/img/gift-cards/gift-cards.png">
+    <img class="gift-card-brands" src="assets/img/gift-cards/gift-cards-{{primaryCatalogCurrency}}.png">
     <div class="discount-wrapper">
       <div *ngIf="discountedCard" class="gift-card-featured-discount"
         (click)="$event.stopPropagation(); buyCard(discountedCard.name, 'Home Buy Gift Cards Discount Label')" tappable

src/pages/integrations/gift-cards/card-catalog/card-catalog.ts

@@ -58,6 +58,7 @@ export class HomeGiftCards implements OnInit {
   public appName: string;
   public discountedCard: CardConfig;
   public hideDiscount: boolean = false;
+  public primaryCatalogCurrency: string = 'usd';
   public disableArchiveAnimation: boolean = true; // Removes flicker on iOS when returning to home tab
 
   @Input('scrollArea')
@@ -77,17 +78,16 @@ export class HomeGiftCards implements OnInit {
   async ngOnInit() {
     this.appName = this.appProvider.info.userVisibleName;
     await this.initGiftCards();
-    this.discountedCard = await this.getDiscountedCard();
+    const availableCards = await this.giftCardProvider.getAvailableCards();
+    this.primaryCatalogCurrency = getPrimaryCatalogCurrency(availableCards);
+    this.discountedCard = availableCards.find(cardConfig =>
+      hasVisibleDiscount(cardConfig)
+    );
     this.hideDiscount = await this.persistenceProvider.getHideGiftCardDiscountItem();
     await timer(3000).toPromise();
     this.giftCardProvider.preloadImages();
   }
 
-  async getDiscountedCard(): Promise<CardConfig> {
-    const availableCards = await this.giftCardProvider.getAvailableCards();
-    return availableCards.find(cardConfig => hasVisibleDiscount(cardConfig));
-  }
-
   public buyGiftCards() {
     this.navCtrl.push(CardCatalogPage);
   }
@@ -219,4 +219,13 @@ export class HomeGiftCards implements OnInit {
   }
 }
 
+export function getPrimaryCatalogCurrency(availableCards: CardConfig[]) {
+  const homeLogoCollageSupportedCurrencies = ['usd', 'gbp'];
+  const firstBrandCurrency =
+    availableCards[0] && availableCards[0].currency.toLowerCase();
+  return homeLogoCollageSupportedCurrencies.indexOf(firstBrandCurrency) > -1
+    ? firstBrandCurrency
+    : 'usd';
+}
+
 export const HOME_GIFT_CARD_COMPONENTS = [HomeGiftCards, GiftCardItem];

src/pages/integrations/gift-cards/home-gift-cards/home-gift-cards.html

@@ -660,14 +660,17 @@ export function sortByDisplayName(
   a: CardConfig | GiftCard,
   b: CardConfig | GiftCard
 ) {
-  const startsNumeric = value => /^[0-9]$/.test(value.charAt(0));
-  const aName = a.displayName.toLowerCase();
-  const bName = b.displayName.toLowerCase();
-  const aSortValue = `${startsNumeric(aName) ? 'zzz' : ''}${aName}`;
-  const bSortValue = `${startsNumeric(bName) ? 'zzz' : ''}${bName}`;
+  const aSortValue = getDisplayNameSortValue(a.displayName);
+  const bSortValue = getDisplayNameSortValue(b.displayName);
   return aSortValue > bSortValue ? 1 : -1;
 }
 
+export function getDisplayNameSortValue(displayName: string) {
+  const startsNumeric = value => /^[0-9]$/.test(value.charAt(0));
+  const name = displayName.toLowerCase();
+  return `${startsNumeric(name) ? 'zzz' : ''}${name}`;
+}
+
 export function setNullableCardFields(card: GiftCard, cardConfig: CardConfig) {
   return {
     ...card,