@jetshop/template-trend 5.15.0-minor.d6073cd2 → 5.15.1

package/.linaria-cache/packages/template-trend/src/components/Cart/CartItem.linaria.css

@@ -4,4 +4,5 @@
 .ItemDetails_isr7kdh{grid-area:topleft;}
 .LinePrice_l60fe7p{margin-top:1rem;grid-area:bottomright;font-weight:600;text-align:right;}
 .AdjustQty_a38u2mt{margin-top:1rem;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;grid-area:bottomleft;}.AdjustQty_a38u2mt button{background:#f2f2f2;color:black;border-radius:50%;height:20px;width:20px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}.AdjustQty_a38u2mt button:focus{outline:none;}.AdjustQty_a38u2mt button:focus{outline:none;}.AdjustQty_a38u2mt span{margin:0 0.5rem;display:inline-block;}
-.RemoveItem_r1pz8l0y{grid-area:topright;text-align:right;}.RemoveItem_r1pz8l0y button{padding:0;width:1rem;height:1rem;border-radius:50%;outline:none;border:none;background:#8f8f8f;margin-left:auto;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}.RemoveItem_r1pz8l0y svg{height:8px;width:8px;}
+.FreeGift_f1pz8l0y{margin-top:1rem;font-style:italic;grid-area:bottomleft;}.FreeGift_f1pz8l0y{margin-top:1rem;font-style:italic;grid-area:bottomleft;}
+.RemoveItem_r1cc5ycq{grid-area:topright;text-align:right;}.RemoveItem_r1cc5ycq button{padding:0;width:1rem;height:1rem;border-radius:50%;outline:none;border:none;background:#8f8f8f;margin-left:auto;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}.RemoveItem_r1cc5ycq svg{height:8px;width:8px;}

package/.linaria-cache/packages/ui/ChannelSelector/Region.linaria.css

@@ -0,0 +1,3 @@
+.RegionName_r1biyodf{text-transform:uppercase;font-size:1rem;line-height:1.5rem;font-weight:600;margin:1rem 0 0.5rem 0;}
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/template-trend",
-  "version": "5.15.0-minor.d6073cd2",
+  "version": "5.15.1",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,11 +45,11 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "^5.15.0-minor.d6073cd2",
+    "@jetshop/core": "5.16.0-alpha.86c426f4",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "^5.15.0-minor.d6073cd2",
-    "@jetshop/react-scripts": "^5.15.0-minor.d6073cd2",
-    "@jetshop/ui": "^5.15.0-minor.d6073cd2",
+    "@jetshop/intl": "5.16.0-alpha.86c426f4",
+    "@jetshop/react-scripts": "5.16.0-alpha.86c426f4",
+    "@jetshop/ui": "5.16.0-alpha.86c426f4",
     "@react-google-maps/api": "~1.7.0",
     "prop-types": "^15.6.2",
     "react": "^16.9.0",

package/schema.graphql

@@ -745,10 +745,60 @@ type Discount {
   externalId: ID
   name: String
   value: Price
+  type: DiscountType
   description: String
   campaign: Category
 }
 
+enum DiscountType {
+  """No discount defined"""
+  UNDEFINED
+
+  """Discount drops price of the order total by defined amount"""
+  FIXED_AMOUNT
+
+  """Discount drops price of the product by X %"""
+  PERCENT
+
+  """
+  Discount will get the amount of the cheapest product and use this as a discount
+  """
+  ITEMS
+
+  """
+  Discount drops total price of the product if there is at least X of them in cart
+  """
+  ITEMS_PERCENTAGE_LIMIT
+
+  """Only a collection of products"""
+  ONLY_USE_LANDING_PAGE
+
+  """Discount drops price of the least expensive product in cart"""
+  PERCENT_ON_LEAST_EXPENSIVE_ITEM
+
+  """Discount drops price of the most expensive product in cart"""
+  PERCENT_ON_MOST_EXPENSIVE_ITEM
+
+  """Discount allows to get a free gift when the product is added"""
+  FREE_PRODUCT
+
+  """Discount allows to get free shipping option for the product"""
+  FREE_SHIPPING
+
+  """
+  Discount drops price for the package when all products in the package is added to cart
+  """
+  PACKAGE_DISCOUNT
+
+  """Discount on the order total from a voucher"""
+  BONUS_VOUCHER_DISCOUNT
+
+  """
+  Discount allows to buy amount of X of the article, but pay only for amount of Y
+  """
+  BUY_X_ARTICLES_PAY_Y_AMOUNT
+}
+
 interface Document {
   head: HtmlHead
   primaryRoute: Route
@@ -1055,10 +1105,10 @@ type Mutation {
 
   """
   LoginMutation will log a user in. 
-  One of email, pid, externalId or memberNumber is required, along with a password. 
+  One of email, pid, externalId, memberNumber or customerId is required, along with a password. 
   Returns an authorization token if the login was successful.
   """
-  login(password: String, email: String, pid: String, externalId: String, memberNumber: String, externalHashId: String, timeStamp: String): LoginResponse
+  login(password: String, email: String, pid: String, externalId: String, memberNumber: String, externalHashId: String, timeStamp: String, customerId: Int): LoginResponse
 
   """
   Requires a valid email and returns boolean value if successful, otherwise an error will be thrown
@@ -1952,6 +2002,9 @@ type Query {
 
   """Fetches customer-unique offers"""
   customerLoyalty: CustomerLoyalty
+
+  """Lookup a customer by a mobile phone number"""
+  customerLookup(phoneNumber: String): Customer
   customer: Customer
 
   """

package/src/components/Cart/CartItem.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { styled } from 'linaria/react';
 import { Link } from 'react-router-dom';
-
+import t from '@jetshop/intl';
 import useDecrementQuantity from '@jetshop/core/components/Mutation/useDecrementQuantity';
 import useIncrementQuantity from '@jetshop/core/components/Mutation/useIncrementQuantity';
 import useRemoveFromCart from '@jetshop/core/components/Mutation/useRemoveFromCart';
@@ -19,9 +19,11 @@ const Wrapper = styled('div')`
   display: flex;
   background: white;
   margin-bottom: 0.5rem;
+
   > :first-child {
     flex: 1 1 25%;
   }
+
   > :last-child {
     flex: 1 1 70%;
     padding: 0.5rem;
@@ -31,9 +33,11 @@ const Wrapper = styled('div')`
 const ProductName = styled('div')`
   font-size: 0.875rem;
   font-weight: normal;
+
   a {
     color: #828282;
   }
+
   .attribute {
     display: block;
   }
@@ -61,6 +65,7 @@ const AdjustQty = styled('div')`
   display: flex;
   grid-area: bottomleft;
   /* Plus/minus buttons */
+
   button {
     background: #f2f2f2;
     color: black;
@@ -70,20 +75,30 @@ const AdjustQty = styled('div')`
     display: flex;
     justify-content: center;
     align-items: center;
+
     :focus {
       outline: none;
     }
   }
+
   /* Count */
+
   span {
     margin: 0 0.5rem;
     display: inline-block;
   }
 `;
 
+const FreeGift = styled('div')`
+  margin-top: 1rem;
+  font-style: italic;
+  grid-area: bottomleft;
+`;
+
 const RemoveItem = styled('div')`
   grid-area: topright;
   text-align: right;
+
   button {
     padding: 0;
     width: 1rem;
@@ -97,6 +112,7 @@ const RemoveItem = styled('div')`
     justify-content: center;
     align-items: center;
   }
+
   svg {
     height: 8px;
     width: 8px;
@@ -126,6 +142,11 @@ const CartItem = ({ item, className = '' }) => {
     (value, index) => `${item.variantOptionNames[index]}: ${value}`
   );
 
+  const isFreeItem =
+    item.discounts?.filter(d => {
+      return d.type === 'FREE_PRODUCT';
+    }).length > 0;
+
   return (
     <Wrapper className={className}>
       <div>
@@ -197,25 +218,28 @@ const CartItem = ({ item, className = '' }) => {
           </button>
         </RemoveItem>
 
-        <AdjustQty>
-          <button
-            data-testid="decrement-quantity"
-            disabled={item.quantity === 1}
-            onClick={() =>
-              item.quantity !== 1 && decrementQuantity({ itemId: item.id })
-            }
-          >
-            -
-          </button>
-          <span data-testid="item-quantity">{item.quantity}</span>
-          <button
-            data-testid="increment-quantity"
-            onClick={() => incrementQuantity({ itemId: item.id })}
-          >
-            +
-          </button>
-        </AdjustQty>
-
+        {!isFreeItem ? (
+          <AdjustQty>
+            <button
+              data-testid="decrement-quantity"
+              disabled={item.quantity === 1}
+              onClick={() =>
+                item.quantity !== 1 && decrementQuantity({ itemId: item.id })
+              }
+            >
+              -
+            </button>
+            <span data-testid="item-quantity">{item.quantity}</span>
+            <button
+              data-testid="increment-quantity"
+              onClick={() => incrementQuantity({ itemId: item.id })}
+            >
+              +
+            </button>
+          </AdjustQty>
+        ) : (
+          <FreeGift>{t('Free gift')}</FreeGift>
+        )}
         <LinePrice
           data-testid="item-price"
           price={item.total}

package/src/components/Cart/queries/cartFragment.gql

@@ -57,6 +57,7 @@ fragment Cart on Cart {
     discounts {
       name
       description
+      type
       value {
         ...Price
       }

package/src/shop.config.js

@@ -76,6 +76,7 @@ const config = {
       Page: [ContentPage]
     }
   },
-  usePrimaryRouteForProducts: false
+  usePrimaryRouteForProducts: false,
+  useTrackingConsentAPI: true
 };
 export default config;

package/translations/cs.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "PSČ"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Je požadováno datum předběžné objednávky"
   },

package/translations/da.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Postnummer"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Forudbestillingsdato er påkrævet"
   },
@@ -794,5 +791,8 @@
 
   "email_address_is_required_24d62494": {
     "message": "E-mail-adresse er påkrævet"
+  },
+  "free_gift_c1c2ae5a": {
+    "message": "Gratis gave"
   }
 }

package/translations/de.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Postleitzahl"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Vorbestelldatum erforderlich"
   },

package/translations/default.json

@@ -194,6 +194,9 @@
   "free_for_your_order_34aba239": {
     "message": "Free for your order"
   },
+  "free_gift_c1c2ae5a": {
+    "message": "Free gift"
+  },
   "free_shipping_and_return_355b42d1": {
     "message": "Free shipping and return"
   },

package/translations/en.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Post code"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Pre-order date required"
   },
@@ -790,5 +787,8 @@
   },
   "the_price_has_not_changed_in_the_last_days_days_7f5c65f8": {
     "message": "The price has not changed in the last { days } days"
+  },
+  "free_gift_c1c2ae5a": {
+    "message": "Free gift"
   }
 }

package/translations/es.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Código postal"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Es necesaria una fecha de reserva"
   },

