@licklist/design 0.71.18-dev.18 → 0.71.18-dev.2

package/src/recurrence-input/RecurrenceInput.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint-disable react-hooks/exhaustive-deps */
 import { DateTime } from 'luxon'
-import { useEffect, useReducer, useState } from 'react'
+import { useEffect, useReducer } from 'react'
 import RRule, { Frequency, Weekday } from 'rrule'
 import RecurrenceEndInput, { defaultOccurrences } from './RecurrenceEndInput'
 import RecurrenceIntervalAndFrequencyInput from './RecurrenceIntervalAndFrequencyInput'
@@ -39,8 +39,10 @@ export function RecurrenceInput({
     // TODO: unhardcode timezone
     () =>
       onChange(
-        RRule.optionsToString({ ...state, tzid: 'Europe/London' })
-          .replace('RRULE:', '')
+        RRule.optionsToString({ ...state, tzid: 'Europe/London' }).replace(
+          'RRULE:',
+          '',
+        ),
       ),
     [state],
   )

package/src/report/ReportRunnerModal/ReportRunnerModal.tsx

@@ -52,13 +52,13 @@ export const ReportRunnerModal = ({
   generate,
   download,
   onEdit,
-  providerId,
+  providerId
 }: ReportRunnerModalProps) => {
   const { t } = useTranslation(['App', 'Design'])
   const report = reports?.find((report) => report.id === reportId)
 
   const { data: reportFields = [], isLoading: isLoadingReportFields } =
-    useShowReportFields(report?.type)
+    useShowReportFields(report?.type, )
 
   const {
     handleSubmit,

package/src/sales/coupon/utils/index.ts

@@ -1,15 +1,13 @@
-
-import { ModifierSet } from '@licklist/core/dist/DataMapper/Product/ModifierSetDataMapper'
 import { ProductGroup } from '@licklist/core/dist/DataMapper/Product/ProductGroupDataMapper'
 
-export const convertToTypeaheadOptions = (productGroups?: ProductGroup[] | ModifierSet[]) => {
+export const convertToTypeaheadOptions = (productGroups?: ProductGroup[]) => {
   if (!productGroups || !productGroups.length) {
     return []
   }
 
-  return productGroups.map(({ id, name }: ProductGroup | ModifierSet ) => ({
+  return productGroups.map(({ id, name }: ProductGroup) => ({
     id: Number(id),
     value: name,
-    label: name ,
+    label: name,
   }))
 }

package/src/sales/modals/refund-modal/RefundModal.tsx

@@ -9,18 +9,9 @@ import { FaTimes } from 'react-icons/fa'
 import { EXTENDED_PAYMENT_TYPE_TRANSLATION_KEYS } from '../../constants'
 import { CurrencyNumberInput } from '../../../static/CurrencyNumberInput'
 
-export const FULL_REFUND_TYPE = 'fullRefund'
-export const PARTIAL_REFUND_TYPE = 'partialRefund'
-export const NET_REFUND_TYPE = 'netRefund'
-
-export type RefundType =
-  | typeof FULL_REFUND_TYPE
-  | typeof PARTIAL_REFUND_TYPE
-  | typeof NET_REFUND_TYPE
-
 export interface RefundModalProps {
   isVisible: boolean
-  refundType?: RefundType
+  isFullRefund?: boolean
   onHide: () => void
   onSubmit: (amount?: number) => void
   isLoading?: boolean
@@ -38,14 +29,12 @@ export const RefundModal = ({
   onHide,
   onSubmit,
   isLoading = false,
-  refundType = PARTIAL_REFUND_TYPE,
+  isFullRefund = false,
   paymentType,
   defaultValue = 0,
   maxValue,
 }: RefundModalProps) => {
   const { t } = useTranslation(['Design', 'Validation'])
-  const isInputDisabled =
-    isLoading || refundType === 'fullRefund' || refundType === 'netRefund'
 
   const {
     handleSubmit,
@@ -75,7 +64,9 @@ export const RefundModal = ({
     >
       <Form onSubmit={handleSubmit(onModalSubmit)}>
         <ModalHeader className='align-items-center border-0'>
-          <ModalTitle as='h5'>{t(`Design:${refundType}`)}</ModalTitle>
+          <ModalTitle as='h5'>
+            {t(isFullRefund ? 'Design:fullRefund' : 'Design:partialRefund')}
+          </ModalTitle>
 
           <Button variant='danger' className='btn-sm rounded' onClick={onHide}>
             <FaTimes size={20} />
@@ -120,7 +111,7 @@ export const RefundModal = ({
                     },
                   })}
                   step={0.01}
-                  disabled={isInputDisabled}
+                  disabled={isLoading || isFullRefund}
                   isInvalid={!!errors.amount}
                   min={0}
                 />

package/src/sales/modals/refund-modal/index.ts

@@ -1,7 +1,2 @@
-export {
-  RefundModal,
-  FULL_REFUND_TYPE,
-  NET_REFUND_TYPE,
-  PARTIAL_REFUND_TYPE,
-} from './RefundModal'
-export type { RefundModalProps, RefundType } from './RefundModal'
+export { RefundModal } from './RefundModal'
+export type { RefundModalProps } from './RefundModal'

package/src/styles/date-time-button/DateTimeButton.scss

@@ -33,7 +33,7 @@
 
   &.disabled {
     border: 2px solid $snippet-calendar-disabled-button-border-color;
-    background-color: transparent;
+    background-color:transparent;
     border: none;
     color: $snippet-calendar-disabled-button-font-color;
     cursor: not-allowed;
@@ -105,10 +105,3 @@
   font-weight: 300;
   color: $snippet-calendar-button-font-color;
 }
-
-.modifier-price {
-  font-size: 1rem;
-  line-height: 1.03rem;
-  font-weight: 500;
-  color: $snippet-calendar-button-font-color;
-}

package/src/styles/events/EditEventModal.scss

@@ -37,8 +37,6 @@
   .edit-step-dialog {
     .custom-checkbox {
       align-items: unset;
-      position: relative;
-      z-index: 0;
       .form-check-label {
         margin-top: 1rem;
       }

package/src/styles/iframe-page/Page.scss

@@ -24,22 +24,6 @@
     min-width: auto;
   }
 
-  .manual-booking-form-modal {
-    width: 40vw !important;
-    left: 60vh;
-  
-    .modal-content {
-      height: 96vh;
-      margin-left: auto;
-    }
-  
-    @include media-breakpoint-down(sm) {
-      width: 100vw !important;
-      left: 0;
-      top: 10% !important;
-    }
-  }
-
   .header-block {
     margin-bottom: 1rem;
   }

package/src/styles/iframe-page/PageBody.scss

@@ -10,8 +10,6 @@
     height: calc(100svh - 5.5rem);
   }
 
-
-
   .left-block {
     flex: 1;
     align-items: stretch;
@@ -27,8 +25,6 @@
       min-height: calc(100svh - 6.5rem);
     }
 
-
-
     .navigation {
       font-size: 1.125rem;
       font-weight: 500;

package/src/styles/modals/Modals.scss

@@ -6,22 +6,6 @@
   z-index: 1080;
 }
 
-.manual-booking-form-modal {
-  width: 40vw !important;
-  left: 66vw;
-
-  .modal-content {
-    min-height: 95vh;
-    margin-left: auto;
-  }
-
-  @include media-breakpoint-down(sm) {
-    width: 100vw !important;
-    left: 0;
-    top: 10% !important;
-  }
-}
-
 .confirm-modal {
   z-index: 1081;
 }

package/src/styles/product-set/EditProductSetElement.scss

@@ -90,7 +90,6 @@
     }
     label.btn-link {
       width: 4.5rem;
-      z-index: 0;
       display: flex;
       justify-content: center;
       span {

package/src/styles/product-set/ProductSetForm.scss

@@ -58,11 +58,6 @@
     font-weight: 600;
   }
 
-  .modifier-badge {
-    font-size: 0.5rem;
-    font-weight: 400;
-  }
-
   .step-badge {
     background-color: #ffdbdb;
     color: #d52902;
@@ -86,12 +81,6 @@
     background-color: #e9f5ea;
     color: #269b36;
   }
-
-  .modifier-badge {
-    background-color: #e9f5ea;
-    color: #269b36;
-    height: 1rem;
-  }
 }
 
 .product-set-mobile-footer {

package/src/styles/sales/ManualBooking.scss

@@ -234,12 +234,6 @@
     margin-bottom: 2rem;
   }
 
-  .quantity-container-product {
-    display: flex;
-    justify-content: center;
-    margin: 1rem;
-  }
-
   .save-btn:disabled {
     background-color: #fafafa;
     border: none;

package/src/styles/themes/bookedit/index.scss

@@ -51,25 +51,6 @@
   border-bottom: 1px solid #f0f0f0;
 }
 
- .modifier-header {
-  background-color: color('white');
-  padding: 0 2.5rem;
-  z-index: 2;
-  margin-top: 1rem;
-  min-height: 2rem;
-}
-
-.modifier-container {
-  background-color: color('white');
-  padding-bottom: 1rem;
-}
-
-.modifier-set-container {
-  background-color: color('white');
-  border-bottom: 2px solid #f0f0f0;
-  padding-bottom: 1rem;
-}
-
 .header-user-image {
   width: 3rem;
   height: 3rem;