@crystaldesign/diva-seller 24.15.0-beta.27 → 24.15.0-beta.29

package/build/esm/index.js

@@ -17,7 +17,7 @@ import CardMedia from '@mui/material/CardMedia';
 import Typography$1 from '@mui/material/Typography';
 import createStyles from '@mui/styles/createStyles';
 import makeStyles from '@mui/styles/makeStyles';
-import { styled, Typography, Card as Card$1, CardActionArea as CardActionArea$1, CardMedia as CardMedia$1, Tooltip, Button as Button$1, TextField, ButtonGroup as ButtonGroup$1, Checkbox as Checkbox$1, FormControlLabel as FormControlLabel$1, IconButton as IconButton$1, Link, InputBase, Accordion, AccordionSummary, Tabs, Tab, AccordionDetails, Table as Table$1, TableBody as TableBody$1, TableRow as TableRow$1, TableCell as TableCell$1, CardHeader, CardContent, FormControl as FormControl$1, FormHelperText, TextareaAutosize, Box as Box$1, Select as Select$1, MenuItem as MenuItem$1, ListItemButton, ListItemIcon } from '@mui/material';
+import { styled, Typography, Card as Card$1, CardActionArea as CardActionArea$1, CardMedia as CardMedia$1, Button as Button$1, TextField, ButtonGroup as ButtonGroup$1, Tooltip, Checkbox as Checkbox$1, FormControlLabel as FormControlLabel$1, IconButton as IconButton$1, Link, InputBase, Accordion, AccordionSummary, Tabs, Tab, AccordionDetails, Table as Table$1, TableBody as TableBody$1, TableRow as TableRow$1, TableCell as TableCell$1, CardHeader, CardContent, FormControl as FormControl$1, FormHelperText, TextareaAutosize, Box as Box$1, Select as Select$1, MenuItem as MenuItem$1, ListItemButton, ListItemIcon } from '@mui/material';
 import { Histogram, useFilterState, FilterComponent, AnalyticsComponent } from '@crystaldesign/analytics';
 import Button from '@mui/material/Button';
 import ButtonGroup from '@mui/material/ButtonGroup';
@@ -58,6 +58,8 @@ import OrderEntry, { apiSaveRenderJobs, VariantSelector } from '@crystaldesign/o
 import Box from '@mui/material/Box';
 import Alert from '@mui/material/Alert';
 import InfoIcon from '@mui/icons-material/Info';
+import AlertTitle from '@mui/material/AlertTitle';
+import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
 import classnames from 'classnames';
 import { InfoRounded, Remove, Add, Delete } from '@mui/icons-material';
 import { Swiper, SwiperSlide } from 'swiper/react';
