fix(bundles): hide old price if no discount (#5561)

akveo · Aug 28, 2020 · a5a535d · a5a535d
1 parent 9e85f2a
commit a5a535d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/docs/app/@core/data/service/bundles.service.ts b/docs/app/@core/data/service/bundles.service.ts
@@ -91,7 +91,7 @@ export class BundlesService {
             storeUrl: `${this.STORE}/${item.handle}`,
             tags: item.tags,
             title: item.title,
-            description: (item.body_html as string).trim().replace(/^<p>/, '').replace(/<\/p>$/, ''),
+            description: (item.body_html as string).trim().replace(/<(?:.|\n)*?>/gm, ' ').replace(/  +/gm, ' '),
             variants: item.variants.map(variant => {
               return {
                 available: variant.available,

diff --git a/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.html b/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.html
@@ -34,7 +34,9 @@ <h4 class="package-card__title">{{ product.title }}</h4>
             </a>
           </p>
           <div class="package-card__price-wrapper">
-            <span class="package-card__price package-card__price--old">${{ (product.variants | license:selectedLicenseType).compare_at_price }}</span>
+            <span class="package-card__price package-card__price--old" *ngIf="shouldShowOldPrice(product.variants, selectedLicenseType)">
+              ${{ (product.variants | license:selectedLicenseType).compare_at_price }}
+            </span>
             <span class="package-card__price">${{ (product.variants | license:selectedLicenseType).price }}</span>
           </div>
           <a href="{{ product.storeUrl }}?utm_source=ngx_admin_landing&utm_medium=buy_bundle_{{ selectedLicenseType }}"

diff --git a/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.ts b/docs/app/pages/home/backend-bundles-section/backend-bundles-section.component.ts
@@ -10,8 +10,15 @@ import { Observable } from 'rxjs';
 import { delay, filter, take } from 'rxjs/operators';
 import { NB_WINDOW } from '@nebular/theme';
 
-import { BUNDLE_LICENSE, BundlesService, Feature, Product } from '../../../@core/data/service/bundles.service';
+import {
+  BUNDLE_LICENSE,
+  BundlesService,
+  Feature,
+  Product,
+  ProductVariant,
+} from '../../../@core/data/service/bundles.service';
 import { Descriptions, DescriptionsService } from '../../../@core/data/service/descriptions.service';
+import { LicensePipe } from '../backend-bundles-section/license.pipe';
 
 @Component({
   selector: 'ngx-backend-bundles-section',
@@ -34,7 +41,8 @@ export class BackendBundlesSectionComponent implements AfterViewInit {
               private bundlesService: BundlesService,
               private activatedRoute: ActivatedRoute,
               private el: ElementRef<HTMLElement>,
-              @Inject(NB_WINDOW) private window) {
+              @Inject(NB_WINDOW) private window,
+              private licensePipe: LicensePipe) {
   }
 
   ngAfterViewInit() {
@@ -48,4 +56,10 @@ export class BackendBundlesSectionComponent implements AfterViewInit {
         this.window.scrollTo(0, this.el.nativeElement.offsetTop);
       });
   }
+
+  shouldShowOldPrice(variants: ProductVariant[], selectedLicenseType: string): boolean {
+    const product = this.licensePipe.transform(variants, selectedLicenseType);
+
+    return !!parseFloat(product.compare_at_price);
+  }
 }
diff --git a/docs/app/pages/home/landing-home.module.ts b/docs/app/pages/home/landing-home.module.ts
@@ -54,6 +54,9 @@ const COMPONENTS = [
     SwiperModule,
     LandingHomeRoutingModule,
   ],
+  providers: [
+    ...PIPES,
+  ],
 })
 export class LandingHomeModule {
 }