package/translations/et.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Postiindeks"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Eeltellimuse kuupäev kohustuslik"
   },

package/translations/fi.json

@@ -787,5 +787,8 @@
   },
   "email_address_is_required_24d62494": {
     "message": "Sähköpostiosoite on tarpeen"
+  },
+  "free_gift_c1c2ae5a": {
+    "message": "Ilmainen lahja"
   }
 }

package/translations/fr.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Code postal"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Date de précommande requise"
   },

package/translations/it.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Codice postale"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Data di preordine necessaria"
   },

package/translations/lv.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Pasta indekss"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Nepieciešams iepriekšēja pasūtījuma datums"
   },

package/translations/nb.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Postnummer"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Dato for forhåndsbestilling påkrevd"
   },
@@ -787,5 +784,8 @@
   },
   "email_address_is_required_24d62494": {
     "message": "E-postadressen er nødvendig"
+  },
+  "free_gift_c1c2ae5a": {
+    "message": "Gratis gave"
   }
 }

package/translations/nl.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Postcode"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Pre-order datum vereist"
   },

package/translations/pl.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Kod pocztowy"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Wymagana data zamówienia w przedsprzedaży"
   },

package/translations/ru.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "Почтовый индекс"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Требуется дата предзаказа"
   },

package/translations/sk.json

@@ -437,9 +437,6 @@
   "post_code_e64b6004": {
     "message": "PSČ"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "pre_order_date_required_8c33e235": {
     "message": "Dátum predbežnej objednávky je povinný"
   },

package/translations/sv.json

@@ -1,6 +1,6 @@
 {
   "a_to_z_96baaedc": {
-    "message": "A til Z"
+    "message": "A till Z"
   },
   "about_70c18bba": {
     "message": "Om"
@@ -434,9 +434,6 @@
   "post_code_e64b6004": {
     "message": "Postnummer"
   },
-  "powered_by_jetshop_a3e0968f": {
-    "message": "Powered by Jetshop"
-  },
   "prev_f82cbc48": {
     "message": "Föregående"
   },
@@ -790,5 +787,8 @@
   },
   "view_price_history_8078c9af": {
     "message": "Visa prishistorik"
+  },
+  "free_gift_c1c2ae5a": {
+    "message": "Gåva på köpet"
   }
 }