@licklist/design 0.71.16-stage.0 → 0.71.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/iframe/order-process/components/BookingSummary/BookingSummary.d.ts +1 -1
- package/dist/iframe/order-process/components/BookingSummary/BookingSummary.d.ts.map +1 -1
- package/dist/iframe/order-process/components/BookingSummary/BookingSummary.js +1 -2
- package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts +1 -2
- package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts.map +1 -1
- package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.js +2 -2
- package/dist/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.d.ts +1 -2
- package/dist/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.d.ts.map +1 -1
- package/dist/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.js +1 -2
- package/dist/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.d.ts.map +1 -1
- package/dist/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.js +12 -4
- package/dist/iframe/order-process/components/BookingSummary/utils/index.d.ts.map +1 -1
- package/dist/iframe/order-process/components/BookingSummary/utils/index.js +2 -1
- package/dist/iframe/order-process/components/CategoryProduct/CategoryProduct.d.ts.map +1 -1
- package/dist/iframe/order-process/components/CategoryProduct/CategoryProduct.js +1 -1
- package/dist/iframe/payment/payment-page/PaymentPage.d.ts.map +1 -1
- package/dist/iframe/payment/payment-page/PaymentPage.js +3 -11
- package/dist/styles/date-time-button/DateTimeButton.scss +1 -3
- package/package.json +2 -2
- package/src/iframe/order-process/components/BookingSummary/BookingSummary.tsx +0 -2
- package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx +1 -6
- package/src/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.tsx +0 -3
- package/src/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.tsx +4 -0
- package/src/iframe/order-process/components/BookingSummary/utils/index.ts +4 -4
- package/src/iframe/order-process/components/CategoryProduct/CategoryProduct.tsx +4 -7
- package/src/iframe/payment/payment-page/PaymentPage.tsx +7 -14
- package/src/styles/date-time-button/DateTimeButton.scss +1 -3
- package/yarn.lock +318 -347
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BookingSummaryProps } from './types';
|
|
2
2
|
export declare const BookingSummary: {
|
|
3
|
-
({ date, time, menuSteps, formValues, shouldHidePeopleAmount, eventName, transactionFee, productsWithErrors, isLoading, hasPeopleInput,
|
|
3
|
+
({ date, time, menuSteps, formValues, shouldHidePeopleAmount, eventName, transactionFee, productsWithErrors, isLoading, hasPeopleInput, peopleAmount, footer, headerComponent, isPaymentPage, }: Omit<BookingSummaryProps, "totallWithDiscount">): import("react/jsx-runtime").JSX.Element;
|
|
4
4
|
SummaryTotal: ({ formValues, totalWithDiscount, transactionFee, isFreePayment, }: Pick<BookingSummaryProps, "formValues" | "totalWithDiscount" | "transactionFee" | "isFreePayment">) => import("react/jsx-runtime").JSX.Element;
|
|
5
5
|
Accordion: ({ children, title, showTitleOnlyOnMobile, hasPeopleInput, isPaymentPage, headerComponent, }: import("./components/BookingSummaryAccordion").BookingSummaryAccordionProps) => import("react/jsx-runtime").JSX.Element;
|
|
6
6
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BookingSummary.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/BookingSummary/BookingSummary.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAM7C,eAAO,MAAM,cAAc;
|
|
1
|
+
{"version":3,"file":"BookingSummary.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/BookingSummary/BookingSummary.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAM7C,eAAO,MAAM,cAAc;qMAgBxB,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,CAAC;;;CAgFjD,CAAA"}
|
|
@@ -12,7 +12,7 @@ import { ReactComponent as SvgCalendar } from '../../../../assets/iframe/calenda
|
|
|
12
12
|
import { LoaderIndicator } from '../../../../static/loader/LoaderIndicator.js';
|
|
13
13
|
|
|
14
14
|
var BookingSummary = function(param) {
|
|
15
|
-
var date = param.date, time = param.time, menuSteps = param.menuSteps, _param_formValues = param.formValues, formValues = _param_formValues === void 0 ? {} : _param_formValues, shouldHidePeopleAmount = param.shouldHidePeopleAmount, eventName = param.eventName, _param_transactionFee = param.transactionFee, transactionFee = _param_transactionFee === void 0 ? 0 : _param_transactionFee, _param_productsWithErrors = param.productsWithErrors, productsWithErrors = _param_productsWithErrors === void 0 ? [] : _param_productsWithErrors, isLoading = param.isLoading, hasPeopleInput = param.hasPeopleInput,
|
|
15
|
+
var date = param.date, time = param.time, menuSteps = param.menuSteps, _param_formValues = param.formValues, formValues = _param_formValues === void 0 ? {} : _param_formValues, shouldHidePeopleAmount = param.shouldHidePeopleAmount, eventName = param.eventName, _param_transactionFee = param.transactionFee, transactionFee = _param_transactionFee === void 0 ? 0 : _param_transactionFee, _param_productsWithErrors = param.productsWithErrors, productsWithErrors = _param_productsWithErrors === void 0 ? [] : _param_productsWithErrors, isLoading = param.isLoading, hasPeopleInput = param.hasPeopleInput, peopleAmount = param.peopleAmount, footer = param.footer, headerComponent = param.headerComponent, // TODO Remove this, when all iframe pages will be ready
|
|
16
16
|
isPaymentPage = param.isPaymentPage;
|
|
17
17
|
var _values;
|
|
18
18
|
var t = useTranslation('Design').t;
|
|
@@ -51,7 +51,6 @@ var BookingSummary = function(param) {
|
|
|
51
51
|
className: "products-by-menu-step",
|
|
52
52
|
children: menuSteps.map(function(menuStep) {
|
|
53
53
|
return /*#__PURE__*/ jsx(ProductsByMenuStep, {
|
|
54
|
-
isPaymentLink: isPaymentLink,
|
|
55
54
|
orderItems: formValues,
|
|
56
55
|
step: menuStep,
|
|
57
56
|
productsWithErrors: productsWithErrors
|
|
@@ -3,8 +3,7 @@ type ProductSummaryProps = {
|
|
|
3
3
|
name?: string;
|
|
4
4
|
productQuantityError?: string;
|
|
5
5
|
orderProduct: OrderItem;
|
|
6
|
-
isPaymentLink?: boolean;
|
|
7
6
|
};
|
|
8
|
-
export declare const ProductSummary: ({ name, productQuantityError, orderProduct,
|
|
7
|
+
export declare const ProductSummary: ({ name, productQuantityError, orderProduct, }: ProductSummaryProps) => import("react/jsx-runtime").JSX.Element;
|
|
9
8
|
export {};
|
|
10
9
|
//# sourceMappingURL=ProductSummary.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,SAAS,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,cAAc,kDAIxB,mBAAmB,4CA2BrB,CAAA"}
|
|
@@ -4,10 +4,10 @@ import { useIntl } from 'react-intl';
|
|
|
4
4
|
import * as Config from '@licklist/core/dist/Config';
|
|
5
5
|
|
|
6
6
|
var ProductSummary = function(param) {
|
|
7
|
-
var name = param.name, productQuantityError = param.productQuantityError, orderProduct = param.orderProduct
|
|
7
|
+
var name = param.name, productQuantityError = param.productQuantityError, orderProduct = param.orderProduct;
|
|
8
8
|
var t = useTranslation('Design').t;
|
|
9
9
|
var formatNumber = useIntl().formatNumber;
|
|
10
|
-
var priceForOneProduct =
|
|
10
|
+
var priceForOneProduct = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.price;
|
|
11
11
|
var fullPrice = formatNumber(priceForOneProduct * (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.quantity), {
|
|
12
12
|
style: 'currency',
|
|
13
13
|
currency: Config.Currency.GBP
|
|
@@ -5,7 +5,6 @@ export type ProductsByMenuStepsProps = {
|
|
|
5
5
|
orderItems: OrderItems;
|
|
6
6
|
step: MenuStep;
|
|
7
7
|
productsWithErrors?: QuantityCheckProductInfo[];
|
|
8
|
-
isPaymentLink?: boolean;
|
|
9
8
|
};
|
|
10
|
-
export declare const ProductsByMenuStep: ({ orderItems, step, productsWithErrors,
|
|
9
|
+
export declare const ProductsByMenuStep: ({ orderItems, step, productsWithErrors, }: ProductsByMenuStepsProps) => import("react/jsx-runtime").JSX.Element;
|
|
11
10
|
//# sourceMappingURL=ProductsByMenuStep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProductsByMenuStep.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAEL,UAAU,EACX,MAAM,wDAAwD,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAA;AAqB9E,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,QAAQ,CAAA;IACd,kBAAkB,CAAC,EAAE,wBAAwB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"ProductsByMenuStep.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductsByMenuStep/ProductsByMenuStep.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAEL,UAAU,EACX,MAAM,wDAAwD,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,qDAAqD,CAAA;AAqB9E,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,UAAU,CAAA;IACtB,IAAI,EAAE,QAAQ,CAAA;IACd,kBAAkB,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAChD,CAAA;AAED,eAAO,MAAM,kBAAkB,8CAI5B,wBAAwB,4CAuC1B,CAAA"}
|
|
@@ -18,7 +18,7 @@ var getOrderItemsForCategory = function(orderItems, categoryId) {
|
|
|
18
18
|
});
|
|
19
19
|
};
|
|
20
20
|
var ProductsByMenuStep = function(param) {
|
|
21
|
-
var orderItems = param.orderItems, step = param.step, _param_productsWithErrors = param.productsWithErrors, productsWithErrors = _param_productsWithErrors === void 0 ? [] : _param_productsWithErrors
|
|
21
|
+
var orderItems = param.orderItems, step = param.step, _param_productsWithErrors = param.productsWithErrors, productsWithErrors = _param_productsWithErrors === void 0 ? [] : _param_productsWithErrors;
|
|
22
22
|
var productCategories = step.productCategories;
|
|
23
23
|
if (!doesStepHaveItems(orderItems, step)) return null;
|
|
24
24
|
return /*#__PURE__*/ jsx("div", {
|
|
@@ -36,7 +36,6 @@ var ProductsByMenuStep = function(param) {
|
|
|
36
36
|
categoryOrderItems.map(function(orderItem) {
|
|
37
37
|
var productQuantityError = getProductError(productsWithErrors, orderItem.id);
|
|
38
38
|
return /*#__PURE__*/ jsx(ProductSummary, {
|
|
39
|
-
isPaymentLink: isPaymentLink,
|
|
40
39
|
name: orderItem.name,
|
|
41
40
|
productQuantityError: productQuantityError,
|
|
42
41
|
orderProduct: orderItem
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SummaryTotal.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAIjD,eAAO,MAAM,YAAY,sEAKtB,IAAI,CACL,mBAAmB,EACnB,YAAY,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,eAAe,CACxE,
|
|
1
|
+
{"version":3,"file":"SummaryTotal.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAIjD,eAAO,MAAM,YAAY,sEAKtB,IAAI,CACL,mBAAmB,EACnB,YAAY,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,eAAe,CACxE,4CA6CA,CAAA"}
|
package/dist/iframe/order-process/components/BookingSummary/components/SummaryTotal/SummaryTotal.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsxs, jsx } from 'react/jsx-runtime';
|
|
1
|
+
import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
|
|
2
2
|
import { useMemo } from 'react';
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
4
|
import { cartSumByOrderProducts } from '../../utils/index.js';
|
|
@@ -37,9 +37,17 @@ var SummaryTotal = function(param) {
|
|
|
37
37
|
label: t('totalWithDiscount'),
|
|
38
38
|
amount: totalWithDiscount + transactionFee
|
|
39
39
|
}),
|
|
40
|
-
hasRemaingToPay && /*#__PURE__*/
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
hasRemaingToPay && /*#__PURE__*/ jsxs(Fragment, {
|
|
41
|
+
children: [
|
|
42
|
+
/*#__PURE__*/ jsx(SummaryTotalBlock, {
|
|
43
|
+
label: t("remaining"),
|
|
44
|
+
amount: totalSum - cartSum
|
|
45
|
+
}),
|
|
46
|
+
/*#__PURE__*/ jsx(SummaryTotalBlock, {
|
|
47
|
+
label: t("total"),
|
|
48
|
+
amount: totalSum
|
|
49
|
+
})
|
|
50
|
+
]
|
|
43
51
|
})
|
|
44
52
|
]
|
|
45
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,eAAO,MAAM,sBAAsB,mCAGhC;IACD,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,WAWA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAElF,eAAO,MAAM,sBAAsB,mCAGhC;IACD,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,WAWA,CAAA;AAED,eAAO,MAAM,eAAe,uBACN,wBAAwB,EAAE,aACnC,SAAS,CAAC,IAAI,CAAC,KACzB,MAAM,GAAG,SAGA,CAAA"}
|
|
@@ -5,7 +5,8 @@ var cartSumByOrderProducts = function(param) {
|
|
|
5
5
|
}
|
|
6
6
|
return orderProducts.reduce(function(prevSumValue, product) {
|
|
7
7
|
if (!product) return 0;
|
|
8
|
-
var
|
|
8
|
+
var _product_deposit;
|
|
9
|
+
var price = isTotalSum ? product === null || product === void 0 ? void 0 : product.price : (_product_deposit = product === null || product === void 0 ? void 0 : product.deposit) !== null && _product_deposit !== void 0 ? _product_deposit : product === null || product === void 0 ? void 0 : product.price;
|
|
9
10
|
return prevSumValue + price * product.quantity;
|
|
10
11
|
}, 0);
|
|
11
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CategoryProduct.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/CategoryProduct/CategoryProduct.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EACL,OAAO,EACP,eAAe,EAChB,MAAM,qDAAqD,CAAA;AAI5D,UAAU,oBAAoB;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,kBAAkB,CAAC,EAAE,wBAAwB,EAAE,CAAA;IAC/C,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAC7C;AAED,eAAO,MAAM,eAAe,sFAMzB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"CategoryProduct.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/CategoryProduct/CategoryProduct.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,EACL,OAAO,EACP,eAAe,EAChB,MAAM,qDAAqD,CAAA;AAI5D,UAAU,oBAAoB;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,kBAAkB,CAAC,EAAE,wBAAwB,EAAE,CAAA;IAC/C,eAAe,CAAC,EAAE,wBAAwB,EAAE,CAAA;CAC7C;AAED,eAAO,MAAM,eAAe,sFAMzB,oBAAoB,4CA0KtB,CAAA"}
|
|
@@ -163,7 +163,7 @@ var CategoryProduct = function(param) {
|
|
|
163
163
|
children: [
|
|
164
164
|
/*#__PURE__*/ jsx("span", {
|
|
165
165
|
className: "product-price",
|
|
166
|
-
children: formatNumber(
|
|
166
|
+
children: formatNumber(product.price, {
|
|
167
167
|
style: 'currency',
|
|
168
168
|
currency: Config.Currency.GBP
|
|
169
169
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymentPage.d.ts","sourceRoot":"","sources":["../../../../src/iframe/payment/payment-page/PaymentPage.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAA;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAA;AAI9F,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AAOnC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb;AAED,UAAU,YAAa,SAAQ,oBAAoB;IACjD,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAA;IACjC,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;IAChC,IAAI,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAA;IACjC,SAAS,EAAE,OAAO,CAAA;IAClB,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC;AAED,eAAO,MAAM,WAAW,kIAQrB,YAAY,
|
|
1
|
+
{"version":3,"file":"PaymentPage.d.ts","sourceRoot":"","sources":["../../../../src/iframe/payment/payment-page/PaymentPage.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAA;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAA;AAI9F,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AAOnC,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb;AAED,UAAU,YAAa,SAAQ,oBAAoB;IACjD,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAA;IACjC,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAA;IAChC,IAAI,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAA;IACjC,SAAS,EAAE,OAAO,CAAA;IAClB,mBAAmB,EAAE,mBAAmB,CAAA;IACxC,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC;AAED,eAAO,MAAM,WAAW,kIAQrB,YAAY,4CAiNd,CAAA"}
|
|
@@ -231,17 +231,9 @@ var PaymentPage = function(_param) {
|
|
|
231
231
|
label: t(hasRemaingToPay ? 'payNow' : 'total'),
|
|
232
232
|
amount: orderCartAmountByFormValues + ((bookingSummaryProps === null || bookingSummaryProps === void 0 ? void 0 : bookingSummaryProps.transactionFee) || 0)
|
|
233
233
|
}),
|
|
234
|
-
hasRemaingToPay && /*#__PURE__*/
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
label: t('remaining'),
|
|
238
|
-
amount: orderTotalAmountByFormValues - orderCartAmountByFormValues
|
|
239
|
-
}),
|
|
240
|
-
/*#__PURE__*/ jsx(SummaryTotalBlock, {
|
|
241
|
-
label: t('total'),
|
|
242
|
-
amount: orderTotalAmountByFormValues
|
|
243
|
-
})
|
|
244
|
-
]
|
|
234
|
+
hasRemaingToPay && /*#__PURE__*/ jsx(SummaryTotalBlock, {
|
|
235
|
+
label: t('remaining'),
|
|
236
|
+
amount: orderTotalAmountByFormValues - orderCartAmountByFormValues
|
|
245
237
|
}),
|
|
246
238
|
isPaymentLinkWithRemainingToPay && /*#__PURE__*/ jsx(SummaryTotalBlock, {
|
|
247
239
|
label: t('remaningToPay'),
|
|
@@ -33,10 +33,8 @@
|
|
|
33
33
|
|
|
34
34
|
&.disabled {
|
|
35
35
|
border: 2px solid $snippet-calendar-disabled-button-border-color;
|
|
36
|
-
background-color:
|
|
37
|
-
border: none;
|
|
36
|
+
background-color: $snippet-calendar-disabled-button-background-color;
|
|
38
37
|
color: $snippet-calendar-disabled-button-font-color;
|
|
39
|
-
cursor: not-allowed;
|
|
40
38
|
|
|
41
39
|
.weekday-info {
|
|
42
40
|
div:last-child {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@licklist/design",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.17",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
|
|
@@ -206,4 +206,4 @@
|
|
|
206
206
|
"node": "20.9.0",
|
|
207
207
|
"yarn": "4.4.0"
|
|
208
208
|
}
|
|
209
|
-
}
|
|
209
|
+
}
|
|
@@ -21,7 +21,6 @@ export const BookingSummary = ({
|
|
|
21
21
|
productsWithErrors = [],
|
|
22
22
|
isLoading,
|
|
23
23
|
hasPeopleInput,
|
|
24
|
-
isPaymentLink,
|
|
25
24
|
peopleAmount,
|
|
26
25
|
footer,
|
|
27
26
|
headerComponent,
|
|
@@ -62,7 +61,6 @@ export const BookingSummary = ({
|
|
|
62
61
|
<div className='products-by-menu-step'>
|
|
63
62
|
{menuSteps.map((menuStep) => (
|
|
64
63
|
<ProductsByMenuStep
|
|
65
|
-
isPaymentLink={isPaymentLink}
|
|
66
64
|
key={menuStep.id}
|
|
67
65
|
orderItems={formValues}
|
|
68
66
|
step={menuStep}
|
|
@@ -7,22 +7,17 @@ type ProductSummaryProps = {
|
|
|
7
7
|
name?: string
|
|
8
8
|
productQuantityError?: string
|
|
9
9
|
orderProduct: OrderItem
|
|
10
|
-
isPaymentLink?: boolean
|
|
11
10
|
}
|
|
12
11
|
|
|
13
12
|
export const ProductSummary = ({
|
|
14
13
|
name,
|
|
15
14
|
productQuantityError,
|
|
16
15
|
orderProduct,
|
|
17
|
-
isPaymentLink,
|
|
18
16
|
}: ProductSummaryProps) => {
|
|
19
17
|
const { t } = useTranslation('Design')
|
|
20
18
|
const { formatNumber } = useIntl()
|
|
21
19
|
|
|
22
|
-
const priceForOneProduct =
|
|
23
|
-
!isPaymentLink && orderProduct?.hasDeposit
|
|
24
|
-
? orderProduct?.deposit
|
|
25
|
-
: orderProduct?.price
|
|
20
|
+
const priceForOneProduct = orderProduct?.price
|
|
26
21
|
|
|
27
22
|
const fullPrice = formatNumber(priceForOneProduct * orderProduct?.quantity, {
|
|
28
23
|
style: 'currency',
|
|
@@ -28,14 +28,12 @@ export type ProductsByMenuStepsProps = {
|
|
|
28
28
|
orderItems: OrderItems
|
|
29
29
|
step: MenuStep
|
|
30
30
|
productsWithErrors?: QuantityCheckProductInfo[]
|
|
31
|
-
isPaymentLink?: boolean
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
export const ProductsByMenuStep = ({
|
|
35
34
|
orderItems,
|
|
36
35
|
step,
|
|
37
36
|
productsWithErrors = [],
|
|
38
|
-
isPaymentLink,
|
|
39
37
|
}: ProductsByMenuStepsProps) => {
|
|
40
38
|
const { productCategories } = step
|
|
41
39
|
|
|
@@ -63,7 +61,6 @@ export const ProductsByMenuStep = ({
|
|
|
63
61
|
|
|
64
62
|
return (
|
|
65
63
|
<ProductSummary
|
|
66
|
-
isPaymentLink={isPaymentLink}
|
|
67
64
|
key={orderItem.id}
|
|
68
65
|
name={orderItem.name}
|
|
69
66
|
productQuantityError={productQuantityError}
|
|
@@ -15,10 +15,10 @@ export const cartSumByOrderProducts = ({
|
|
|
15
15
|
if (!product) return 0;
|
|
16
16
|
const price = isTotalSum
|
|
17
17
|
? product?.price
|
|
18
|
-
: product?.deposit
|
|
19
|
-
return prevSumValue + price * product.quantity
|
|
20
|
-
}, 0)
|
|
21
|
-
}
|
|
18
|
+
: product?.deposit ?? product?.price
|
|
19
|
+
return prevSumValue + price * product.quantity
|
|
20
|
+
}, 0)
|
|
21
|
+
}
|
|
22
22
|
|
|
23
23
|
export const getProductError = (
|
|
24
24
|
productsWithErrors: QuantityCheckProductInfo[],
|
|
@@ -132,13 +132,10 @@ export const CategoryProduct = ({
|
|
|
132
132
|
</div>
|
|
133
133
|
<div className='iframe-event__product-price-wrapper'>
|
|
134
134
|
<span className='product-price'>
|
|
135
|
-
{formatNumber(
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
currency: Config.Currency.GBP,
|
|
140
|
-
},
|
|
141
|
-
)}
|
|
135
|
+
{formatNumber(product.price, {
|
|
136
|
+
style: 'currency',
|
|
137
|
+
currency: Config.Currency.GBP,
|
|
138
|
+
})}
|
|
142
139
|
</span>
|
|
143
140
|
<ProductQuantityInput
|
|
144
141
|
onChange={onChange}
|
|
@@ -198,20 +198,13 @@ export const PaymentPage = ({
|
|
|
198
198
|
)}
|
|
199
199
|
|
|
200
200
|
{hasRemaingToPay && (
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
/>
|
|
209
|
-
|
|
210
|
-
<SummaryTotalBlock
|
|
211
|
-
label={t('total')}
|
|
212
|
-
amount={orderTotalAmountByFormValues}
|
|
213
|
-
/>
|
|
214
|
-
</>
|
|
201
|
+
<SummaryTotalBlock
|
|
202
|
+
label={t('remaining')}
|
|
203
|
+
amount={
|
|
204
|
+
orderTotalAmountByFormValues -
|
|
205
|
+
orderCartAmountByFormValues
|
|
206
|
+
}
|
|
207
|
+
/>
|
|
215
208
|
)}
|
|
216
209
|
|
|
217
210
|
{isPaymentLinkWithRemainingToPay && (
|
|
@@ -33,10 +33,8 @@
|
|
|
33
33
|
|
|
34
34
|
&.disabled {
|
|
35
35
|
border: 2px solid $snippet-calendar-disabled-button-border-color;
|
|
36
|
-
background-color:
|
|
37
|
-
border: none;
|
|
36
|
+
background-color: $snippet-calendar-disabled-button-background-color;
|
|
38
37
|
color: $snippet-calendar-disabled-button-font-color;
|
|
39
|
-
cursor: not-allowed;
|
|
40
38
|
|
|
41
39
|
.weekday-info {
|
|
42
40
|
div:last-child {
|