@bytebrand/fe-ui-core 4.2.20 → 4.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.2.20",
+  "version": "4.2.22",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",

package/source/components/Breadcrumbs/Breadcrumbs.tsx

@@ -23,7 +23,13 @@ class Breadcrumbs extends React.PureComponent<IBreadcrumbsProps> {
     }
   };
 
-  onBackButtonClick = () => { window.history.back(); };
+  onBackButtonClick = () => {
+    if (document.referrer) {
+      window.history.back();
+    } else {
+      window.location.href = '/search'
+    }
+   };
 
   renderList = (list: LinkItem[]) => {
     const { t = (phrase: string) => _get(breadcrumbsTranslate(), phrase.replace(':', '.'), phrase), page } = this.props;
@@ -75,7 +81,7 @@ class Breadcrumbs extends React.PureComponent<IBreadcrumbsProps> {
         <div className={styles.breadcrumbs}>
           <span className={styles.homeLink}><a href='/search'></a></span>
           {list && list.length ? this.renderList(list) : false}
-          {/* {withBackBtn ? this.renderGoBackButton() : false} */}
+          {withBackBtn ? this.renderGoBackButton() : false}
         </div>
         {classBreadcrumbsAny ? <FirstInfoBlock {...infoBlockProps} /> : ''}
       </div>

package/source/components/VehicleDetailedSidebar/partials/PriceContent.tsx

@@ -26,7 +26,8 @@ const PriceContent: React.FunctionComponent<IPriceContentProps> = ({
   onAdjustRateClick,
   OfferBlockComponent,
   priceTabActiveIndex,
-  offerBlockProps
+  offerBlockProps,
+  checkoutData
 }) => {
   const priceRatingProps = {
     t,
@@ -40,6 +41,7 @@ const PriceContent: React.FunctionComponent<IPriceContentProps> = ({
     t,
     car,
     detailsText,
+    checkoutData,
     OfferRequestButtonWrapper,
     priceTabActiveIndex,
     isAdditionalOption: true,
@@ -50,7 +52,6 @@ const PriceContent: React.FunctionComponent<IPriceContentProps> = ({
     styles.tabContentPadding,
     { [styles.tabContentPaddingForBuy]: isBuy }
   );
-
   return (
     <>
       <div className={tabContentPaddingClassName}>
@@ -95,7 +96,7 @@ const PriceContent: React.FunctionComponent<IPriceContentProps> = ({
             </div>
           ) : null}
         </span>
-        <div className={styles.wrapper}>
+        <div>
           <PriceRating {...priceRatingProps} />
           <span className={styles.priceInfo}>
             <span className={styles.priceInfoLabel} onClick={onAdjustRateClick}>

package/source/components/_common/OfferRequestButtonWrapper/OfferRequestButtonWrapper.tsx

@@ -16,6 +16,7 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
   priceTabActiveIndex,
   isAdditionalOption,
   controlsClassContainer,
+  checkoutData = {},
   onShowOfferDetails
 }) => {
   const btnEl = useRef(null);
@@ -30,11 +31,10 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
     styles.controlsContainer,
     controlsClassContainer
   );
-
   return (
     <>
       <div className={controlsContainerClassName}>
-        <OfferRequestButtonWrapper carId={carId} dealerId={dealerId}>
+        <OfferRequestButtonWrapper carId={carId} dealerId={dealerId} checkoutData={checkoutData} >
           {(
             onClick: () => void,
             isOfferRequested: boolean,
@@ -48,21 +48,16 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
             const offerButtonClassName = classnames(
               styles.controlButton,
               styles.offerButtonGet,
-              { [styles.offerButtonSuccess]: isOfferRequested },
-              { [styles.isAlternativeButton]: isAlternative || isSale || isAlternativeType }
+              { [styles.offerButtonSuccess]: isOfferRequested || !!Object.keys(checkoutData).length },
+              { [styles.isAlternativeButton]: isAlternative || isSale || isAlternativeType}
             );
 
             const getRequestButtonTitle = () => {
-              if (isSale) {
-                return t('sidebar.requestOfferSale');
-              }
-              if (isAlternativeType) {
-                return t('sidebar.importRequest');
-              }
-              if (isOfferRequested) {
-                return t('sidebar.successfullyRequested');
-              }
-              return t('sidebar.requestOffer');
+              if (isSale) return t('sidebar.requestOfferSale');
+              else if (isAlternativeType) return t('sidebar.importRequest');
+              else if (isOfferRequested) return t('CheckoutPage:onlineCheckoutModal.redirectBtn');
+              else if (checkoutData && Object.keys(checkoutData).length) return t('vehicleProps:title.toCheckoutCar');
+              else return t('sidebar.requestOffer');
             };
 
             return (

package/source/framework/types/types.ts

@@ -252,6 +252,7 @@ interface IOfferRequestButtonWrapper {
 export interface IOfferRequestButtonWrapperProps {
   t?: (key: string, options?: object) => string;
   car: ICar;
+  checkoutData: object;
   priceTabActiveIndex?: number;
   detailsText?: string | null;
   isAdditionalOption?: boolean;