@@ -3980,7 +3982,6 @@ function Articles(_ref) {
 }
 
 function Header$1(_ref) {
-  var _config$checkout;
   var status = _ref.status,
     divaNr = _ref.divaNr,
     documentVersion = _ref.documentVersion,
@@ -3991,10 +3992,11 @@ function Header$1(_ref) {
     doExportToVKP = _ref.doExportToVKP,
     showProductCreator = _ref.showProductCreator,
     config = _ref.config,
-    enableVKPExportButton = _ref.enableVKPExportButton,
-    disableMarketing = _ref.disableMarketing;
+    enableVKPExportButton = _ref.enableVKPExportButton;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var _useDivaCore = useDivaCore(),
+    organization = _useDivaCore.state.organization;
   var handleClick = function handleClick(event) {
     if (event.currentTarget.name == 'Step1' || event.currentTarget.name == 'Step2' || event.currentTarget.name == 'Step3' || event.currentTarget.name == 'Step4') {
       setActBasketPage(event.currentTarget.name);
@@ -4042,18 +4044,12 @@ function Header$1(_ref) {
           children: t('basket.navigation.checkoutNew', {
             step: (config === null || config === void 0 ? void 0 : config.clientData) != false ? 3 : 2
           })
-        }), !(config !== null && config !== void 0 && (_config$checkout = config.checkout) !== null && _config$checkout !== void 0 && _config$checkout.hideMarketingStep) && /*#__PURE__*/jsx(Tooltip, {
-          title: disableMarketing ? t('basket.navigation.marketingDisabled') : '',
-          children: /*#__PURE__*/jsx("div", {
-            children: /*#__PURE__*/jsx(Button, {
-              name: "Step4",
-              onClick: handleClick,
-              variant: actBasketPage == 'Step4' ? 'contained' : 'outlined',
-              disabled: disableMarketing,
-              children: t('basket.navigation.checkoutMarketing', {
-                step: (config === null || config === void 0 ? void 0 : config.clientData) != false ? 4 : 3
-              })
-            })
+        }), organization.settings.enableVKMarketing && /*#__PURE__*/jsx(Button, {
+          name: "Step4",
+          onClick: handleClick,
+          variant: actBasketPage == 'Step4' ? 'contained' : 'outlined',
+          children: t('basket.navigation.checkoutMarketing', {
+            step: (config === null || config === void 0 ? void 0 : config.clientData) != false ? 4 : 3
           })
         })]
       })]
@@ -6476,7 +6472,9 @@ function Step3Checkout(_ref) {
 
 function Step4Checkout(_ref) {
   var currentProduct = _ref.currentProduct,
-    basket = _ref.basket;
+    basket = _ref.basket,
+    productSaved = _ref.productSaved,
+    is3dReady = _ref.is3dReady;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useDivaCore = useDivaCore(),
@@ -6489,6 +6487,18 @@ function Step4Checkout(_ref) {
       text: t('basket.checkout.errorhqmediatext')
     });
   };
+  if (!is3dReady) {
+    return /*#__PURE__*/jsx(ErrorAlert, {
+      title: t('basket.checkout.step4.errortitle'),
+      content: t('basket.checkout.step4.error3d')
+    });
+  }
+  if (!productSaved) {
+    return /*#__PURE__*/jsx(ErrorAlert, {
+      title: t('basket.checkout.step4.errortitle'),
+      content: t('basket.checkout.step4.productNotSaved')
+    });
+  }
   return /*#__PURE__*/jsxs(Box, {
     sx: {
       display: 'flex',
@@ -6542,12 +6552,59 @@ function InfoAlert(_ref2) {
     children: content
   });
 }
+function ErrorAlert(_ref3) {
+  var title = _ref3.title,
+    content = _ref3.content;
+  return /*#__PURE__*/jsx("div", {
+    style: {
+      paddingLeft: 100,
+      paddingRight: 100,
+      paddingTop: 25
+    },
+    children: /*#__PURE__*/jsx(Alert, {
+      severity: "error",
+      icon: false,
+      sx: {
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        textAlign: 'center'
+      },
+      children: /*#__PURE__*/jsxs("div", {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          alignItems: 'center'
+        },
+        children: [/*#__PURE__*/jsx(ErrorOutlineIcon, {
+          sx: {
+            fontSize: '100px',
+            marginBottom: '16px'
+          }
+        }), /*#__PURE__*/jsxs("div", {
+          children: [/*#__PURE__*/jsx(AlertTitle, {
+            sx: {
+              fontSize: '28px',
+              marginBottom: '8px'
+            },
+            children: title
+          }), /*#__PURE__*/jsx("span", {
+            style: {
+              fontSize: '22px'
+            },
+            children: content
+          })]
+        })]
+      })
+    })
+  });
+}
 
 function ownKeys$p(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$p(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$p(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$p(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$4 = getLogger('SellerBasket', 'Basket');
 function Basket(_ref) {
-  var _currentBasket$OrderS5, _configurationData$Ch5;
+  var _configurationData$Ch5, _currentBasket$OrderS5;
   var divaNr = _ref.divaNr,
     basket = _ref.basket,
     checkBasket = _ref.checkBasket;
@@ -6944,8 +7001,7 @@ function Basket(_ref) {
       doExportToVKP: doExportToVKP,
       openProductCreator: openProductCreator,
       showProductCreator: userHasPermission('productcreator') && !(configurationData !== null && configurationData !== void 0 && configurationData.hideProductCreator),
-      enableVKPExportButton: !currentBasket.catalogStatus || currentBasket.catalogStatus == 'LISTED' || userHasPermission('alwaysenablevkpexport'),
-      disableMarketing: !(currentBasket !== null && currentBasket !== void 0 && (_currentBasket$OrderS5 = currentBasket.OrderSets[0]) !== null && _currentBasket$OrderS5 !== void 0 && _currentBasket$OrderS5.HQRenderScript) || !productSaved ? true : false
+      enableVKPExportButton: !currentBasket.catalogStatus || currentBasket.catalogStatus == 'LISTED' || userHasPermission('alwaysenablevkpexport')
     }), /*#__PURE__*/jsxs("div", {
       style: {
         marginLeft: 10,
@@ -6981,12 +7037,14 @@ function Basket(_ref) {
         currentProduct: currentProduct,
         setCurrentProduct: setCurrentProduct,
         setProductSaved: setProductSaved
-      }), actBasketPage == 'Step4' && /*#__PURE__*/jsx(Step4Checkout, {
+      }), actBasketPage == 'Step4' && organization.settings.enableVKMarketing && /*#__PURE__*/jsx(Step4Checkout, {
         config: configurationData === null || configurationData === void 0 ? void 0 : configurationData.Checkout,
         basket: currentBasket,
         setActBasketPage: setActBasketPage,
         startWithEmptyBasket: startWithEmptyBasket,
-        currentProduct: currentProduct
+        currentProduct: currentProduct,
+        productSaved: productSaved,
+        is3dReady: currentBasket !== null && currentBasket !== void 0 && (_currentBasket$OrderS5 = currentBasket.OrderSets[0]) !== null && _currentBasket$OrderS5 !== void 0 && _currentBasket$OrderS5.HQRenderScript ? true : false
       })]
     })]
   });

package/build/types/seller/src/components/Basket/Step4Checkout.d.ts

@@ -2,7 +2,9 @@ import React from 'react';
 import { PageParams } from './types';
 interface Props {
     currentProduct: any;
+    productSaved?: boolean;
+    is3dReady?: boolean;
 }
-export default function Step4Checkout({ currentProduct, basket }: PageParams & Props): React.JSX.Element;
+export default function Step4Checkout({ currentProduct, basket, productSaved, is3dReady }: PageParams & Props): React.JSX.Element;
 export {};
 //# sourceMappingURL=Step4Checkout.d.ts.map

package/build/types/seller/src/components/Basket/Step4Checkout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Step4Checkout.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Basket/Step4Checkout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAQrC,UAAU,KAAK;IACb,cAAc,EAAE,GAAG,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,UAAU,GAAG,KAAK,qBAmCnF"}
+{"version":3,"file":"Step4Checkout.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Basket/Step4Checkout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAUrC,UAAU,KAAK;IACb,cAAc,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,UAAU,GAAG,KAAK,qBA0C5G"}

package/build/types/seller/src/components/Basket/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Basket/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAOhD,OAAO,EAA0C,UAAU,EAAa,MAAM,0BAA0B,CAAC;AAKzG,UAAU,KAAK;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAEzD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,KAAK,qBA6XpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Basket/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAOhD,OAAO,EAA0C,UAAU,EAAa,MAAM,0BAA0B,CAAC;AAKzG,UAAU,KAAK;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAEzD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,KAAK,qBA8XpE"}

package/build/types/seller/src/ui/Basket/Header.d.ts

@@ -14,6 +14,6 @@ interface props {
     enableVKPExportButton?: boolean;
     disableMarketing?: boolean;
 }
-export default function Header({ status, divaNr, documentVersion, actBasketPage, showVKPExportButton, openProductCreator, setActBasketPage, doExportToVKP, showProductCreator, config, enableVKPExportButton, disableMarketing, }: props): React.JSX.Element;
+export default function Header({ status, divaNr, documentVersion, actBasketPage, showVKPExportButton, openProductCreator, setActBasketPage, doExportToVKP, showProductCreator, config, enableVKPExportButton, }: props): React.JSX.Element;
 export {};
 //# sourceMappingURL=Header.d.ts.map

package/build/types/seller/src/ui/Basket/Header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/Basket/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IACrD,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAC9F,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,MAAM,EACN,MAAM,EACN,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,MAAM,EACN,qBAAqB,EACrB,gBAAgB,GACjB,EAAE,KAAK,qBA2DP"}
+{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/Basket/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IACrD,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAC9F,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,MAAM,EACN,MAAM,EACN,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,kBAAkB,EAClB,MAAM,EACN,qBAAqB,GACtB,EAAE,KAAK,qBA0DP"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "24.15.0-beta.27",
+  "version": "24.15.0-beta.29",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -29,9 +29,9 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/analytics": "24.15.0-beta.27",
-    "@crystaldesign/products-component": "24.15.0-beta.27",
-    "@crystaldesign/real-time-viewer": "24.15.0-beta.27",
+    "@crystaldesign/analytics": "24.15.0-beta.29",
+    "@crystaldesign/products-component": "24.15.0-beta.29",
+    "@crystaldesign/real-time-viewer": "24.15.0-beta.29",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@mui/icons-material": "^6.1.5",
@@ -43,5 +43,5 @@
   },
   "types": "./build/types/seller/src/index.d.ts",
   "module": "build/esm/index.js",
-  "gitHead": "0bc4fca3ea402f25b90130feca04f2245ebfd480"
+  "gitHead": "0728ae008c7d21f41246a824a9af5c207774778f"
 }