@licklist/design 0.44.485-dev.3 → 0.44.485-dev.31

package/src/iframe/payment/payment-page/PaymentPage.tsx

@@ -15,6 +15,7 @@ import {
 import { PaymentTimer } from "./PaymentTimer";
 import { Page, PageBody, PageHeader } from "../../page";
 import { BookingSummary, BookingSummaryFooter } from "../../order-process";
+import { cartSumByOrderProducts } from "../../order-process/components/BookingSummary/utils";
 
 export interface PaymentMetadata {
   total: number;
@@ -99,6 +100,19 @@ export const PaymentPage = ({
     );
   }
 
+  const orderTotalAmounByFormValues = cartSumByOrderProducts(
+    bookingSummaryProps && bookingSummaryProps?.formValues
+      ? Object.values(bookingSummaryProps?.formValues)
+      : undefined
+  );
+
+  // User can fill promocode only in iframe appcliation.
+  // It didn't possible via payment link. This check will
+  // be applied when there are no metadata and in case when
+  // orderValues sum is greater than amount in order.
+  const isCalculatedAmountGreaterThanOrderAmount =
+    orderTotalAmounByFormValues > data?.amount;
+
   return (
     <Page
       className="payment_link"
@@ -127,7 +141,7 @@ export const PaymentPage = ({
             bottomBlock={
               <BookingSummaryFooter showButton={false}>
                 <div className="d-flex flex-column justify-content-between">
-                  {paymentMetadata && (
+                  {paymentMetadata ? (
                     <>
                       <SummaryTotalBlock
                         label={t("total")}
@@ -137,12 +151,38 @@ export const PaymentPage = ({
                         label={t("paidSum")}
                         amount={paymentMetadata.paid || 0}
                       />
+                      <SummaryTotalBlock
+                        label={t("remaining")}
+                        amount={
+                          paymentMetadata.total - paymentMetadata.paid || 0
+                        }
+                      />
+                    </>
+                  ) : (
+                    <>
+                      {isCalculatedAmountGreaterThanOrderAmount && (
+                        <SummaryTotalBlock
+                          label={t("total")}
+                          amount={
+                            orderTotalAmounByFormValues +
+                            (bookingSummaryProps?.transactionFee || 0)
+                          }
+                        />
+                      )}
+
+                      <SummaryTotalBlock
+                        label={t(
+                          isCalculatedAmountGreaterThanOrderAmount
+                            ? "totalWithDiscount"
+                            : "total"
+                        )}
+                        amount={
+                          data?.amount +
+                          (bookingSummaryProps?.transactionFee || 0)
+                        }
+                      />
                     </>
                   )}
-                  <SummaryTotalBlock
-                    label={t(paymentMetadata ? "remaining" : "total")}
-                    amount={data?.amount || 0}
-                  />
                 </div>
               </BookingSummaryFooter>
             }

package/src/iframe/payment/payment-status-page/PaymentStatusPage.tsx

@@ -9,6 +9,8 @@ import { BookingSummary, BookingSummaryFooter } from "../../order-process";
 import { PaymentStatusHeader } from "../payment-status-header/PaymentStatusHeader";
 import { SummaryTotalBlock } from "../../order-process/components/BookingSummary/components/SummaryTotal";
 import { BookingSummaryProps } from "../../order-process/components/BookingSummary/types";
+import { PaymentMetadata } from "../payment-page/PaymentPage";
+import { cartSumByOrderProducts } from "../../order-process/components/BookingSummary/utils";
 
 export const ORDER_STATUS_FAILED = "failed";
 export const ORDER_STATUS_SUCCESS = "success";
@@ -23,7 +25,6 @@ interface PaymentStatusComponentProps {
   onCloseWindow: () => void;
   onBack?: () => void;
   onTryAgain?: () => void;
-  totalAmount?: number;
   isLoading?: boolean;
   status: OrderStatusPrefix;
   isAppUsingInIframe?: boolean;
@@ -31,6 +32,8 @@ interface PaymentStatusComponentProps {
   EventCardComponent?: ReactNode;
   showCloseButton?: boolean;
   email?: string;
+  totalAmount?: number;
+  paymentMetadata?: PaymentMetadata;
 }
 
 // @TODO In future think, how to reuse this component in Iframe Pending, Success and Failed Pages
@@ -38,7 +41,6 @@ export const PaymentStatusPage = ({
   onCloseWindow,
   onBack,
   onTryAgain,
-  totalAmount,
   isLoading,
   status,
   isAppUsingInIframe,
@@ -46,6 +48,8 @@ export const PaymentStatusPage = ({
   EventCardComponent,
   showCloseButton = false,
   email,
+  totalAmount = 0,
+  paymentMetadata,
 }: PaymentStatusComponentProps) => {
   const { t } = useTranslation("Design");
 
@@ -65,6 +69,22 @@ export const PaymentStatusPage = ({
   if (isLoading) {
     return <LoaderIndicator isLoaded={false} />;
   }
+
+  const orderTotalAmounByFormValues = cartSumByOrderProducts(
+    bookingSummaryProps && bookingSummaryProps?.formValues
+      ? Object.values(bookingSummaryProps?.formValues)
+      : undefined
+  );
+
+  // User can fill promocode only in iframe appcliation.
+  // It didn't possible via payment link. This check will
+  // be applied when there are no metadata and in case when
+  // orderValues sum is greater than amount in order.
+  // For payment status page booking summary props can be empty
+  // so we should also check for them
+  const isCalculatedAmountGreaterThanOrderAmount =
+    bookingSummaryProps && orderTotalAmounByFormValues > totalAmount;
+
   return (
     <Page
       className="payment-status-page"
@@ -98,16 +118,50 @@ export const PaymentStatusPage = ({
           <PageBody.RightBlock
             bottomBlock={
               <BookingSummaryFooter showButton={false}>
-                {bookingSummaryProps?.formValues ? (
-                  <BookingSummary.SummaryTotal
-                    formValues={bookingSummaryProps?.formValues}
-                  />
-                ) : (
-                  <SummaryTotalBlock
-                    label={t("total")}
-                    amount={totalAmount || 0}
-                  />
-                )}
+                <div className="d-flex flex-column justify-content-between">
+                  {paymentMetadata ? (
+                    <>
+                      <SummaryTotalBlock
+                        label={t("total")}
+                        amount={paymentMetadata.total || 0}
+                      />
+                      <SummaryTotalBlock
+                        label={t("paidSum")}
+                        amount={paymentMetadata.paid || 0}
+                      />
+                      <SummaryTotalBlock
+                        label={t("remaining")}
+                        amount={
+                          paymentMetadata.total - paymentMetadata.paid || 0
+                        }
+                      />
+                    </>
+                  ) : (
+                    <>
+                      {isCalculatedAmountGreaterThanOrderAmount && (
+                        <SummaryTotalBlock
+                          label={t("total")}
+                          amount={
+                            orderTotalAmounByFormValues +
+                            (bookingSummaryProps?.transactionFee || 0)
+                          }
+                        />
+                      )}
+
+                      <SummaryTotalBlock
+                        label={t(
+                          isCalculatedAmountGreaterThanOrderAmount
+                            ? "totalWithDiscount"
+                            : "total"
+                        )}
+                        amount={
+                          totalAmount +
+                          (bookingSummaryProps?.transactionFee || 0)
+                        }
+                      />
+                    </>
+                  )}
+                </div>
               </BookingSummaryFooter>
             }
           >

package/src/index.ts

@@ -33,3 +33,4 @@ export * from "./zone";
 export * from "./resource";
 export * from "./virtualized";
 export * from "./customers";
+export * from "./striped-static-table";

package/src/notification/email-template/card/EmailTemplateCard.stories.tsx

@@ -18,4 +18,5 @@ Default.args = {
   subject: "Confirmation",
   hasPermission: true,
   isDefault: true,
+  templateType: "confirmation",
 };

package/src/notification/email-template/card/EmailTemplateCard.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import { useTranslation } from "react-i18next";
-
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { ConfirmModal, ConfirmModalType } from "../../../modals";
 import { Icon } from "../../../static";
 
@@ -12,6 +12,7 @@ export interface EmailTemplateCardProps extends HasPermissionProp {
   href: string;
   isDefault: boolean;
   onRemove: () => void;
+  type: NotificationType;
 }
 
 export function EmailTemplateCard({
@@ -21,6 +22,7 @@ export function EmailTemplateCard({
   onRemove,
   isDefault = false,
   hasPermission = true,
+  type,
 }: EmailTemplateCardProps) {
   const { t } = useTranslation(["Design"]);
 
@@ -54,7 +56,12 @@ export function EmailTemplateCard({
         </div>
         <div className={`mt-${isDefault ? "3" : "4"}`}>
           {Boolean(isDefault) && <p className="mb-1">{t("Design:default")}</p>}
-          <span>{subject}</span>
+          <div className="d-flex flex-column">
+            <span>{subject}</span>
+            <p>
+              {t(`Design:type`)}:&nbsp;{t(`Design:${type}`)}
+            </p>
+          </div>
         </div>
       </div>
     </>

package/src/notification/email-template/control/EmailTemplateControl.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/display-name */
 import React, { useState, useEffect } from "react";
 import { Col, Row, Form } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
@@ -16,6 +15,7 @@ import {
   PERMANENT_IMAGE_TYPE_TEMP,
 } from "@licklist/core/dist/DataMapper/Media/UploadPermanentImageDataMapper";
 
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { FileUpload } from "../../../file-upload";
 import { EmailTemplateValues } from "../form";
 
@@ -26,6 +26,8 @@ export interface EmailTemplateControlProps {
   setIsLoading: (isLoading: boolean) => void;
   meta: string;
   defaultAttachments?: Attachment[];
+  notificationTypes?: NotificationType[];
+  getDefaultTemplateMetaByType?: (type?: NotificationType | null) => string;
 }
 
 export const EmailTemplateControl = React.forwardRef(
@@ -35,6 +37,8 @@ export const EmailTemplateControl = React.forwardRef(
       meta,
       options = [],
       defaultAttachments = [],
+      notificationTypes = [],
+      getDefaultTemplateMetaByType,
     }: EmailTemplateControlProps,
     ref: any
   ) => {
@@ -48,6 +52,8 @@ export const EmailTemplateControl = React.forwardRef(
       setValue,
       formState: { errors },
       getValues,
+      watch,
+      reset,
     } = useFormContext<EmailTemplateValues>();
     const [isIncludePDF, setIsIncludePDF] = useState(false);
 
@@ -64,6 +70,22 @@ export const EmailTemplateControl = React.forwardRef(
       handlePermanentImageUploading,
     } = usePermanentImage();
 
+    const type = watch("type");
+    const id = watch("id");
+
+    useEffect(() => {
+      if (id || !getDefaultTemplateMetaByType || !type) return;
+
+      const formValues = getValues();
+
+      const nextMeta = getDefaultTemplateMetaByType(type);
+
+      reset({ ...formValues, meta: nextMeta });
+
+      ref.current?.loadDesign(JSON.parse(nextMeta));
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [type]);
+
     useEffect(() => {
       setValue("attachmentMetadata", attachments);
     }, [attachments, setValue]);
@@ -175,6 +197,42 @@ export const EmailTemplateControl = React.forwardRef(
 
     return (
       <>
+        <Row>
+          <Form.Group
+            as={Col}
+            controlId="type"
+            xs
+            sm={12}
+            md={8}
+            lg={10}
+            xl={12}
+          >
+            <Form.Label>{t("type")}</Form.Label>
+            <Form.Control
+              as="select"
+              {...register("type", {
+                required: t("Validation:fieldRequired", {
+                  attribute: t("type"),
+                }) as string,
+              })}
+              name="type"
+              required
+              isInvalid={Boolean(errors.type)}
+              placeholder={t("Design:type")}
+              disabled={!!id}
+            >
+              <option value="">{t("Design:choose")}</option>
+              {notificationTypes.map((key) => (
+                <option key={key} value={key}>
+                  {t(`Design:${key}`)}
+                </option>
+              ))}
+            </Form.Control>
+            <Form.Control.Feedback type="invalid">
+              {errors.type?.message}
+            </Form.Control.Feedback>
+          </Form.Group>
+        </Row>
         <Row>
           <Form.Group
             as={Col}
@@ -356,3 +414,5 @@ export const EmailTemplateControl = React.forwardRef(
     );
   }
 );
+
+EmailTemplateControl.displayName = "EmailTemplateControl";

package/src/notification/email-template/form/EmailTemplateForm.stories.tsx

@@ -219,6 +219,13 @@ Default.args = {
         attachableType: "mail",
       },
     ],
+    type: "confirmation",
+    notificationTypes: [
+      "confirmation",
+      "paymentLink",
+      "afterBooking",
+      "preliminaryMail",
+    ],
   },
 };
 
@@ -248,10 +255,24 @@ ServerErrors.args = {
     body: "",
     meta: JSON.stringify(DefaultEmailTemplate),
   },
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };
 
 Empty.args = {
   onSubmit: (data) => console.log(data),
   isLoading: true,
   placeholders: [],
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };

package/src/notification/email-template/form/EmailTemplateForm.tsx

@@ -13,12 +13,13 @@ import { ServerError } from "@licklist/plugins/dist/hooks/Api/useHttpQuery";
 import FormErrorService from "@licklist/plugins/dist/services/Form/FormErrorService";
 import { AttachmentsWithHash } from "@licklist/plugins/dist/hooks/Media/useAttachments";
 import { UploadPermanentImage } from "@licklist/core/dist/DataMapper/Media/UploadPermanentImageDataMapper";
-
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { NotificationPlaceholders } from "../../components/NotificationPlaceholders";
 import { EmailTemplateControl } from "../control/EmailTemplateControl";
 import { BlockLoader } from "../../../static";
 
 export interface EmailTemplateValues extends FormValues {
+  id?: number | string;
   name: string;
   subject: string;
   isActive: boolean;
@@ -29,6 +30,7 @@ export interface EmailTemplateValues extends FormValues {
   attachments?: Attachment[];
   templateOptionValues?: TemplateOptionValue[];
   imagesMetadata?: UploadPermanentImage[];
+  type?: NotificationType;
 }
 
 export interface EmailTemplateProps extends HasPermissionProp {
@@ -39,6 +41,8 @@ export interface EmailTemplateProps extends HasPermissionProp {
   placeholders?: NotificationPlaceholder[];
   options?: TemplateOption[];
   serverErrors?: ServerError;
+  notificationTypes?: NotificationType[];
+  getDefaultTemplateMetaByType?: (type?: NotificationType | null) => string;
 }
 
 export function EmailTemplateForm({
@@ -49,6 +53,8 @@ export function EmailTemplateForm({
   placeholders = [],
   options = [],
   serverErrors,
+  notificationTypes = [],
+  getDefaultTemplateMetaByType,
 }: EmailTemplateProps) {
   const { t } = useTranslation("Design");
   const [isLoading, setIsLoading] = useState(false);
@@ -81,6 +87,8 @@ export function EmailTemplateForm({
           meta={defaultValues?.meta || null}
           defaultAttachments={defaultValues?.attachments || []}
           options={options}
+          notificationTypes={notificationTypes}
+          getDefaultTemplateMetaByType={getDefaultTemplateMetaByType}
         />
         <NotificationPlaceholders placeholders={placeholders} />
         {/* update email template */}

package/src/notification/sms-template/card/SmsTemplateCard.stories.tsx

@@ -17,4 +17,5 @@ Default.args = {
   name: "Default Sms Template",
   hasPermission: true,
   isDefault: true,
+  templateType: "confirmation",
 };

package/src/notification/sms-template/card/SmsTemplateCard.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { Link } from "react-router-dom";
-import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import { useTranslation } from "react-i18next";
-
+import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { ConfirmModal, ConfirmModalType } from "../../../modals";
 import { Icon } from "../../../static";
 
@@ -11,6 +11,7 @@ export interface SmsTemplateCardProps extends HasPermissionProp {
   href: string;
   onRemove: () => void;
   isDefault: boolean;
+  type: NotificationType;
 }
 
 export function SmsTemplateCard({
@@ -19,6 +20,7 @@ export function SmsTemplateCard({
   onRemove,
   hasPermission = true,
   isDefault = false,
+  type,
 }: SmsTemplateCardProps) {
   const { t } = useTranslation(["Design"]);
 
@@ -51,6 +53,9 @@ export function SmsTemplateCard({
       </div>
       <div className="mt-2">
         {Boolean(isDefault) && <p className="mb-1">{t("Design:default")}</p>}
+        <p>
+          {t(`Design:type`)}:&nbsp;{t(`Design:${type}`)}
+        </p>
       </div>
     </div>
   );

package/src/notification/sms-template/control/SmsTemplateControl.tsx

@@ -4,12 +4,18 @@ import { Col, Row, Form } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { SmsTemplateValues } from "../form";
 
 const MAX_SMS_LENGTH = 300;
 
-export const SmsTemplateControl = () => {
+type SmsTemplateControlProps = {
+  notificationTypes: NotificationType[];
+};
+
+export const SmsTemplateControl = ({
+  notificationTypes = [],
+}: SmsTemplateControlProps) => {
   const { t } = useTranslation(["Design"]);
   const {
     register,
@@ -23,6 +29,34 @@ export const SmsTemplateControl = () => {
 
   return (
     <>
+      <Row>
+        <Form.Group as={Col} controlId="type" xs sm={12} md={8} lg={10} xl={12}>
+          <Form.Label>{t("type")}</Form.Label>
+
+          <Form.Control
+            as="select"
+            {...register("type", {
+              required: t("Validation:fieldRequired", {
+                attribute: t("type"),
+              }) as string,
+            })}
+            name="type"
+            required
+            isInvalid={Boolean(errors.type)}
+            placeholder={t("Design:type")}
+          >
+            <option value="">{t("Design:choose")}</option>
+            {notificationTypes.map((key) => (
+              <option key={key} value={key}>
+                {t(`Design:${key}`)}
+              </option>
+            ))}
+          </Form.Control>
+          <Form.Control.Feedback type="invalid">
+            {errors.type?.message}
+          </Form.Control.Feedback>
+        </Form.Group>
+      </Row>
       <Row>
         <Form.Group
           as={Col}

package/src/notification/sms-template/form/SmsTemplateForm.stories.tsx

@@ -38,12 +38,26 @@ Default.args = {
     isDefault: false,
     body: "Some random sms string",
   },
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };
 
 Empty.args = {
   onSubmit: (data) => console.log(data),
   isLoading: true,
   placeholders: [],
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };
 
 ServerErrors.args = {
@@ -54,4 +68,11 @@ ServerErrors.args = {
     body: ["Body field is required"],
     name: ["Name Field is required"],
   },
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };

package/src/notification/sms-template/form/SmsTemplateForm.tsx

@@ -8,6 +8,7 @@ import { NotificationPlaceholder } from "@licklist/core/dist/DataMapper/Notifica
 import { ServerError } from "@licklist/plugins/dist/hooks/Api/useHttpQuery";
 import FormErrorService from "@licklist/plugins/dist/services/Form/FormErrorService";
 
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { NotificationPlaceholders } from "../../components/NotificationPlaceholders";
 import { SmsTemplateControl } from "../control/SmsTemplateControl";
 
@@ -16,6 +17,7 @@ export interface SmsTemplateValues extends FormValues {
   isActive: boolean;
   isDefault: boolean;
   body: string;
+  type?: NotificationType;
 }
 
 export interface SmsTemplateProps extends HasPermissionProp {
@@ -24,6 +26,7 @@ export interface SmsTemplateProps extends HasPermissionProp {
   defaultValues?: SmsTemplateValues;
   placeholders?: NotificationPlaceholder[];
   serverErrors?: ServerError;
+  notificationTypes?: NotificationType[];
 }
 
 export function SmsTemplateForm({
@@ -32,6 +35,7 @@ export function SmsTemplateForm({
   hasPermission = true,
   placeholders = [],
   serverErrors,
+  notificationTypes = [],
 }: SmsTemplateProps) {
   const { t } = useTranslation("Design");
 
@@ -46,7 +50,7 @@ export function SmsTemplateForm({
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
-        <SmsTemplateControl />
+        <SmsTemplateControl notificationTypes={notificationTypes} />
         <NotificationPlaceholders placeholders={placeholders} />
 
         {hasPermission && (