@jetshop/template-trend 5.14.0 → 5.14.2

package/src/components/Layout/Header/ChannelSelector/ChannelSelectorModal.js

@@ -20,20 +20,21 @@ const modalStyles = css`
   right: 0;
   top: 0;
   bottom: 0;
+  position: fixed;
   background: white;
   padding: 1rem;
   outline: none;
 `;
 
 const ChannelSelectorModal = props => {
-  const { selectedChannel, channels, updateChannel } =
+  const { selectedChannel, channels, updateChannel, selectedChannelGroup } =
     useContext(ChannelContext);
   return (
     <ModalTrigger
       modalStyles={modalStyles}
       target={props => (
         <Selector
-          channels={channels}
+          channels={selectedChannelGroup || channels}
           selectedChannel={selectedChannel}
           updateChannel={updateChannel}
           type={LargeSelector}
@@ -42,7 +43,13 @@ const ChannelSelectorModal = props => {
       )}
     >
       {({ showTarget }) => (
-        <Button onClick={showTarget} {...props}>
+        <Button
+          onClick={() => {
+            props.hideMobileMenu();
+            showTarget();
+          }}
+          {...props}
+        >
           <img
             src={`https://countryflags.jetshop.io/${selectedChannel.country.code}/flat/32.png`}
             alt="Country Flag"

package/src/components/Layout/Header/ChannelSelector/Selector.js

@@ -83,6 +83,11 @@ const StyledTitle = styled(Title)`
   padding: 2px 0 16px;
   margin-bottom: 4px;
   font-size: 14px;
+  ${theme.below.lg} {
+    && {
+      padding-bottom: 0.5rem;
+    }
+  }
 `;
 
 const actions = css`
@@ -113,7 +118,6 @@ const Selector = ({
       channels={channels}
       initialChannel={selectedChannel}
       render={({
-        channels,
         currencyItems,
         languageItems,
         selectedChannel,

package/src/components/Layout/Header/MobileMenu.js

@@ -90,7 +90,7 @@ export default function MobileMenu({ data }) {
                 </Link>
               </SecondaryMenuItem>
               <SecondaryMenuItem>
-                <ChannelSelectorModal />
+                <ChannelSelectorModal hideMobileMenu={drawer.hideTarget} />
               </SecondaryMenuItem>
             </SecondaryMenu>
           </Scroll>

package/src/components/Layout/Header/RecommendedChannel/ChannelBanner.js

@@ -193,8 +193,13 @@ const Flyout = ({ children }) => (
 );
 
 const ChannelBanner = () => {
-  const { channels, recommendedChannel, selectedChannel, updateChannel } =
-    useContext(ChannelContext);
+  const {
+    channels,
+    recommendedChannel,
+    selectedChannel,
+    updateChannel,
+    selectedChannelGroup
+  } = useContext(ChannelContext);
 
   const { bannerIsOpen, hideTheBanner } = useChannelBanner();
 
@@ -247,7 +252,7 @@ const ChannelBanner = () => {
                     {({ isOpen, hideTarget }) => (
                       <Flyout>
                         <Selector
-                          channels={channels}
+                          channels={selectedChannelGroup || channels}
                           selectedChannel={selectedChannel}
                           updateChannel={updateChannel}
                           hideTarget={hideTarget}

package/src/components/Layout/Header/RecommendedChannel/RecommendedChannelSelector.js

@@ -114,13 +114,7 @@ const StyledCancelButton = styled(CancelButton)`
   border: 1px solid #e1e1e1;
 `;
 
-const Selector = ({
-  channels,
-  selectedChannel,
-  updateChannel,
-  setOpenBanner,
-  hideTarget
-}) => {
+const Selector = ({ channels, selectedChannel, updateChannel, hideTarget }) => {
   const [countries] = useState(flattenCountries(channels));
 
   return (
@@ -128,7 +122,6 @@ const Selector = ({
       channels={channels}
       initialChannel={selectedChannel}
       render={({
-        channels,
         currencyItems,
         languageItems,
         selectedChannel,

package/src/components/MyPages/MyPages.js

@@ -14,6 +14,7 @@ import OrderListPage from './Orders/OrderListPage';
 import ProfilePage from './ProfilePage';
 import { useLocation } from 'react-router';
 import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
+import { Helmet } from 'react-helmet-async';
 
 import { theme } from '../Theme';
 
@@ -169,6 +170,10 @@ function MyPages() {
 
   return (
     <MaxWidth>
+      <Helmet>
+        <meta name="robots" content="noindex" />
+      </Helmet>
+
       <MyPagesSidebar
         baseRoute={baseRoute}
         routes={routes}

package/src/components/ProductList/AddToCart.js

@@ -58,7 +58,11 @@ export function AddToCart({ product }) {
   });
 
   return (
-    <button className={addButton} onClick={() => add()}>
+    <button
+      className={addButton}
+      onClick={() => add()}
+      disabled={product.hidePrice}
+    >
       {t('Add to cart')}
     </button>
   );

package/src/components/ProductList/Favourites.js

@@ -14,6 +14,7 @@ import MaxWidth from '../Layout/MaxWidth';
 import { theme } from '../Theme';
 import Button from '../ui/Button';
 import { Product } from './Product';
+import { Helmet } from 'react-helmet-async';
 
 import addMultipleToCartMutation from '../Cart/queries/addMultipleToCart.gql';
 import cartQuery from '../Cart/queries/cartQuery.gql';
@@ -54,6 +55,9 @@ export function Favourites() {
   if (noProductsInList) {
     return (
       <MaxWidth className={cx(container, loading ? 'loading' : null)}>
+        <Helmet>
+          <meta name="robots" content="noindex" />
+        </Helmet>
         <h1>{t('Saved items')}</h1>
         <p>{t('There are no products in your saved items list.')}</p>
       </MaxWidth>
@@ -83,7 +87,6 @@ export function Favourites() {
           );
         })}
       </ul>
-
       <div className="add-clear">
         <Button
           style={{ marginTop: '2em' }}
@@ -103,6 +106,9 @@ export function Favourites() {
         </Button>
         <ClearList listId={listId}>{t('Clear list')}</ClearList>
       </div>
+      <Helmet>
+        <meta name="robots" content="noindex" />
+      </Helmet>
     </MaxWidth>
   );
 }
@@ -125,7 +131,7 @@ function getItemsForAddToCart(products) {
   // to be the variant rather than the base product
   return products
     .filter(product => {
-      return product.validation.status === 'valid';
+      return product.validation.status === 'valid' && !product.hidePrice;
     })
     .map(product => ({
       ...product,

package/src/components/ProductList/ProductLists.gql

@@ -105,6 +105,7 @@ fragment ProductDetail on Product {
   hasVariants
   isPreOrder
   isPackage
+  hidePrice
   stockStatus {
     buyable
     text

package/src/components/ProductPage/AddToCart/AddToCartForm.js

@@ -65,9 +65,10 @@ function AddToCartForm({
   const configurationContext = useContext(ProductConfigurationContext);
   const price = useDynamicPrice(product, variant);
   const stockStatus = useStockStatus(variant || product);
+
   const outOfStockNotify = stockStatus.status === 'notifyWhenBack';
   const { validation: variantValidation, missingOptions } = variantHandler;
-  const { hasVariants } = product;
+  const { hasVariants, hidePrice } = product;
   const { validationMessage, enableValidation } = useProductValidationMessage({
     missingOptions,
     variantValidation,
@@ -134,6 +135,7 @@ function AddToCartForm({
               product={product}
             />
             <Price
+              hidePrice={product.hidePrice}
               {...price}
               css={{
                 marginBottom: '24px',
@@ -141,10 +143,12 @@ function AddToCartForm({
                   configurationContext && configurationContext.loading ? 0.3 : 1
               }}
             />
-            <PriceHistoryWrapper
-              articleNumber={product.articleNumber}
-              variant={variant}
-            />
+            {!hidePrice && (
+              <PriceHistoryWrapper
+                articleNumber={product.articleNumber}
+                variant={variant}
+              />
+            )}
 
             <Campaigns
               campaigns={product.campaigns}
@@ -170,7 +174,7 @@ function AddToCartForm({
                 status={stockStatus.status}
                 text={stockStatus.text}
               />
-              {!outOfStockNotify && (
+              {!outOfStockNotify && !hidePrice && (
                 <QuantityAddToCartWrapper>
                   <InputWithLabel
                     disableValidation

package/src/components/ProductPage/ProductPageFragment.gql

@@ -20,6 +20,7 @@ fragment ProductPage on Product {
   description
   hasVariants
   isPackage
+  hidePrice
   canonicalCategory {
     primaryRoute {
       path

package/src/shop.config.js

@@ -45,7 +45,7 @@ const config = {
     options: {}
   },
   channelOverrides: {},
-  disableGeoRedirect: true,
+  disableGeoRedirect: process.env.REACT_APP_DISABLE_GEOREDIRECT || true,
   singleDomainMode:
     typeof process.env.REACT_APP_SINGLE_DOMAIN_MODE === 'undefined'
       ? true

package/translations/sk.json

@@ -763,5 +763,29 @@
   },
   "z_to_a_75ce9568": {
     "message": "Od Z do A"
+  },
+  "pid_is_invalid_2a8f005e": {
+    "message": "Uvedené číslo sociálneho poistenia nie je platné."
+  },
+  "email_address_is_invalid_dd753229": {
+    "message": "Zadaná e-mailová adresa nie je platná."
+  },
+  "postal_code_is_invalid_438e6940": {
+    "message": "Zadané poštové číslo nie je platné."
+  },
+  "postal_code_is_required_ca3b7a32": {
+    "message": "Vyžaduje sa PSČ.."
+  },
+  "this_pid_is_already_registered_83895f84": {
+    "message": "Uvedené číslo sociálneho poistenia je už zaregistrované."
+  },
+  "your_email_address_is_already_registered_3d806453": {
+    "message": "Zadaná e-mailová adresa je už zaregistrovaná."
+  },
+  "pid_is_required_68787e3": {
+    "message": "Číslo sociálneho poistenia je povinné."
+  },
+  "email_address_is_required_24d62494": {
+    "message": "Vyžaduje sa e-mailová adresa."
   }
 }

package/translations/sv.json

@@ -245,6 +245,9 @@
   "invalid_email_address_8d0d5e33": {
     "message": "Felaktig e-postadress"
   },
+  "it_looks_like_you_are_visiting_us_from_country_do__832ec546": {
+    "message": "Det verkar som att du besöker oss från { country }. Vill du besöka vår webbplats för { country }?"
+  },
   "join_the_newsletter_fbefaa77": {
     "message": "Prenumerera på nyhetsbrev"
   },
@@ -464,6 +467,12 @@
   "products_c5f0793": {
     "message": "Produkter"
   },
+  "productcount_plural_1_add_product_to_cart_other_ad_b37e18fc": {
+    "message": "{ productCount, plural,\n     =1 {Lägg till # produkt i varukorgen}\n  other {Lägg till # produkter i varukorgen}\n}"
+  },
+  "productcount_plural_1_product_added_to_the_cart_ot_e20e0dc8": {
+    "message": "{ productCount, plural,\n     =1 {# produkt har lagts i varukorgen.}\n  other {# produkter har lagts i varukorgen.}\n}"
+  },
   "quantity_20164bff": {
     "message": "Kvantitet"
   },
@@ -776,8 +785,8 @@
   "getting_the_last_days_days_price_changes_bedecd5": {
     "message": "Hämtar de senaste { days } dagarnas prisändringar..."
   },
-  "no_recent_price_changes_the_last_days_61d42dda": {
-    "message": "Hittade inte några prisförändringar senaste { days } dagarna"
+  "the_price_has_not_changed_in_the_last_days_days_7f5c65f8": {
+    "message": "Hittade inte några prisförändringar de senaste { days } dagarna"
   },
   "view_price_history_8078c9af": {
     "message": "Visa prishistorik"